@@ -176,6 +176,14 @@ > </File> <File + RelativePath=".\HighwindTabCtrl.cpp" + > + </File> + <File + RelativePath=".\HighwindTabGrpCtrl.cpp" + > + </File> + <File RelativePath=".\3rdparty\json\src\jsonreader.cpp" > </File> @@ -206,6 +214,14 @@ > </File> <File + RelativePath=".\HighwindTabCtrl.h" + > + </File> + <File + RelativePath=".\HighwindTabGrpCtrl.h" + > + </File> + <File RelativePath=".\MenuObject.h" > </File> Highwind.vcproj @@ -24,6 +24,8 @@ ////Event Table Start BEGIN_EVENT_TABLE(HighwindMainFrm,wxFrame) ////Manual Code Start + //EVT_MENU(ID_QUIT, + EVT_TEXT_ENTER(ID_ADDRESSBAR, HighwindMainFrm::OnAddressEnter) ////Manual Code End EVT_CLOSE(HighwindMainFrm::OnClose) @@ -73,7 +75,12 @@ void HighwindMainFrm::CreateGUIControls() StatusBar = new wxStatusBar(this, ID_STATUSBAR); - TabGroup = new wxNotebook(this, ID_TABGROUP, wxPoint(44, 137), wxSize(193, 129), wxNB_DEFAULT); + TabGroup = new wxAuiNotebook(this, ID_TABGROUP, wxPoint(44, 137), wxSize(193, 129), wxNB_DEFAULT|wxBORDER_NONE); + + wxAuiNotebook *page = new wxAuiNotebook(this, 0, wxPoint(44, 137), wxSize(193, 129), wxNB_DEFAULT|wxBORDER_NONE); + TabGroup->AddPage(page, wxT("hoge")); + page->AddPage(new wxControl(page, 0, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE), wxT("fuga")); + TabGroup->SetTabCtrlHeight(0); MenuBar = new wxMenuBar(); @@ -102,6 +109,9 @@ void HighwindMainFrm::CreateMenuItems(){ } void HighwindMainFrm::CreateToolButtons(){ + AddressBar = new wxComboBox(ToolBar, ID_ADDRESSBAR); + ToolBar->AddControl(AddressBar, wxT("address")); + wxJSONValue tconf = wxGetApp().GetMenuConf(); wxJSONValue items = tconf["Items"]; @@ -113,6 +123,11 @@ void HighwindMainFrm::CreateToolButtons(){ } } +void HighwindMainFrm::OnAddressEnter(wxCommandEvent& event) +{ + wxMessageBox(AddressBar->GetValue(), wxT("test")); +} + void HighwindMainFrm::OnClose(wxCloseEvent& event) { Destroy(); HighwindMainFrm.cpp @@ -27,8 +27,10 @@ ////Header Include Start #include <wx/menu.h> #include <wx/notebook.h> +#include <wx/aui/auibook.h> #include <wx/statusbr.h> #include <wx/toolbar.h> +#include <wx/combobox.h> ////Header Include End ////Dialog Style Start @@ -52,9 +54,10 @@ class HighwindMainFrm : public wxFrame //wxDev-C++ will remove them. Add custom code after the block. ////GUI Control Declaration Start wxMenuBar *MenuBar; - wxNotebook *TabGroup; + wxAuiNotebook *TabGroup; wxStatusBar *StatusBar; wxToolBar *ToolBar; + wxComboBox *AddressBar; ////GUI Control Declaration End private: @@ -65,9 +68,12 @@ class HighwindMainFrm : public wxFrame enum { ////GUI Enum Control ID Start - ID_TOOLBAR, + ID_TOOLBAR = 1, ID_STATUSBAR, ID_TABGROUP, + ID_ADDRESSBAR, + ID_SEARCHBAR, + ID_ENGINEBOX, ID_NEWTABGRP, ID_NEWTAB, ID_NEWTABGRP_FROMCB, @@ -82,12 +88,12 @@ class HighwindMainFrm : public wxFrame ID_CLOSETABGRP_LEFT, ID_CLOSETABGRP_RIGHT, ID_CLOSETABGRP_EXCEPT, - ID_CLOSETABGRPALL, + ID_CLOSETABGRP_ALL, ID_CLOSETAB, ID_CLOSETAB_LEFT, ID_CLOSETAB_RIGHT, ID_CLOSETAB_EXCEPT, - ID_CLOSETABALL, + ID_CLOSETAB_ALL, ID_CLOSEWINDOW, ID_OFFLINE, ID_CUT, @@ -107,6 +113,7 @@ class HighwindMainFrm : public wxFrame ID_SWFAYT, ID_GOBACK, ID_GOFORWARD, + ID_QUIT, /*ID_WXTOOLBUTTON2 = 5, */ ////GUI Enum Control ID End @@ -114,10 +121,13 @@ class HighwindMainFrm : public wxFrame }; private: + void OnAddressEnter(wxCommandEvent& event); void OnClose(wxCloseEvent& event); void CreateGUIControls(); void CreateMenuItems(); void CreateToolButtons(); + void CreateBuiltinIDHashMap(); + void CreateAdditionalIDHashMap(); }; #endif HighwindMainFrm.h @@ -0,0 +1,9 @@ +#include "HighwindTabCtrl.h" + +HighwindTabCtrl::HighwindTabCtrl(void) +{ +} + +HighwindTabCtrl::~HighwindTabCtrl(void) +{ +} HighwindTabCtrl.cpp @@ -0,0 +1,12 @@ +#pragma once +#include "c:\wxwidgets-2.9.0\include\wx\aui\auibook.h" + +class HighwindTabCtrl : + public wxAuiNotebook +{ +public: + HighwindTabCtrl(void); + virtual ~HighwindTabCtrl(void); + //void LoadTabList(const wxJSONValue& list); + //void LoadTabList(const wxStringArray& array); +}; HighwindTabCtrl.h @@ -0,0 +1,9 @@ +#include "HighwindTabGrpCtrl.h" + +HighwindTabGrpCtrl::HighwindTabGrpCtrl(void) +{ +} + +HighwindTabGrpCtrl::~HighwindTabGrpCtrl(void) +{ +} HighwindTabGrpCtrl.cpp @@ -0,0 +1,11 @@ +#pragma once +#include "c:\wxwidgets-2.9.0\include\wx\aui\auibook.h" + +class HighwindTabGrpCtrl : + public wxAuiNotebook +{ +public: + HighwindTabGrpCtrl(void); + virtual ~HighwindTabGrpCtrl(void); +// void LoadSession(const wxJSONValue& session); +}; HighwindTabGrpCtrl.h @@ -0,0 +1,3 @@ +COMPILE +=============================================== +Please locate wxWebConnect source files at 3rdparty/webconnect/ \ No newline at end of file README 5fec3474a0ccdf86e2e46732a9117727e074eaff plus7 ahya365@gmail.com http://github.com/plus7/Highwind/commit/b5975ab7fb36b7b2dfa37bfa2096a6ec10a58313 b5975ab7fb36b7b2dfa37bfa2096a6ec10a58313 2009-10-12T06:32:18-07:00 2009-10-12T06:32:18-07:00 fuga a415909fa51292790038cc3f318161be438f31d6 plus7 ahya365@gmail.com