compilation fix for wxGetEmptyString() with wxUSE_STL == 1

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

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 3e8d09d7fb1aa5b9427894f15d553ea20268d285..313205d05135e52b52e79c1a80a28cab7d696329 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -45,7 +45,14 @@
 const wxCoord MARGIN = 5;
 
 // ----------------------------------------------------------------------------
 const wxCoord MARGIN = 5;
 
 // ----------------------------------------------------------------------------

-// various wxWindows macros
+// various wxWidgets macros
+// ----------------------------------------------------------------------------
+
+// check that the page index is valid
+#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
+
+// ----------------------------------------------------------------------------
+// event table

 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxControl)
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxControl)


@@ -117,7 +124,7 @@ wxListbook::Create(wxWindow *parent,
     m_line = new wxStaticLine
                  (
                     this,
     m_line = new wxStaticLine
                  (
                     this,

-                    -1,
+                    wxID_ANY,

                     wxDefaultPosition,
                     wxDefaultSize,
                     IsVertical() ? wxLI_HORIZONTAL : wxLI_VERTICAL
                     wxDefaultPosition,
                     wxDefaultSize,
                     IsVertical() ? wxLI_HORIZONTAL : wxLI_VERTICAL


@@ -262,23 +269,13 @@ void wxListbook::OnSize(wxSizeEvent& event)
     }
 #endif // wxUSE_LINE_IN_LISTBOOK
 
     }
 #endif // wxUSE_LINE_IN_LISTBOOK
 

-    // we should always have some selection if possible
-    if ( m_selection == wxNOT_FOUND && GetPageCount() )
-    {
-        SetSelection(0);
-    }
-
-    if ( m_selection != wxNOT_FOUND )
+    // resize the currently shown page
+    if (m_selection != wxNOT_FOUND )

     {
         wxWindow *page = m_pages[m_selection];
         wxCHECK_RET( page, _T("NULL page in wxListbook?") );
     {
         wxWindow *page = m_pages[m_selection];
         wxCHECK_RET( page, _T("NULL page in wxListbook?") );

-

         page->SetSize(GetPageRect());
         page->SetSize(GetPageRect());

-        if ( !page->IsShown() )
-        {
-            page->Show();

         }
         }

-    }

 }
 
 wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
 }
 
 wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const


@@ -350,23 +347,39 @@ int wxListbook::GetSelection() const
 
 int wxListbook::SetSelection(size_t n)
 {
 
 int wxListbook::SetSelection(size_t n)
 {

-    wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
-                 _T("invalid page index in wxListbook::SetSelection()") );
+    wxCHECK_MSG( IS_VALID_PAGE(n), wxNOT_FOUND,
+                 wxT("invalid page index in wxListbook::SetSelection()") );

 
 

-    int selOld = m_selection;
+    const int oldSel = m_selection;

 
 

-    if ( (int)n != m_selection )
+    if ( int(n) != m_selection )

     {
     {

-        m_selection = n;
+        wxListbookEvent event(wxEVT_COMMAND_LISTBOOK_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();

 
 

-        m_list->Select(m_selection);
-        m_list->Focus(m_selection);
+            wxWindow *page = m_pages[n];
+            page->SetSize(GetPageRect());
+            page->Show();
+
+            m_selection = n;
+            m_list->Select(n);
+            m_list->Focus(n);
+
+            // program allows the page change
+            event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
+            (void)GetEventHandler()->ProcessEvent(event);
+        }

     }
 
     }
 

-    return selOld;
+    return oldSel;

 }
 
 }
 

-

 // ----------------------------------------------------------------------------
 // adding/removing the pages
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // adding/removing the pages
 // ----------------------------------------------------------------------------


@@ -383,10 +396,10 @@ wxListbook::InsertPage(size_t n,
 
     m_list->InsertItem(n, text, imageId);
 
 
     m_list->InsertItem(n, text, imageId);
 

-    if ( bSelect )
+    // we should always have some selection if possible
+    if ( bSelect || (m_selection == wxNOT_FOUND) )

     {
     {

-        m_list->Select(n);
-        m_list->Focus(n);
+        SetSelection(n);

     }
     else // don't select this page
     {
     }
     else // don't select this page
     {


@@ -394,20 +407,46 @@ wxListbook::InsertPage(size_t n,
         page->Hide();
     }
 
         page->Hide();
     }
 

+    InvalidateBestSize();

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

+    const int page_count = GetPageCount();

     wxWindow *win = wxBookCtrl::DoRemovePage(page);
     wxWindow *win = wxBookCtrl::DoRemovePage(page);

+

     if ( win )
     {
         m_list->DeleteItem(page);
     if ( win )
     {
         m_list->DeleteItem(page);

+
+        if (m_selection >= (int)page)
+        {
+            // force new sel valid if possible
+            int sel = m_selection - 1;
+            if (page_count == 1)
+                sel = wxNOT_FOUND;
+            else if ((page_count == 2) || (sel == -1))
+                sel = 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 ((sel != wxNOT_FOUND) && (sel != m_selection))
+                SetSelection(sel);
+        }

     }
 
     return win;
 }
 
     }
 
     return win;
 }
 

+
+bool wxListbook::DeleteAllPages()
+{
+    m_list->DeleteAllItems();
+    return wxBookCtrl::DeleteAllPages();
+}
+

 // ----------------------------------------------------------------------------
 // wxListbook events
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxListbook events
 // ----------------------------------------------------------------------------


@@ -415,6 +454,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
 void wxListbook::OnListSelected(wxListEvent& eventList)
 {
     const int selNew = eventList.GetIndex();
 void wxListbook::OnListSelected(wxListEvent& eventList)
 {
     const int selNew = eventList.GetIndex();

+    const int selOld = m_selection;

 
     if ( selNew == m_selection )
     {
 
     if ( selNew == m_selection )
     {


@@ -429,7 +469,7 @@ void wxListbook::OnListSelected(wxListEvent& eventList)
 
     eventIng.SetEventObject(this);
     eventIng.SetSelection(selNew);
 
     eventIng.SetEventObject(this);
     eventIng.SetSelection(selNew);

-    eventIng.SetOldSelection(m_selection);
+    eventIng.SetOldSelection(selOld);

     if ( GetEventHandler()->ProcessEvent(eventIng) && !eventIng.IsAllowed() )
     {
         m_list->Select(m_selection);
     if ( GetEventHandler()->ProcessEvent(eventIng) && !eventIng.IsAllowed() )
     {
         m_list->Select(m_selection);


@@ -437,17 +477,13 @@ void wxListbook::OnListSelected(wxListEvent& eventList)
     }
 
     // change allowed: do change the page and notify the user about it
     }
 
     // change allowed: do change the page and notify the user about it

-    if ( m_selection != wxNOT_FOUND )
-        m_pages[m_selection]->Hide();
-    wxWindow *page = m_pages[m_selection = selNew];
-    page->SetSize(GetPageRect());
-    page->Show();
+    SetSelection(selNew);

 
     wxListbookEvent eventEd(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, GetId());
 
     eventEd.SetEventObject(this);
     eventEd.SetSelection(selNew);
 
     wxListbookEvent eventEd(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, GetId());
 
     eventEd.SetEventObject(this);
     eventEd.SetSelection(selNew);

-    eventEd.SetOldSelection(m_selection);
+    eventEd.SetOldSelection(selOld);

 
     (void)GetEventHandler()->ProcessEvent(eventEd);
 }
 
     (void)GetEventHandler()->ProcessEvent(eventEd);
 }