check for error in GetSelection(long *, long *); clean up SetSelect(long, long)

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index f4614c1267df3133e92cc9bdd35448244deb220e..ccbbbfc62e80550549aaaf24f11deeb4a4759351 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -37,18 +37,13 @@
 
 #include  "wx/msw/private.h"
 
-// Windows standard headers
-#ifndef   __WIN95__
-  #error  "wxNotebook is only supported Windows 95 and above"
-#endif    //Win95
-
-#include  <windowsx.h>  // for SetWindowFont
+#include  <windowsx.h>
 
 #ifdef __GNUWIN32_OLD__
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
+#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 
@@ -684,6 +679,10 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
 
 void wxNotebook::OnSize(wxSizeEvent& event)
 {
+#if wxUSE_UXTHEME
+  UpdateBgBrush();
+#endif // wxUSE_UXTHEME
+
   // fit the notebook page to the tab control's display area
   RECT rc;
   rc.left = rc.top = 0;
@@ -722,10 +721,6 @@ void wxNotebook::OnSize(wxSizeEvent& event)
     pPage->SetSize(rc.left, rc.top, width, height);
   }
 
-#if wxUSE_UXTHEME
-  UpdateBgBrush();
-#endif // wxUSE_UXTHEME
-
   event.Skip();
 }