moved missing constants definitions to their right place in wx/msw/missing.h

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 09eaa8d6d7cd8af8a5d1fbe2a7258ace82ba6f88..489140ee53bbe0dd1c1690c6304bd2fb5a79ba50 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -249,5 +249,13 @@ struct HH_AKLINK
     #define QS_ALLPOSTMESSAGE    0x0100
 #endif
 
     #define QS_ALLPOSTMESSAGE    0x0100
 #endif
 

+#ifndef WS_EX_CLIENTEDGE
+    #define WS_EX_CLIENTEDGE 0x00000200L
+#endif
+
+#ifndef ENDSESSION_LOGOFF
+    #define ENDSESSION_LOGOFF    0x80000000
+#endif
+

 #endif
     // _WX_MISSING_H_
 #endif
     // _WX_MISSING_H_

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 7f26ece1cb627dd44eb12289be577c3574cb19c1..d1f5d61b8c36ffd35ff67347bd8a3e05b20c4974 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -183,22 +183,6 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 extern LONG APIENTRY _EXPORT
   wxSubclassedGenericControlProc(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
 extern LONG APIENTRY _EXPORT
   wxSubclassedGenericControlProc(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 

-// ---------------------------------------------------------------------------
-// constants which might miss from some compilers' headers
-// ---------------------------------------------------------------------------
-
-#if !defined(__WIN32__) && !defined(WS_EX_CLIENTEDGE)
-    #define WS_EX_CLIENTEDGE 0
-#endif
-
-#if defined(__WIN32__) && !defined(WS_EX_CLIENTEDGE)
-    #define WS_EX_CLIENTEDGE 0x00000200L
-#endif
-
-#ifndef ENDSESSION_LOGOFF
-    #define ENDSESSION_LOGOFF    0x80000000
-#endif
-

 // ---------------------------------------------------------------------------
 // useful macros and functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // useful macros and functions
 // ---------------------------------------------------------------------------