Compilation fixes for old SDKs (VC6) after recent commit.

Define WM_QUERYUISTATE in wx/msw/missing.h too as src/msw/statbox.cpp uses it
now.

Also move DT_HIDEPREFIX definition from wx/msw/private/button.h to missing.h
as well as it's now used in statbox.cpp too. Include missing.h explicitly from
the files that use DT_HIDEPREFIX.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 67681d646429441c0f04230b27ae67d864b64b13..f4961c25621458c74cef9a7e96f2c63115fdc96d 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -29,19 +29,26 @@
     #define WM_CONTEXTMENU      0x007B
 #endif
 
-// Needed by toplevel.cpp
+#ifndef WM_CHANGEUISTATE
+    #define WM_CHANGEUISTATE    0x0127
+#endif
+
 #ifndef WM_UPDATEUISTATE
     #define WM_UPDATEUISTATE    0x0128
 #endif
 
-#ifndef WM_CHANGEUISTATE
-    #define WM_CHANGEUISTATE    0x0127
+#ifndef WM_QUERYUISTATE
+    #define WM_QUERYUISTATE     0x0129
 #endif
 
 #ifndef WM_PRINTCLIENT
     #define WM_PRINTCLIENT 0x318
 #endif
 
+#ifndef DT_HIDEPREFIX
+    #define DT_HIDEPREFIX 0x00100000
+#endif
+
 // Needed by toplevel.cpp
 #ifndef UIS_SET
     #define UIS_SET         1

diff --git a/include/wx/msw/private/button.h b/include/wx/msw/private/button.h
index fbd0d55f36e604f500787eaa64e2bd4016d44a0e..a6f2e68a9320f5f497c6734e343d01769fa5a272 100644 (file)
--- a/include/wx/msw/private/button.h
+++ b/include/wx/msw/private/button.h
@@ -28,10 +28,6 @@
     #define BST_INDETERMINATE 0x0002
 #endif
 
-#ifndef DT_HIDEPREFIX
-    #define DT_HIDEPREFIX 0x00100000
-#endif
-
 namespace wxMSWButton
 {
 

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 6da658c9b70c5e024eaf4c94fb8ce9ad810ee751..9d7fa154a70b631f185d4f09d2c0f0928b7f27ea 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -45,6 +45,7 @@
 #include "wx/msw/private/button.h"
 #include "wx/msw/private/dc.h"
 #include "wx/private/window.h"
+#include "wx/msw/missing.h"
 
 using namespace wxMSWImpl;
 

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 38a41092c9f2f4a7a7250505765b2b494967dea1..3d2e8d80a9d575c23ccd13a14003e3ccbc4dceb2 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -39,6 +39,7 @@
 #include "wx/renderer.h"
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private/button.h"
+#include "wx/msw/missing.h"
 
 // ----------------------------------------------------------------------------
 // constants