switching modal loop implementation, fixes #11921

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

diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index 32092c5631b8e2d0ba3b8b760e6ea783d1a43c35..76a03873926c82589ceaa2daac321825f8f14cf0 100644 (file)
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -21,8 +21,8 @@
 
 class WXDLLIMPEXP_FWD_CORE wxChoice;
 
 
 class WXDLLIMPEXP_FWD_CORE wxChoice;
 

-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;
-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING;
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );

 
 // wxChoicebook flags
 #define wxCHB_DEFAULT          wxBK_DEFAULT
 
 // wxChoicebook flags
 #define wxCHB_DEFAULT          wxBK_DEFAULT


@@ -70,13 +70,13 @@ public:
     virtual wxString GetPageText(size_t n) const;
     virtual int GetPageImage(size_t n) const;
     virtual bool SetPageImage(size_t n, int imageId);
     virtual wxString GetPageText(size_t n) const;
     virtual int GetPageImage(size_t n) const;
     virtual bool SetPageImage(size_t n, int imageId);

-    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;

     virtual bool InsertPage(size_t n,
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
                             int imageId = -1);
     virtual bool InsertPage(size_t n,
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
                             int imageId = -1);

-    virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
+    virtual int SetSelection(size_t n)
+        { return DoSetSelection(n, SetSelection_SendEvent); }

     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
     virtual void SetImageList(wxImageList *imageList);
 
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
     virtual void SetImageList(wxImageList *imageList);
 


@@ -86,15 +86,14 @@ public:
     wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }
 
 protected:
     wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }
 
 protected:

-    virtual wxWindow *DoRemovePage(size_t page);
+    virtual void DoSetWindowVariant(wxWindowVariant variant);

 
 

-    // get the size which the choice control should have
-    virtual wxSize GetControllerSize() const;
+    virtual wxWindow *DoRemovePage(size_t page);

 
     void UpdateSelectedPage(size_t newsel)
     {
 
     void UpdateSelectedPage(size_t newsel)
     {

-        m_selection = newsel;
-        GetChoiceCtrl()->Select(newsel);
+        m_selection = static_cast<int>(newsel);
+        GetChoiceCtrl()->Select(m_selection);

     }
 
     wxBookCtrlEvent* CreatePageChangingEvent() const;
     }
 
     wxBookCtrlEvent* CreatePageChangingEvent() const;