old compilation fix for AIX from Ian Brown

[wxWidgets.git] / src / univ / notebook.cpp

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index c90d042c3972158c88c8ae86860fdef175c5c3e5..4c19121069fa5851af7e7bd9308856e780ec36f7 100644 (file)
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -255,7 +255,7 @@ int wxNotebook::SetSelection(int nPage)
         m_pages[m_sel]->Show();
     }
 
         m_pages[m_sel]->Show();
     }
 

-    return m_sel;
+    return selOld;

 }
 
 void wxNotebook::ChangePage(int nPage)
 }
 
 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
     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();
     }
     {
         UpdateSpinBtn();
     }


@@ -458,7 +462,9 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n)
     {
         int image = m_images[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);
         int w, h;
         m_imageList->GetSize(n, w, h);
         bmp.Create(w, h);