wxMessageBox off the main thread lost result code.

[wxWidgets.git] / include / wx / msw / missing.h

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index ded2d2b101161d7dc8f852ed016c453dd05aef1d..e7522ee753541e99b9accc176ada965eca3f6318 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -3,7 +3,6 @@
 // Purpose:     Declarations for parts of the Win32 SDK that are missing in
 //              the versions that come with some compilers
 // Created:     2002/04/23
 // Purpose:     Declarations for parts of the Win32 SDK that are missing in
 //              the versions that come with some compilers
 // Created:     2002/04/23

-// RCS-ID:      $Id$

 // Copyright:   (c) 2002 Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2002 Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -77,12 +76,18 @@
     #ifndef WM_MOUSEWHEEL
         #define WM_MOUSEWHEEL           0x020A
     #endif
     #ifndef WM_MOUSEWHEEL
         #define WM_MOUSEWHEEL           0x020A
     #endif

+    #ifndef WM_MOUSEHWHEEL
+        #define WM_MOUSEHWHEEL          0x020E
+    #endif

     #ifndef WHEEL_DELTA
         #define WHEEL_DELTA             120
     #endif
     #ifndef SPI_GETWHEELSCROLLLINES
         #define SPI_GETWHEELSCROLLLINES 104
     #endif
     #ifndef WHEEL_DELTA
         #define WHEEL_DELTA             120
     #endif
     #ifndef SPI_GETWHEELSCROLLLINES
         #define SPI_GETWHEELSCROLLLINES 104
     #endif

+    #ifndef SPI_GETWHEELSCROLLCHARS
+        #define SPI_GETWHEELSCROLLCHARS 108
+    #endif

 #endif // wxUSE_MOUSEWHEEL
 
 // Needed by window.cpp
 #endif // wxUSE_MOUSEWHEEL
 
 // Needed by window.cpp


@@ -648,6 +653,10 @@ typedef struct
 #define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
 #endif
 
 #define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
 #endif
 

+#ifndef MUI_LANGUAGE_NAME
+#define MUI_LANGUAGE_NAME 0x8
+#endif
+

 //We need to check if we are using MinGW or mingw-w64 as their
 //definitions are different
 
 //We need to check if we are using MinGW or mingw-w64 as their
 //definitions are different
 


@@ -655,7 +664,7 @@ typedef struct
 #include <_mingw.h>
 #endif
 
 #include <_mingw.h>
 #endif
 

-#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
+#ifdef __MINGW32_TOOLCHAIN__

 typedef enum CommandStateChangeConstants {
     CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
     CSC_NAVIGATEFORWARD = 0x1,
 typedef enum CommandStateChangeConstants {
     CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
     CSC_NAVIGATEFORWARD = 0x1,