initial coding of and OS/2 XpmHandler

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 9bbc41a3ed6b52e8d50326d4e3e0108247c81389..0794b196a79555ed61654e1b814b1de2f3242495 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.
 // 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$
+/////////////////////////////////////////////////////////////////////////////

 
 

-#ifdef __GNUWIN32__
-#include <wx/msw/gnuwin32/winresrc.h>
+#if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
+       #include <wx/msw/gnuwin32/winresrc.h>

 #else
 #else

-#include <windows.h>
+       #include <windows.h>

 #endif
 
 //////////////////////////////////////////////////////////////////////////////
 #endif
 
 //////////////////////////////////////////////////////////////////////////////


@@ -40,11 +40,22 @@
 // Dummy Dialog for all wxCAPTION Dialog boxes
 //
 
 // Dummy Dialog for all wxCAPTION Dialog boxes
 //
 

+wxResizeableDialog DIALOG DISCARDABLE  34, 22, 144, 75
+STYLE DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_THICKFRAME
+CAPTION ""
+BEGIN
+#ifdef __WATCOMC__
+       LTEXT "", -1,-2,-2,1,1
+#endif
+END
+

 wxCaptionDialog DIALOG DISCARDABLE  34, 22, 144, 75
 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
 
 //


@@ -53,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
 
 //////////////////////////////////////////////////////////////////////////////


@@ -66,8 +79,10 @@ BEGIN
     POPUP "&Window"
     BEGIN
         MENUITEM "&Cascade",                    4002
     POPUP "&Window"
     BEGIN
         MENUITEM "&Cascade",                    4002

-        MENUITEM "&Tile",                       4001
-        MENUITEM "&Arrange icons",              4003
+        MENUITEM "Tile &Horizontally",          4001
+        MENUITEM "Tile &Vertically",            4005
+       MENUITEM "", -1
+        MENUITEM "&Arrange Icons",              4003

         MENUITEM "&Next",                       4004
     END
 END
         MENUITEM "&Next",                       4004
     END
 END


@@ -96,15 +111,42 @@ WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
 // Default Icons
 //
 
 // Default Icons
 //
 

-wxDEFAULT_FRAME               ICON "wx/msw/std.ico"
-wxDEFAULT_MDIPARENTFRAME      ICON "wx/msw/mdi.ico"
-wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
+//wxDEFAULT_FRAME               ICON "wx/msw/std.ico"
+//wxDEFAULT_MDIPARENTFRAME      ICON "wx/msw/mdi.ico"
+//wxDEFAULT_MDICHILDFRAME       ICON "wx/msw/child.ico"
+
+// Standard large 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"
+
+// Standard small icons
+wxICON_SMALL_CLOSED_FOLDER      ICON "wx/msw/folder1.ico"
+wxICON_SMALL_OPEN_FOLDER        ICON "wx/msw/folder2.ico"
+wxICON_SMALL_FILE               ICON "wx/msw/file1.ico"
+wxICON_SMALL_COMPUTER           ICON "wx/msw/computer.ico"
+wxICON_SMALL_DRIVE              ICON "wx/msw/drive.ico"
+wxICON_SMALL_CDROM              ICON "wx/msw/cdrom.ico"
+wxICON_SMALL_FLOPPY             ICON "wx/msw/floppy.ico"
+wxICON_SMALL_REMOVEABLE         ICON "wx/msw/removble.ico"

 
 //////////////////////////////////////////////////////////////////////////////
 //
 // Bitmaps
 //
 
 
 //////////////////////////////////////////////////////////////////////////////
 //
 // Bitmaps
 //
 

+#ifdef __SALFORDC__
+wxDISABLE_BUTTON_BITMAP         BITMAP  WXINCDIR"wx/msw/disable.bmp"
+#else

 wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
 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 wxContextHelpButton
+csquery                 BITMAP "wx/msw/csquery.bmp"