Interface tweaks for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/bookctrl.h b/interface/wx/bookctrl.h
index 41ef787efe606d5520588a02aa56cd333aa6fadb..bbffcc27d62b01a7c3cbfb5d7e9b062078789a73 100644 (file)
--- a/interface/wx/bookctrl.h
+++ b/interface/wx/bookctrl.h
@@ -31,6 +31,17 @@ enum
     wxBK_HITTEST_ONPAGE  = 8
 };
 
     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
 
 /**
     @class wxBookCtrlBase
 

diff --git a/interface/wx/choicebk.h b/interface/wx/choicebk.h
index 239fc4dfd8ce4774f3a96504bf0a0f0a72674e52..c055842d2acf046e9a1bcb928cefd10deb894242 100644 (file)
--- a/interface/wx/choicebk.h
+++ b/interface/wx/choicebk.h
@@ -6,6 +6,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 /**
     @class wxChoicebook
 


@@ -66,6 +78,18 @@ public:
                  const wxString& name = wxEmptyString);
     //@}
 
                  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.
     */
     /**
         Returns the wxChoice associated with the control.
     */

diff --git a/interface/wx/fontenum.h b/interface/wx/fontenum.h
index 15763d5ebff24552075b11be57edcc29c70f5e43..048e201b5fb5e691b49743336947252e488f04fa 100644 (file)
--- a/interface/wx/fontenum.h
+++ b/interface/wx/fontenum.h
@@ -35,6 +35,9 @@
 class wxFontEnumerator
 {
 public:
 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.
     /**
         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 5578ddd221c2beaac796956f5abe83db9db0e2da..e0d23fd9ed965110bc2b4fca9d2cdd4317aa7d11 100644 (file)
--- a/interface/wx/listbook.h
+++ b/interface/wx/listbook.h
@@ -6,6 +6,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 /**
     @class wxListbook
 


@@ -67,6 +78,17 @@ public:
                long style = 0,
                const wxString& name = wxEmptyString);
 
                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.
     */
     /**
         Returns the wxListView associated with the control.
     */

diff --git a/interface/wx/notebook.h b/interface/wx/notebook.h
index 59829ac0d82fc7d3ab38a3033bda250d6ad06b65..36101d3a0e94858c412cdc6462cea6660d7a409f 100644 (file)
--- a/interface/wx/notebook.h
+++ b/interface/wx/notebook.h
@@ -26,6 +26,10 @@ enum
 #define wxNB_NOPAGETHEME      0x0400
 #define wxNB_FLAT             0x0800
 
 #define wxNB_NOPAGETHEME      0x0400
 #define wxNB_FLAT             0x0800
 

+wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED;
+wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING;
+
+

 /**
     @class wxNotebook
 
 /**
     @class wxNotebook
 

diff --git a/interface/wx/toolbook.h b/interface/wx/toolbook.h
index b2db21a8d66a7a0c0b551dfb9dbfcc320acb650b..630f8eca543cac8c4d07dffc622c472369c1614d 100644 (file)
--- a/interface/wx/toolbook.h
+++ b/interface/wx/toolbook.h
@@ -6,6 +6,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 /**
     @class wxToolbook
 


@@ -61,6 +68,17 @@ public:
                  const wxString& name = wxEmptyString);
     //@}
 
                  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.
     */
     /**
         Returns the wxToolBarBase associated with the control.
     */

diff --git a/interface/wx/treebook.h b/interface/wx/treebook.h
index a49932823ffe2be65a904bb2459507d8ae63218e..776b2afca3e9688787bd8f7bab8c11dde2f55d43 100644 (file)
--- a/interface/wx/treebook.h
+++ b/interface/wx/treebook.h
@@ -6,6 +6,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 /**
     @class wxTreebook