added missing methods/removed duplicated base methods

[wxWidgets.git] / samples / nativdlg / dialog1.rc

diff --git a/samples/nativdlg/dialog1.rc b/samples/nativdlg/dialog1.rc
index 412338aaa142fe9de54da899d40bca12488fe702..2d708852be614501e411a5352467a430b6aca88b 100644 (file)
--- a/samples/nativdlg/dialog1.rc
+++ b/samples/nativdlg/dialog1.rc
@@ -1,8 +1,8 @@
 //Microsoft Developer Studio generated resource script.
 //
 
 //Microsoft Developer Studio generated resource script.
 //
 

-#ifndef __WINDOWS__
-#define __WINDOWS__
+#ifndef __WXMSW__
+#define __WXMSW__

 #endif
 
 #ifndef __WIN32__
 #endif
 
 #ifndef __WIN32__


@@ -13,7 +13,11 @@
 #define __WIN95__
 #endif
 
 #define __WIN95__
 #endif
 

-#ifdef __MINGW32__
+//#ifdef _MSC_VER
+#define __VISUALC__ _MSC_VER
+//#endif
+
+#ifdef __GNUWIN32__

 #define wxID_OK                 5100
 #define wxID_CANCEL             5101
 #define wxID_APPLY              5102
 #define wxID_OK                 5100
 #define wxID_CANCEL             5101
 #define wxID_APPLY              5102


@@ -27,20 +31,11 @@
 
 #include "resource.h"
 
 
 #include "resource.h"
 

-#ifndef __MINGW32__
+#if !defined(__GNUWIN32__)

 #include <commctrl.h>
 #endif
 
 #define APSTUDIO_READONLY_SYMBOLS
 #include <commctrl.h>
 #endif
 
 #define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-// #include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-

 /////////////////////////////////////////////////////////////////////////////
 // English (U.K.) resources
 
 /////////////////////////////////////////////////////////////////////////////
 // English (U.K.) resources
 


@@ -80,63 +75,6 @@ BEGIN
                     10,14
 END
 
                     10,14
 END
 

-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    dialog1, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 264
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 165
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-

 #endif    // English (U.K.) resources
 /////////////////////////////////////////////////////////////////////////////
 
 #endif    // English (U.K.) resources
 /////////////////////////////////////////////////////////////////////////////
 

-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-