Fix typo in last commit

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

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index c40ba14fe4ab45744dad0b232d2c5b948e881e6d..52fd088591cea7cd805d9751d00e7d084297bcde 100644 (file)
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        generic/choicbkg.cpp
+// Name:        src/generic/choicbkg.cpp

 // Purpose:     generic implementation of wxChoicebook
 // Author:      Vadim Zeitlin
 // Modified by: Wlodzimierz ABX Skiba from generic/listbkg.cpp
 // Purpose:     generic implementation of wxChoicebook
 // Author:      Vadim Zeitlin
 // Modified by: Wlodzimierz ABX Skiba from generic/listbkg.cpp


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "choicebook.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,22 +26,16 @@
 
 #if wxUSE_CHOICEBOOK
 
 
 #if wxUSE_CHOICEBOOK
 

-#include "wx/choice.h"

 #include "wx/choicebk.h"
 #include "wx/choicebk.h"

-#include "wx/imaglist.h"
-#include "wx/settings.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------

 
 

-// margin between the choice and the page
-#if defined(__WXWINCE__)
-const wxCoord MARGIN = 1;
-#else
-const wxCoord MARGIN = 5;
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+    #include "wx/choice.h"
+    #include "wx/sizer.h"

 #endif
 
 #endif
 

+#include "wx/imaglist.h"
+

 // ----------------------------------------------------------------------------
 // various wxWidgets macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
 // ----------------------------------------------------------------------------


@@ -57,16 +47,13 @@ const wxCoord MARGIN = 5;
 // event table
 // ----------------------------------------------------------------------------
 
 // event table
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)

 
 

-const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType();
-const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType();
-const int wxID_CHOICEBOOKCHOICE = wxNewId();
+wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );

 
 BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
 
 BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)

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

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


@@ -77,12 +64,6 @@ END_EVENT_TABLE()
 // wxChoicebook creation
 // ----------------------------------------------------------------------------
 
 // wxChoicebook creation
 // ----------------------------------------------------------------------------
 

-void wxChoicebook::Init()
-{
-    m_choice = NULL;
-    m_selection = wxNOT_FOUND;
-}
-

 bool
 wxChoicebook::Create(wxWindow *parent,
                      wxWindowID id,
 bool
 wxChoicebook::Create(wxWindow *parent,
                      wxWindowID id,


@@ -91,9 +72,9 @@ wxChoicebook::Create(wxWindow *parent,
                      long style,
                      const wxString& name)
 {
                      long style,
                      const wxString& name)
 {

-    if ( (style & wxCHB_ALIGN_MASK) == wxCHB_DEFAULT )
+    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )

     {
     {

-        style |= wxCHB_TOP;
+        style |= wxBK_TOP;

     }
 
     // no border for this control, it doesn't look nice together with
     }
 
     // no border for this control, it doesn't look nice together with


@@ -105,173 +86,69 @@ wxChoicebook::Create(wxWindow *parent,
                             wxDefaultValidator, name) )
         return false;
 
                             wxDefaultValidator, name) )
         return false;
 

-    m_choice = new wxChoice
+    m_bookctrl = new wxChoice

                  (
                     this,
                  (
                     this,

-                    wxID_CHOICEBOOKCHOICE,
+                    wxID_ANY,

                     wxDefaultPosition,
                     wxDefaultSize
                  );
 
                     wxDefaultPosition,
                     wxDefaultSize
                  );
 

-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// wxChoicebook geometry management
-// ----------------------------------------------------------------------------
-
-wxSize wxChoicebook::GetChoiceSize() const
-{
-    const wxSize sizeClient = GetClientSize(),
-                 sizeChoice = m_choice->GetBestSize();
-
-    wxSize size;
-    if ( IsVertical() )
-    {
-        size.x = sizeClient.x;
-        size.y = sizeChoice.y;
-    }
-    else // left/right aligned
-    {
-        size.x = sizeChoice.x;
-        size.y = sizeClient.y;
-    }
-
-    return size;
-}
-
-wxRect wxChoicebook::GetPageRect() const
-{
-    const wxSize sizeChoice = m_choice->GetSize();
-
-    wxPoint pt(0, 0);
-    wxRect rectPage(pt, GetClientSize());
-    switch ( GetWindowStyle() & wxCHB_ALIGN_MASK )
-    {
-        default:
-            wxFAIL_MSG( _T("unexpected wxChoicebook alignment") );
-            // fall through
-
-        case wxCHB_TOP:
-            rectPage.y = sizeChoice.y + MARGIN;
-            // fall through
-
-        case wxCHB_BOTTOM:
-            rectPage.height -= sizeChoice.y + MARGIN;
-            break;
-
-        case wxCHB_LEFT:
-            rectPage.x = sizeChoice.x + MARGIN;
-            // fall through
-
-        case wxCHB_RIGHT:
-            rectPage.width -= sizeChoice.x + MARGIN;
-            break;
-    }
-
-    return rectPage;
-}
-
-void wxChoicebook::OnSize(wxSizeEvent& event)
-{
-    event.Skip();
-
-    if ( !m_choice )
-    {
-        // we're not fully created yet
-        return;
-    }
-
-    // resize the choice control and the page area to fit inside our new size
-    const wxSize sizeClient = GetClientSize(),
-                 sizeChoice = GetChoiceSize();
-
-    wxPoint posChoice;
-    switch ( GetWindowStyle() & wxCHB_ALIGN_MASK )
-    {
-        default:
-            wxFAIL_MSG( _T("unexpected wxChoicebook alignment") );
-            // fall through
-
-        case wxCHB_TOP:
-        case wxCHB_LEFT:
-            // posChoice is already ok
-            break;
-
-        case wxCHB_BOTTOM:
-            posChoice.y = sizeClient.y - sizeChoice.y;
-            break;
-
-        case wxCHB_RIGHT:
-            posChoice.x = sizeClient.x - sizeChoice.x;
-            break;
-    }
-
-    m_choice->Move(posChoice.x, posChoice.y);
-    m_choice->SetSize(sizeChoice.x, sizeChoice.y);
-
-    // resize the currently shown page
-    if ( m_selection != wxNOT_FOUND )
-    {
-        wxWindow *page = m_pages[m_selection];
-        wxCHECK_RET( page, _T("NULL page in wxChoicebook?") );
-        page->SetSize(GetPageRect());
-    }
-}
-
-wxSize wxChoicebook::CalcSizeFromPage(const wxSize& sizePage) const
-{
-    // we need to add the size of the choice control and the margin
-    const wxSize sizeChoice = GetChoiceSize();
+    wxSizer* mainSizer = new wxBoxSizer(IsVertical() ? wxVERTICAL : wxHORIZONTAL);

 
 

-    wxSize size = sizePage;
-    if ( IsVertical() )
-    {
-        size.y += sizeChoice.y + MARGIN;
-    }
-    else // left/right aligned
-    {
-        size.x += sizeChoice.x + MARGIN;
-    }
+    if (style & wxBK_RIGHT || style & wxBK_BOTTOM)
+        mainSizer->Add(0, 0, 1, wxEXPAND, 0);

 
 

-    return size;
+    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, (IsVertical() ? (int) wxGROW : (int) wxALIGN_CENTRE_VERTICAL)|wxALL, m_controlMargin);
+    SetSizer(mainSizer);
+    return true;

 }
 
 }
 

-

 // ----------------------------------------------------------------------------
 // accessing the pages
 // ----------------------------------------------------------------------------
 
 bool wxChoicebook::SetPageText(size_t n, const wxString& strText)
 {
 // ----------------------------------------------------------------------------
 // accessing the pages
 // ----------------------------------------------------------------------------
 
 bool wxChoicebook::SetPageText(size_t n, const wxString& strText)
 {

-    m_choice->SetString(n, strText);
+    GetChoiceCtrl()->SetString(n, strText);

 
     return true;
 }
 
 wxString wxChoicebook::GetPageText(size_t n) const
 {
 
     return true;
 }
 
 wxString wxChoicebook::GetPageText(size_t n) const
 {

-    return m_choice->GetString(n);
+    return GetChoiceCtrl()->GetString(n);

 }
 
 int wxChoicebook::GetPageImage(size_t WXUNUSED(n)) const
 {
 }
 
 int wxChoicebook::GetPageImage(size_t WXUNUSED(n)) const
 {

-    wxFAIL_MSG( _T("wxChoicebook::GetPageImage() not implemented") );
-
-    return -1;
+    return wxNOT_FOUND;

 }
 
 bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))
 {
 }
 
 bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))
 {

-    wxFAIL_MSG( _T("wxChoicebook::SetPageImage() not implemented") );
+    // fail silently, the code may be written to use one of several book
+    // classes and call SetPageImage() unconditionally, it's better to just
+    // ignore it (which is the best we can do short of rewriting this class to
+    // use wxBitmapComboBox anyhow) than complain loudly about a rather
+    // harmless problem

 
     return false;
 }
 
 // ----------------------------------------------------------------------------
 
     return false;
 }
 
 // ----------------------------------------------------------------------------

-// image list stuff
+// miscellaneous other stuff

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

+void wxChoicebook::DoSetWindowVariant(wxWindowVariant variant)
+{
+    wxBookCtrlBase::DoSetWindowVariant(variant);
+    if (m_bookctrl)
+        m_bookctrl->SetWindowVariant(variant);
+}
+

 void wxChoicebook::SetImageList(wxImageList *imageList)
 {
     // TODO: can be implemented in form of static bitmap near choice control
 void wxChoicebook::SetImageList(wxImageList *imageList)
 {
     // TODO: can be implemented in form of static bitmap near choice control


@@ -283,44 +160,14 @@ void wxChoicebook::SetImageList(wxImageList *imageList)
 // selection
 // ----------------------------------------------------------------------------
 
 // selection
 // ----------------------------------------------------------------------------
 

-int wxChoicebook::GetSelection() const
+wxBookCtrlEvent* wxChoicebook::CreatePageChangingEvent() const

 {
 {

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

 }
 
 }
 

-int wxChoicebook::SetSelection(size_t n)
+void wxChoicebook::MakeChangedEvent(wxBookCtrlEvent &event)

 {
 {

-    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;
-            m_choice->Select(n);
-
-            // program allows the page change
-            event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
-            (void)GetEventHandler()->ProcessEvent(event);
-        }
-    }
-
-    return oldSel;
+    event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -337,7 +184,7 @@ wxChoicebook::InsertPage(size_t n,
     if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) )
         return false;
 
     if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) )
         return false;
 

-    m_choice->Insert(text, n);
+    GetChoiceCtrl()->Insert(text, n);

 
     // if the inserted page is before the selected one, we must update the
     // index of the selected page
 
     // if the inserted page is before the selected one, we must update the
     // index of the selected page


@@ -345,51 +192,39 @@ wxChoicebook::InsertPage(size_t n,
     {
         // one extra page added
         m_selection++;
     {
         // one extra page added
         m_selection++;

-        m_choice->Select(m_selection);
+        GetChoiceCtrl()->Select(m_selection);

     }
 
     }
 

-    // some page should be selected: either this one or the first one if there
-    // is still no selection
-    int selNew = -1;
-    if ( bSelect )
-        selNew = n;
-    else if ( m_selection == -1 )
-        selNew = 0;
-
-    if ( selNew != m_selection )
+    if ( !DoSetSelectionAfterInsertion(n, bSelect) )

         page->Hide();
 
         page->Hide();
 

-    if ( selNew != -1 )
-        SetSelection(selNew);
-
-    InvalidateBestSize();

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

-    const int page_count = GetPageCount();

     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {
     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {

-        m_choice->Delete(page);
+        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;


@@ -398,7 +233,7 @@ wxWindow *wxChoicebook::DoRemovePage(size_t page)
 
 bool wxChoicebook::DeleteAllPages()
 {
 
 bool wxChoicebook::DeleteAllPages()
 {

-    m_choice->Clear();
+    GetChoiceCtrl()->Clear();

     return wxBookCtrlBase::DeleteAllPages();
 }
 
     return wxBookCtrlBase::DeleteAllPages();
 }
 


@@ -408,6 +243,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 )


@@ -422,7 +263,7 @@ void wxChoicebook::OnChoiceSelected(wxCommandEvent& eventChoice)
 
     // change wasn't allowed, return to previous state
     if (m_selection != selNew)
 
     // change wasn't allowed, return to previous state
     if (m_selection != selNew)

-        m_choice->Select(m_selection);
+        GetChoiceCtrl()->Select(m_selection);

 }
 
 #endif // wxUSE_CHOICEBOOK
 }
 
 #endif // wxUSE_CHOICEBOOK