X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62e1ba759a61210a7facf7b9de39fc8bf0f4b479..b8ddac49a37a01ca1cf89f97dc97c4945b50ddab:/src/univ/notebook.cpp

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index 252723acd7..4c19121069 100644
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -255,7 +255,7 @@ int wxNotebook::SetSelection(int nPage)
         m_pages[m_sel]->Show();
     }
 
-    return m_sel;
+    return selOld;
 }
 
 void wxNotebook::ChangePage(int nPage)
@@ -382,7 +382,11 @@ wxNotebookPage *wxNotebook::DoRemovePage(int nPage)
     m_images.RemoveAt(nPage);
 
     // the spin button might not be needed any more
-    if ( HasSpinBtn() )
+    // 2002-08-12 'if' commented out by JACS on behalf
+    // of Hans Van Leemputten <Hansvl@softhome.net> who
+    // points out that UpdateSpinBtn should always be called,
+    // to ensure m_lastVisible is up to date.
+    // if ( HasSpinBtn() )
     {
         UpdateSpinBtn();
     }
@@ -458,7 +462,9 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n)
     {
         int image = m_images[n];
 
-#ifdef __WXMSW__    // FIXME
+        // Not needed now that wxGenericImageList is being
+        // used for wxUniversal under MSW
+#if 0 // def __WXMSW__    // FIXME
         int w, h;
         m_imageList->GetSize(n, w, h);
         bmp.Create(w, h);
@@ -1254,9 +1260,14 @@ void wxNotebook::DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags)
 {
-    wxControl::DoSetSize(x, y, width, height, sizeFlags);
+    wxSize old_client_size = GetClientSize();
 
-    Relayout();
+    wxControl::DoSetSize(x, y, width, height, sizeFlags);
+    
+    wxSize new_client_size = GetClientSize();
+    
+    if (old_client_size != new_client_size)
+        Relayout();
 }
 
 // ----------------------------------------------------------------------------