Fixes and XCode 2.3 update

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index c53ceb039556f69e35c66147bfed8dfb71e6475b..193bd61d6c8ae47ef199cd4602afeba72dff7b19 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -26,22 +26,22 @@
     #include  "wx/log.h"
     #include  "wx/event.h"
     #include  "wx/app.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
 
 #include  "wx/imaglist.h"
 #endif  // WX_PRECOMP
 
 #include  "wx/imaglist.h"

-#include  "wx/control.h"

 #include  "wx/sysopt.h"
 #include  "wx/sysopt.h"

-#include  "wx/dcclient.h"
-#include  "wx/dcmemory.h"

 
 #include  "wx/msw/private.h"
 
 #include  <windowsx.h>
 
 #include  "wx/msw/private.h"
 
 #include  <windowsx.h>

-
-#include <commctrl.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