Removed unnecessary code from utilsunx.cpp

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index a118da0480772e55b0382ec01599c8847f28a9f4..0f60b9bca78f1a5eabc5ef674ab77df6522de007 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -25,14 +25,14 @@
 // LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF
 // DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH
 // THE USE OR PERFORMANCE OF THIS SOFTWARE.
-/////////////////////////////////////////////////////////////////////////////
-//
 //
+// Version: $Id$
+/////////////////////////////////////////////////////////////////////////////
 
-#if defined( __GNUWIN32__ ) || defined(__MWERKS__)
-#include <wx/msw/gnuwin32/winresrc.h>
+#if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
+       #include <wx/msw/gnuwin32/winresrc.h>
 #else
-#include <windows.h>
+       #include <windows.h>
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
@@ -40,11 +40,22 @@
 // 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
+#ifdef __WATCOMC__
+       LTEXT "", -1,-2,-2,1,1
+#endif
+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
-       LTEXT "", -1,-2,-2,1,1   //necessary for __WATCOMC__
+#ifdef __WATCOMC__
+       LTEXT "", -1,-2,-2,1,1
+#endif
 END
 
 //
@@ -53,7 +64,9 @@ END
 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
 
 //////////////////////////////////////////////////////////////////////////////
@@ -66,7 +79,9 @@ BEGIN
     POPUP "&Window"
     BEGIN
         MENUITEM "&Cascade",                    4002
-        MENUITEM "&Tile",                       4001
+        MENUITEM "Tile &Horizontally",          4001
+        MENUITEM "Tile &Vertically",            4005
+       MENUITEM "", -1
         MENUITEM "&Arrange Icons",              4003
         MENUITEM "&Next",                       4004
     END
@@ -100,11 +115,33 @@ WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 //wxDEFAULT_MDIPARENTFRAME      ICON "wx/msw/mdi.ico"
 //wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
 
+// Standard icons
+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_TIP             ICON "wx/msw/tip.ico"
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Bitmaps
 //
 
+#ifdef __SALFORDC__
+wxDISABLE_BUTTON_BITMAP         BITMAP  WXINCDIR"wx/msw/disable.bmp"
+#else
 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"
 
+// For src/generic/plot.cpp
+plot_up_bmp             BITMAP  "wx/msw/plot_up.bmp"
+plot_dwn_bmp            BITMAP  "wx/msw/plot_dwn.bmp"
+plot_enl_bmp            BITMAP  "wx/msw/plot_enl.bmp"
+plot_shr_bmp            BITMAP  "wx/msw/plot_shr.bmp"
+plot_zin_bmp            BITMAP  "wx/msw/plot_zin.bmp"
+plot_zot_bmp            BITMAP  "wx/msw/plot_zot.bmp"