remove wxSOCKET_MAX_EVENT, it is not really necessary and results in gcc warnings...

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

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index 7216b152bc115a61d9ef755edcea1c6adbd397e5..aa24856ec27034fb67135bb4a89015bbeec0c94f 100644 (file)
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -48,16 +48,12 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)
 // ----------------------------------------------------------------------------
 
 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();
 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)
 
 BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)

-    EVT_CHOICE(wxID_CHOICEBOOKCHOICE, wxChoicebook::OnChoiceSelected)
+    EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -98,7 +94,7 @@ wxChoicebook::Create(wxWindow *parent,
     m_bookctrl = new wxChoice
                  (
                     this,
     m_bookctrl = new wxChoice
                  (
                     this,

-                    wxID_CHOICEBOOKCHOICE,
+                    wxID_ANY,

                     wxDefaultPosition,
                     wxDefaultSize
                  );
                     wxDefaultPosition,
                     wxDefaultSize
                  );


@@ -110,7 +106,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);
 
     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;
 }
     SetSizer(mainSizer);
     return true;
 }


@@ -122,7 +118,6 @@ wxChoicebook::Create(wxWindow *parent,
 wxSize wxChoicebook::GetControllerSize() const
 {
     const wxSize sizeClient = GetClientSize(),
 wxSize wxChoicebook::GetControllerSize() const
 {
     const wxSize sizeClient = GetClientSize(),

-                 // sizeChoice = m_bookctrl->GetBestFittingSize();

                  sizeChoice = m_controlSizer->CalcMin();
 
     wxSize size;
                  sizeChoice = m_controlSizer->CalcMin();
 
     wxSize size;


@@ -209,12 +204,12 @@ int wxChoicebook::GetSelection() const
     return m_selection;
 }
 
     return m_selection;
 }
 

-wxBookCtrlBaseEvent* wxChoicebook::CreatePageChangingEvent() const
+wxBookCtrlEvent* wxChoicebook::CreatePageChangingEvent() const

 {
 {

-    return new wxChoicebookEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
+    return new wxBookCtrlEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);

 }
 
 }
 

-void wxChoicebook::MakeChangedEvent(wxBookCtrlBaseEvent &event)
+void wxChoicebook::MakeChangedEvent(wxBookCtrlEvent &event)

 {
     event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
 }
 {
     event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
 }


@@ -258,34 +253,33 @@ wxChoicebook::InsertPage(size_t n,
     if ( selNew != wxNOT_FOUND )
         SetSelection(selNew);
 
     if ( selNew != wxNOT_FOUND )
         SetSelection(selNew);
 

-    InvalidateBestSize();

     return true;
 }
 
 wxWindow *wxChoicebook::DoRemovePage(size_t page)
 {
     return true;
 }
 
 wxWindow *wxChoicebook::DoRemovePage(size_t page)
 {

-    const size_t page_count = GetPageCount();

     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {
         GetChoiceCtrl()->Delete(page);
 
     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {
         GetChoiceCtrl()->Delete(page);
 

-        if (m_selection >= (int)page)
+        if ( m_selection >= (int)page )

         {
         {

-            // force new sel valid if possible
-            int sel = m_selection - 1;
-            if (page_count == 1)
+            // ensure that the selection is valid
+            int sel;
+            if ( GetPageCount() == 0 )

                 sel = wxNOT_FOUND;
                 sel = wxNOT_FOUND;

-            else if ((page_count == 2) || (sel == -1))
-                sel = 0;
+            else
+                sel = m_selection ? m_selection - 1 : 0;

 
 

-            // force sel invalid if deleting current page - don't try to hide it
-            m_selection = (m_selection == (int)page) ? wxNOT_FOUND : m_selection - 1;
+            // if deleting current page we shouldn't try to hide it
+            m_selection = m_selection == (int)page ? wxNOT_FOUND
+                                                   : m_selection - 1;

 
 

-            if ((sel != wxNOT_FOUND) && (sel != m_selection))
+            if ( sel != wxNOT_FOUND && sel != m_selection )

                 SetSelection(sel);
                 SetSelection(sel);

-           }
+        }

     }
 
     return win;
     }
 
     return win;


@@ -294,6 +288,7 @@ wxWindow *wxChoicebook::DoRemovePage(size_t page)
 
 bool wxChoicebook::DeleteAllPages()
 {
 
 bool wxChoicebook::DeleteAllPages()
 {

+    m_selection = wxNOT_FOUND;

     GetChoiceCtrl()->Clear();
     return wxBookCtrlBase::DeleteAllPages();
 }
     GetChoiceCtrl()->Clear();
     return wxBookCtrlBase::DeleteAllPages();
 }


@@ -304,6 +299,12 @@ bool wxChoicebook::DeleteAllPages()
 
 void wxChoicebook::OnChoiceSelected(wxCommandEvent& eventChoice)
 {
 
 void wxChoicebook::OnChoiceSelected(wxCommandEvent& eventChoice)
 {

+    if ( eventChoice.GetEventObject() != m_bookctrl )
+    {
+        eventChoice.Skip();
+        return;
+    }
+

     const int selNew = eventChoice.GetSelection();
 
     if ( selNew == m_selection )
     const int selNew = eventChoice.GetSelection();
 
     if ( selNew == m_selection )