Sizing and positioning fixes for generic control.

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

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index 7ec5d753d03e49d3d04622a64fda2e3a616508b6..6eb021982140d50bd6862c49ac9ece583655012c 100644 (file)
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -26,11 +26,15 @@
 
 #if wxUSE_CHOICEBOOK
 
-#include "wx/choice.h"
 #include "wx/choicebk.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+    #include "wx/choice.h"
+    #include "wx/sizer.h"
+#endif
+
 #include "wx/imaglist.h"
-#include "wx/settings.h"
-#include "wx/sizer.h"
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
@@ -46,8 +50,10 @@
 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)
@@ -98,10 +104,10 @@ wxChoicebook::Create(wxWindow *parent,
                  );
 
     wxSizer* mainSizer = new wxBoxSizer(IsVertical() ? wxVERTICAL : wxHORIZONTAL);
-                 
-    if (style & wxCHB_RIGHT || style & wxCHB_BOTTOM)
+
+    if (style & wxBK_RIGHT || style & wxBK_BOTTOM)
         mainSizer->Add(0, 0, 1, wxEXPAND, 0);
-    
+
     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);
@@ -116,7 +122,6 @@ wxChoicebook::Create(wxWindow *parent,
 wxSize wxChoicebook::GetControllerSize() const
 {
     const wxSize sizeClient = GetClientSize(),
-                 // sizeChoice = m_bookctrl->GetBestFittingSize();
                  sizeChoice = m_controlSizer->CalcMin();
 
     wxSize size;
@@ -203,39 +208,14 @@ int wxChoicebook::GetSelection() const
     return m_selection;
 }
 
-int wxChoicebook::SetSelection(size_t n)
+wxBookCtrlBaseEvent* wxChoicebook::CreatePageChangingEvent() const
 {
-    wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND,
-                 wxT("invalid page index in wxChoicebook::SetSelection()") );
-
-    const int oldSel = m_selection;
-
-    if ( int(n) != m_selection )
-    {
-        wxChoicebookEvent event(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
-        event.SetSelection(n);
-        event.SetOldSelection(m_selection);
-        event.SetEventObject(this);
-        if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
-        {
-            if ( m_selection != wxNOT_FOUND )
-                m_pages[m_selection]->Hide();
-
-            wxWindow *page = m_pages[n];
-            page->SetSize(GetPageRect());
-            page->Show();
-
-            // change m_selection now to ignore the selection change event
-            m_selection = n;
-            GetChoiceCtrl()->Select(n);
-
-            // program allows the page change
-            event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
-            (void)GetEventHandler()->ProcessEvent(event);
-        }
-    }
+    return new wxChoicebookEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
+}
 
-    return oldSel;
+void wxChoicebook::MakeChangedEvent(wxBookCtrlBaseEvent &event)
+{
+    event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
 }
 
 // ----------------------------------------------------------------------------
@@ -277,7 +257,6 @@ wxChoicebook::InsertPage(size_t n,
     if ( selNew != wxNOT_FOUND )
         SetSelection(selNew);
 
-    InvalidateBestSize();
     return true;
 }