char handling fixed again

[wxWidgets.git] / include / wx / msw / wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index a118da0480772e55b0382ec01599c8847f28a9f4..220d689e8c6281747462a7bcbd991a323266cc53 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -29,7 +29,7 @@
 //
 //
 
-#if defined( __GNUWIN32__ ) || defined(__MWERKS__)
+#if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
 #include <wx/msw/gnuwin32/winresrc.h>
 #else
 #include <windows.h>
@@ -40,6 +40,13 @@
 // Dummy Dialog for all wxCAPTION Dialog boxes
 //
 
+wxResizeableDialog DIALOG DISCARDABLE  34, 22, 144, 75
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+CAPTION ""
+BEGIN
+       LTEXT "", -1,-2,-2,1,1   //necessary for __WATCOMC__
+END
+
 wxCaptionDialog DIALOG DISCARDABLE  34, 22, 144, 75
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Dummy dialog"
@@ -105,6 +112,9 @@ WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 // Bitmaps
 //
 
+#ifdef __SALFORDC__
+wxDISABLE_BUTTON_BITMAP         BITMAP  WXINCDIR"wx/msw/disable.bmp"
+#else
 wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
-
+#endif