64/32 bit fixes

[wxWidgets.git] / src / generic / choicbkg.cpp

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index 7216b152bc115a61d9ef755edcea1c6adbd397e5..91306d12358faba454caf1cf53696fe3d7326f1a 100644 (file)
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -50,14 +50,11 @@
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
 
-#if !WXWIN_COMPATIBILITY_EVENT_TYPES
 const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType();
-#endif
-const int wxID_CHOICEBOOKCHOICE = wxNewId();
 
 BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
-    EVT_CHOICE(wxID_CHOICEBOOKCHOICE, wxChoicebook::OnChoiceSelected)
+    EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected)
 END_EVENT_TABLE()
 
 // ============================================================================
@@ -98,7 +95,7 @@ wxChoicebook::Create(wxWindow *parent,
     m_bookctrl = new wxChoice
                  (
                     this,
-                    wxID_CHOICEBOOKCHOICE,
+                    wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize
                  );
@@ -110,7 +107,7 @@ wxChoicebook::Create(wxWindow *parent,
 
     m_controlSizer = new wxBoxSizer(IsVertical() ? wxHORIZONTAL : wxVERTICAL);
     m_controlSizer->Add(m_bookctrl, 1, (IsVertical() ? wxALIGN_CENTRE_VERTICAL : wxALIGN_CENTRE) |wxGROW, 0);
-    mainSizer->Add(m_controlSizer, 0, wxGROW|wxALL, m_controlMargin);
+    mainSizer->Add(m_controlSizer, 0, (IsVertical() ? (int) wxGROW : (int) wxALIGN_CENTRE_VERTICAL)|wxALL, m_controlMargin);
     SetSizer(mainSizer);
     return true;
 }
@@ -122,7 +119,6 @@ wxChoicebook::Create(wxWindow *parent,
 wxSize wxChoicebook::GetControllerSize() const
 {
     const wxSize sizeClient = GetClientSize(),
-                 // sizeChoice = m_bookctrl->GetBestFittingSize();
                  sizeChoice = m_controlSizer->CalcMin();
 
     wxSize size;
@@ -258,7 +254,6 @@ wxChoicebook::InsertPage(size_t n,
     if ( selNew != wxNOT_FOUND )
         SetSelection(selNew);
 
-    InvalidateBestSize();
     return true;
 }
 
@@ -304,6 +299,12 @@ bool wxChoicebook::DeleteAllPages()
 
 void wxChoicebook::OnChoiceSelected(wxCommandEvent& eventChoice)
 {
+    if ( eventChoice.GetEventObject() != m_bookctrl )
+    {
+        eventChoice.Skip();
+        return;
+    }
+
     const int selNew = eventChoice.GetSelection();
 
     if ( selNew == m_selection )