Restored wxSizeEvent code form last week -> wxGLCanvas

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 253038559ac8b630e28f1ee7c7b6410a6bd5a549..b71f9a0b4c1500f4f5a8c616ec7e47057c028a21 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -44,14 +44,18 @@ wxResizeableDialog DIALOG DISCARDABLE  34, 22, 144, 75
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION ""
 BEGIN
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION ""
 BEGIN

-       LTEXT "", -1,-2,-2,1,1   //necessary for __WATCOMC__
+#ifdef __WATCOMC__
+       LTEXT "", -1,-2,-2,1,1
+#endif

 END
 
 wxCaptionDialog DIALOG DISCARDABLE  34, 22, 144, 75
 END
 
 wxCaptionDialog DIALOG DISCARDABLE  34, 22, 144, 75

-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU

 CAPTION "Dummy dialog"
 BEGIN
 CAPTION "Dummy dialog"
 BEGIN

-       LTEXT "", -1,-2,-2,1,1   //necessary for __WATCOMC__
+#ifdef __WATCOMC__
+       LTEXT "", -1,-2,-2,1,1
+#endif

 END
 
 //
 END
 
 //


@@ -60,7 +64,9 @@ END
 wxNoCaptionDialog DIALOG 34, 22, 144, 75
 STYLE WS_POPUP
 BEGIN
 wxNoCaptionDialog DIALOG 34, 22, 144, 75
 STYLE WS_POPUP
 BEGIN

-       LTEXT "", -1,-2,-2,1,1   //necessary for __WATCOMC__
+#ifdef __WATCOMC__
+       LTEXT "", -1,-2,-2,1,1
+#endif

 END
 
 //////////////////////////////////////////////////////////////////////////////
 END
 
 //////////////////////////////////////////////////////////////////////////////


@@ -114,6 +120,7 @@ wxICON_QUESTION             ICON "wx/msw/question.ico"
 wxICON_WARNING         ICON "wx/msw/warning.ico"
 wxICON_ERROR           ICON "wx/msw/error.ico"
 wxICON_INFO            ICON "wx/msw/info.ico"
 wxICON_WARNING         ICON "wx/msw/warning.ico"
 wxICON_ERROR           ICON "wx/msw/error.ico"
 wxICON_INFO            ICON "wx/msw/info.ico"

+wxICON_TIP             ICON "wx/msw/tip.ico"

 
 //////////////////////////////////////////////////////////////////////////////
 //
 
 //////////////////////////////////////////////////////////////////////////////
 //


@@ -126,3 +133,8 @@ wxDISABLE_BUTTON_BITMAP         BITMAP  WXINCDIR"wx/msw/disable.bmp"
 wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
 #endif
 
 wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
 #endif
 

+
+// For src/generic/proplist.cpp
+tick_bmp                BITMAP  "wx/msw/tick.bmp"
+cross_bmp               BITMAP  "wx/msw/cross.bmp"
+