Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / os2 / private.h

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index a204619b5155fd96c75c978b958d92763273b299..9729793909e71dfb7ce878edd50631d30d8c67ef 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -6,7 +6,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -18,11 +17,14 @@
 #define INCL_PM
 #define INCL_GPI
 #define INCL_WINSYS
 #define INCL_PM
 #define INCL_GPI
 #define INCL_WINSYS

-#define INCL_SHLERRORS

 #define INCL_GPIERRORS
 #define INCL_DOS
 #define INCL_GPIERRORS
 #define INCL_DOS

-#define INCL_WINATOM
+#define INCL_DOSPROCESS
+#define INCL_DOSERRORS

 #define INCL_WIN
 #define INCL_WIN

+#define INCL_WINATOM
+#define INCL_SHLERRORS
+

 #include <os2.h>
 
 #if wxONLY_WATCOM_EARLIER_THAN(1,4)
 #include <os2.h>
 
 #if wxONLY_WATCOM_EARLIER_THAN(1,4)


@@ -169,12 +171,12 @@ typedef MRESULT (APIENTRY * WndProcCast) (HWND, ULONG, MPARAM, MPARAM);
  * for this combination of CTl3D/FAFA settings
  */
 
  * for this combination of CTl3D/FAFA settings
  */
 

-#define STATIC_CLASS     _T("STATIC")
+#define STATIC_CLASS     wxT("STATIC")

 #define STATIC_FLAGS     (SS_TEXT|DT_LEFT|SS_LEFT|WS_VISIBLE)
 #define STATIC_FLAGS     (SS_TEXT|DT_LEFT|SS_LEFT|WS_VISIBLE)

-#define CHECK_CLASS      _T("BUTTON")
+#define CHECK_CLASS      wxT("BUTTON")

 #define CHECK_FLAGS      (BS_AUTOCHECKBOX|WS_TABSTOP)
 #define CHECK_IS_FAFA    FALSE
 #define CHECK_FLAGS      (BS_AUTOCHECKBOX|WS_TABSTOP)
 #define CHECK_IS_FAFA    FALSE

-#define RADIO_CLASS      _T("BUTTON" )
+#define RADIO_CLASS      wxT("BUTTON" )

 #define RADIO_FLAGS      (BS_AUTORADIOBUTTON|WS_VISIBLE)
 #define RADIO_SIZE       20
 #define RADIO_IS_FAFA    FALSE
 #define RADIO_FLAGS      (BS_AUTORADIOBUTTON|WS_VISIBLE)
 #define RADIO_SIZE       20
 #define RADIO_IS_FAFA    FALSE


@@ -412,8 +414,7 @@ WXDLLIMPEXP_CORE extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
                                             ,long            lColor
                                            );
 #if wxUSE_GUI
                                             ,long            lColor
                                            );
 #if wxUSE_GUI

-#include "wx/colour.h"
-
+class wxColour;

 WXDLLIMPEXP_CORE extern COLORREF wxColourToRGB(const wxColour& rColor);
 #endif
 
 WXDLLIMPEXP_CORE extern COLORREF wxColourToRGB(const wxColour& rColor);
 #endif