ensure that ProcessEvent() is called for all the event handlers, not just the first...

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

diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index 32092c5631b8e2d0ba3b8b760e6ea783d1a43c35..8519a6bf2e687906eca90f69aad79f45122b8372 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


@@ -93,7 +93,7 @@ protected:
 
     void UpdateSelectedPage(size_t newsel)
     {
 
     void UpdateSelectedPage(size_t newsel)
     {

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

         GetChoiceCtrl()->Select(newsel);
     }
 
         GetChoiceCtrl()->Select(newsel);
     }