X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4a95f6f991fa8685625831e52dc021b89727529..b059b79da758fae4c25bd54c85f67a4a0d80f12b:/src/msw/notebook.cpp diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index f4614c1267..ccbbbfc62e 100644 --- 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 // for SetWindowFont +#include #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 #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(); }