X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61c083e7818114734695cb26aa006098a86e62c3..28c91b7deb41c34001bc08c6b2855f15e654b220:/src/generic/listbkg.cpp

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 517227b3a5..dac6330df1 100644
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "listbook.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -134,7 +130,7 @@ wxListbook::Create(wxWindow *parent,
 #ifdef __WXMSW__
     // On XP with themes enabled the GetViewRect used in GetListSize to
     // determine the space needed for the list view will incorrectly return
-    // (0,0,0,0) the first time.  So send a pending event so OnSize wiull be
+    // (0,0,0,0) the first time.  So send a pending event so OnSize will be
     // called again after the window is ready to go.  Technically we don't
     // need to do this on non-XP windows, but if things are already sized
     // correctly then nothing changes and so there is no harm.
@@ -151,7 +147,8 @@ wxListbook::Create(wxWindow *parent,
 wxSize wxListbook::GetListSize() const
 {
     const wxSize sizeClient = GetClientSize(),
-                 sizeList = m_list->GetViewRect().GetSize();
+                 sizeBorder = m_list->GetSize() - m_list->GetClientSize(),
+                 sizeList = m_list->GetViewRect().GetSize() + sizeBorder;
 
     wxSize size;
     if ( IsVertical() )
@@ -172,7 +169,7 @@ wxRect wxListbook::GetPageRect() const
 {
     const wxSize sizeList = m_list->GetSize();
 
-    wxPoint pt(0, 0);
+    wxPoint pt;
     wxRect rectPage(pt, GetClientSize());
     switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
     {
@@ -210,10 +207,21 @@ void wxListbook::OnSize(wxSizeEvent& event)
         return;
     }
 
+    // arrange the icons before calling SetClientSize(), otherwise it wouldn't
+    // account for the scrollbars the list control might need and, at least
+    // under MSW, we'd finish with an ugly looking list control with both
+    // vertical and horizontal scrollbar (with one of them being added because
+    // the other one is not accounted for in client size computations)
+    m_list->Arrange();
+
     // resize the list control and the page area to fit inside our new size
     const wxSize sizeClient = GetClientSize(),
+                 sizeBorder = m_list->GetSize() - m_list->GetClientSize(),
                  sizeList = GetListSize();
 
+    m_list->SetClientSize( sizeList.x - sizeBorder.x, sizeList.y - sizeBorder.y );
+
+    const wxSize sizeNew = m_list->GetSize();
     wxPoint posList;
     switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
     {
@@ -227,16 +235,16 @@ void wxListbook::OnSize(wxSizeEvent& event)
             break;
 
         case wxLB_BOTTOM:
-            posList.y = sizeClient.y - sizeList.y;
+            posList.y = sizeClient.y - sizeNew.y;
             break;
 
         case wxLB_RIGHT:
-            posList.x = sizeClient.x - sizeList.x;
+            posList.x = sizeClient.x - sizeNew.x;
             break;
     }
 
-    m_list->Move(posList.x, posList.y);
-    m_list->SetClientSize(sizeList.x, sizeList.y);
+    if ( m_list->GetPosition() != posList )
+        m_list->Move(posList);
 
 #if wxUSE_LINE_IN_LISTBOOK
     if ( m_line )
@@ -246,23 +254,23 @@ void wxListbook::OnSize(wxSizeEvent& event)
         switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
         {
             case wxLB_TOP:
-                rectLine.y = sizeList.y + 1;
+                rectLine.y = sizeNew.y + 1;
                 rectLine.height = MARGIN - 2;
                 break;
 
             case wxLB_BOTTOM:
                 rectLine.height = MARGIN - 2;
-                rectLine.y = sizeClient.y - sizeList.y - rectLine.height;
+                rectLine.y = sizeClient.y - sizeNew.y - rectLine.height;
                 break;
 
             case wxLB_LEFT:
-                rectLine.x = sizeList.x + 1;
+                rectLine.x = sizeNew.x + 1;
                 rectLine.width = MARGIN - 2;
                 break;
 
             case wxLB_RIGHT:
                 rectLine.width = MARGIN - 2;
-                rectLine.x = sizeClient.x - sizeList.x - rectLine.width;
+                rectLine.x = sizeClient.x - sizeNew.x - rectLine.width;
                 break;
         }
 
@@ -276,7 +284,7 @@ void wxListbook::OnSize(wxSizeEvent& event)
         wxWindow *page = m_pages[m_selection];
         wxCHECK_RET( page, _T("NULL page in wxListbook?") );
         page->SetSize(GetPageRect());
-        }
+    }
 }
 
 wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
@@ -318,7 +326,7 @@ int wxListbook::GetPageImage(size_t WXUNUSED(n)) const
 {
     wxFAIL_MSG( _T("wxListbook::GetPageImage() not implemented") );
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 bool wxListbook::SetPageImage(size_t n, int imageId)
@@ -423,6 +431,7 @@ wxListbook::InsertPage(size_t n,
         SetSelection(selNew);
 
     InvalidateBestSize();
+    m_list->Arrange();
     return true;
 }
 
@@ -450,6 +459,8 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
             if ((sel != wxNOT_FOUND) && (sel != m_selection))
                 SetSelection(sel);
         }
+
+        m_list->Arrange();
     }
 
     return win;