Committing in .

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index a7fcdfa20261e770a221b02a2c705c6563b3bd76..571f6506fc883510cc6315058c40f64a69e95057 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -18,30 +18,28 @@
 
 #if wxUSE_NOTEBOOK
 
 
 #if wxUSE_NOTEBOOK
 

-#include  "wx/notebook.h"
+#include "wx/notebook.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-    #include  "wx/string.h"
-    #include  "wx/dc.h"
-    #include  "wx/log.h"
-    #include  "wx/event.h"
-    #include  "wx/app.h"
-    #include  "wx/dcclient.h"
-    #include  "wx/dcmemory.h"
-    #include  "wx/control.h"
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/string.h"
+    #include "wx/dc.h"
+    #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/dcmemory.h"
+    #include "wx/control.h"

 #endif  // WX_PRECOMP
 
 #endif  // WX_PRECOMP
 

-#include  "wx/imaglist.h"
-#include  "wx/sysopt.h"
+#include "wx/imaglist.h"
+#include "wx/sysopt.h"

 
 

-#include  "wx/msw/private.h"
+#include "wx/msw/private.h"

 
 

-#include  <windowsx.h>
+#include <windowsx.h>

 #include "wx/msw/winundef.h"
 
 #include "wx/msw/winundef.h"
 

-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-

 #if wxUSE_UXTHEME
     #include "wx/msw/uxtheme.h"
 #endif
 #if wxUSE_UXTHEME
     #include "wx/msw/uxtheme.h"
 #endif


@@ -821,7 +819,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
             *flags |= wxBK_HITTEST_ONICON;
         if ((hitTestInfo.flags & TCHT_ONITEMLABEL) == TCHT_ONITEMLABEL)
             *flags |= wxBK_HITTEST_ONLABEL;
             *flags |= wxBK_HITTEST_ONICON;
         if ((hitTestInfo.flags & TCHT_ONITEMLABEL) == TCHT_ONITEMLABEL)
             *flags |= wxBK_HITTEST_ONLABEL;

-        if ( item == wxNOT_FOUND && GetPageSize().Inside(pt) )
+        if ( item == wxNOT_FOUND && GetPageSize().Contains(pt) )

             *flags |= wxBK_HITTEST_ONPAGE;
     }
 
             *flags |= wxBK_HITTEST_ONPAGE;
     }