From e1b7217e23ca588d0b9073ad0e98165593a9df5a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 20 Jun 2012 17:10:23 +0000 Subject: [PATCH] Interface tweaks for Phoenix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/bookctrl.h | 11 +++++++++++ interface/wx/choicebk.h | 24 ++++++++++++++++++++++++ interface/wx/fontenum.h | 3 +++ interface/wx/listbook.h | 22 ++++++++++++++++++++++ interface/wx/notebook.h | 4 ++++ interface/wx/toolbook.h | 18 ++++++++++++++++++ interface/wx/treebook.h | 6 ++++++ 7 files changed, 88 insertions(+) diff --git a/interface/wx/bookctrl.h b/interface/wx/bookctrl.h index 41ef787efe..bbffcc27d6 100644 --- a/interface/wx/bookctrl.h +++ b/interface/wx/bookctrl.h @@ -31,6 +31,17 @@ enum wxBK_HITTEST_ONPAGE = 8 }; +/** + wxBookCtrl flags (common for wxNotebook, wxListbook, wxChoicebook, wxTreebook) +*/ +#define wxBK_DEFAULT 0x0000 +#define wxBK_TOP 0x0010 +#define wxBK_BOTTOM 0x0020 +#define wxBK_LEFT 0x0040 +#define wxBK_RIGHT 0x0080 +#define wxBK_ALIGN_MASK (wxBK_TOP | wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT) + + /** @class wxBookCtrlBase diff --git a/interface/wx/choicebk.h b/interface/wx/choicebk.h index 239fc4dfd8..c055842d2a 100644 --- a/interface/wx/choicebk.h +++ b/interface/wx/choicebk.h @@ -6,6 +6,18 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// + +// wxChoicebook flags +#define wxCHB_DEFAULT wxBK_DEFAULT +#define wxCHB_TOP wxBK_TOP +#define wxCHB_BOTTOM wxBK_BOTTOM +#define wxCHB_LEFT wxBK_LEFT +#define wxCHB_RIGHT wxBK_RIGHT +#define wxCHB_ALIGN_MASK wxBK_ALIGN_MASK + +wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED; +wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING; + /** @class wxChoicebook @@ -66,6 +78,18 @@ public: const wxString& name = wxEmptyString); //@} + /** + Create the choicebook control that has already been constructed with + the default constructor. + */ + bool Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxEmptyString); + + /** Returns the wxChoice associated with the control. */ diff --git a/interface/wx/fontenum.h b/interface/wx/fontenum.h index 15763d5ebf..048e201b5f 100644 --- a/interface/wx/fontenum.h +++ b/interface/wx/fontenum.h @@ -35,6 +35,9 @@ class wxFontEnumerator { public: + wxFontEnumerator(); + virtual ~wxFontEnumerator(); + /** Call OnFontEncoding() for each encoding supported by the given font - or for each encoding supported by at least some font if @a font is not specified. diff --git a/interface/wx/listbook.h b/interface/wx/listbook.h index 5578ddd221..e0d23fd9ed 100644 --- a/interface/wx/listbook.h +++ b/interface/wx/listbook.h @@ -6,6 +6,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// wxListbook flags +#define wxLB_DEFAULT wxBK_DEFAULT +#define wxLB_TOP wxBK_TOP +#define wxLB_BOTTOM wxBK_BOTTOM +#define wxLB_LEFT wxBK_LEFT +#define wxLB_RIGHT wxBK_RIGHT +#define wxLB_ALIGN_MASK wxBK_ALIGN_MASK + +wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED; +wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING; + /** @class wxListbook @@ -67,6 +78,17 @@ public: long style = 0, const wxString& name = wxEmptyString); + /** + Create the list book control that has already been constructed with + the default constructor. + */ + bool Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxEmptyString); + /** Returns the wxListView associated with the control. */ diff --git a/interface/wx/notebook.h b/interface/wx/notebook.h index 59829ac0d8..36101d3a0e 100644 --- a/interface/wx/notebook.h +++ b/interface/wx/notebook.h @@ -26,6 +26,10 @@ enum #define wxNB_NOPAGETHEME 0x0400 #define wxNB_FLAT 0x0800 +wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED; +wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING; + + /** @class wxNotebook diff --git a/interface/wx/toolbook.h b/interface/wx/toolbook.h index b2db21a8d6..630f8eca54 100644 --- a/interface/wx/toolbook.h +++ b/interface/wx/toolbook.h @@ -6,6 +6,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#define wxTBK_BUTTONBAR 0x0100 +#define wxTBK_HORZ_LAYOUT 0x8000 + +wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED; +wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING; + + /** @class wxToolbook @@ -61,6 +68,17 @@ public: const wxString& name = wxEmptyString); //@} + /** + Create the tool book control that has already been constructed with + the default constructor. + */ + bool Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxEmptyString); + /** Returns the wxToolBarBase associated with the control. */ diff --git a/interface/wx/treebook.h b/interface/wx/treebook.h index a49932823f..776b2afca3 100644 --- a/interface/wx/treebook.h +++ b/interface/wx/treebook.h @@ -6,6 +6,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// + +wxEventType wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED; +wxEventType wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING; +wxEventType wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED; +wxEventType wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED; + /** @class wxTreebook -- 2.45.2