*** empty log message ***

[wxWidgets.git] / include / wx / choicebk.h

diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index 17f50bdc8d3bf46ab90fcc225b6d2c8ff0c8ec8f..db67bd1220fac5fc08305993fcca2c0b761d6cc9 100644 (file)
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -24,26 +24,6 @@
 
 class WXDLLEXPORT wxChoice;
 
 
 class WXDLLEXPORT wxChoice;
 

-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// wxChoicebook styles
-enum
-{
-    // default alignment: top everywhere
-    wxCHB_DEFAULT = 0,
-
-    // put the choice control to the left/right/top/bottom of the page area
-    wxCHB_TOP    = 0x1,
-    wxCHB_BOTTOM = 0x2,
-    wxCHB_LEFT   = 0x4,
-    wxCHB_RIGHT  = 0x8,
-
-    // the mask which can be used to extract the alignment from the style
-    wxCHB_ALIGN_MASK = 0xf
-};
-

 // ----------------------------------------------------------------------------
 // wxChoicebook
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxChoicebook
 // ----------------------------------------------------------------------------


@@ -99,10 +79,6 @@ public:
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 

-private:
-    // common part of all constructors
-    void Init();
-

     // get the size which the choice control should have
     wxSize GetChoiceSize() const;
 
     // get the size which the choice control should have
     wxSize GetChoiceSize() const;
 


@@ -113,13 +89,15 @@ private:
     void OnSize(wxSizeEvent& event);
     void OnChoiceSelected(wxCommandEvent& event);
 
     void OnSize(wxSizeEvent& event);
     void OnChoiceSelected(wxCommandEvent& event);
 

-

     // the choice control we use for showing the pages index
     wxChoice *m_choice;
 
     // the currently selected page or wxNOT_FOUND if none
     int m_selection;
 
     // the choice control we use for showing the pages index
     wxChoice *m_choice;
 
     // the currently selected page or wxNOT_FOUND if none
     int m_selection;
 

+private:
+    // common part of all constructors
+    void Init();

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook)


@@ -151,16 +129,16 @@ typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&);
   DECLARE_EVENT_TABLE_ENTRY(                                                \
     wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,                                  \
     id,                                                                     \
   DECLARE_EVENT_TABLE_ENTRY(                                                \
     wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,                                  \
     id,                                                                     \

-    -1,                                                                     \
+    wxID_ANY,                                                               \

     (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ),  \
     NULL                                                                    \
   ),
 
 #define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn)                                \
   DECLARE_EVENT_TABLE_ENTRY(                                                \
     (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ),  \
     NULL                                                                    \
   ),
 
 #define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn)                                \
   DECLARE_EVENT_TABLE_ENTRY(                                                \

-    wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,                                   \
+    wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,                                 \

     id,                                                                     \
     id,                                                                     \

-    -1,                                                                     \
+    wxID_ANY,                                                               \

     (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ),  \
     NULL                                                                    \
   ),
     (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ),  \
     NULL                                                                    \
   ),