@@ -1,5 +1,5 @@ #include "HighwindTabCtrl.h" - +#include <webcontrol.h> HighwindTabCtrl::HighwindTabCtrl(void) { } @@ -7,3 +7,16 @@ HighwindTabCtrl::HighwindTabCtrl(void) HighwindTabCtrl::~HighwindTabCtrl(void) { } + +int HighwindTabCtrl::AddTab(const wxString& title, const wxString& uri, bool bg = false) +{ +} + +void HighwindTabCtrl::InsertTab(const wxString& title, const wxString& uri, size_t pos = 0, bool bg = false) +{ +} + +wxWebControl *HighwindTabCtrl::GetWebControl(size_t index) +{ + return wxAuiNotebook::GetPage(index); +} \ No newline at end of file HighwindTabCtrl.cpp @@ -1,6 +1,6 @@ #pragma once #include "c:\wxwidgets-2.9.0\include\wx\aui\auibook.h" - +class wxWebControl; class HighwindTabCtrl : public wxAuiNotebook { @@ -9,4 +9,9 @@ public: virtual ~HighwindTabCtrl(void); //void LoadTabList(const wxJSONValue& list); //void LoadTabList(const wxStringArray& array); + int AddTab(const wxString& title, const wxString& uri, bool bg = false); + void InsertTab(const wxString& title, const wxString& uri, size_t pos = 0, bool bg = false); + void DeleteTab(size_t index); + void MoveTab(size_t index, size_t newindex); + wxWebControl *GetWebControl(size_t index); }; HighwindTabCtrl.h @@ -1,5 +1,5 @@ #include "HighwindTabGrpCtrl.h" - +#include "HighwindTabCtrl.h" HighwindTabGrpCtrl::HighwindTabGrpCtrl(void) { } @@ -7,3 +7,18 @@ HighwindTabGrpCtrl::HighwindTabGrpCtrl(void) HighwindTabGrpCtrl::~HighwindTabGrpCtrl(void) { } + +void HighwindTabGrpCtrl::OpenUri(const wxString& uri) +{ + if(GetPageCount() < 1){ + HighwindTabCtrl* newctrl = new HighwindTabCtrl(); + InsertPage(0, tabctrl, wxT("default"), true); + } + + if(GetActiveTabCtrl() == NULL){ + SetSelection(0); + } + + HighwindTabCtrl *tabctrl = (HighwindTabCtrl*)GetPage(GetSelection()); + tabctrl->AddTab(wxT("notitle"), uri); +} \ No newline at end of file HighwindTabGrpCtrl.cpp @@ -1,6 +1,6 @@ #pragma once #include "c:\wxwidgets-2.9.0\include\wx\aui\auibook.h" - +class HighwindTabCtrl; class HighwindTabGrpCtrl : public wxAuiNotebook { @@ -8,4 +8,10 @@ public: HighwindTabGrpCtrl(void); virtual ~HighwindTabGrpCtrl(void); // void LoadSession(const wxJSONValue& session); + void OpenUri(const wxString& uri); + int AddGroup(int flags, bool bg = false); + void InsertGroup(int flags, size_t pos = 0, bool bg = false); + void DeleteGroup(size_t index); + void MoveGroup(size_t index, size_t newindex); + HighwindTabCtrl *GetTabControl(size_t index); }; HighwindTabGrpCtrl.h 91d67a5059edf0b709f6cf12ee88bbf390899b3a NOSE Takafumi ahya365@gmail.com http://github.com/plus7/Highwind/commit/4cfe2874c2ab5697963946401bf1d2a769f19832 4cfe2874c2ab5697963946401bf1d2a769f19832 2009-10-13T09:41:19-07:00 2009-10-13T09:41:19-07:00 foo 280e6fff54711b88fa370e38c6e201aedcfedfc9 NOSE Takafumi ahya365@gmail.com