X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbf1f0e5cffb8c01696eb26e254857a61f017d70..bbc3925a8a46e8c80b22277f5571dfb2465aca25:/samples/nativdlg/dialog1.rc diff --git a/samples/nativdlg/dialog1.rc b/samples/nativdlg/dialog1.rc index 412338aaa1..3d1677a1ee 100644 --- a/samples/nativdlg/dialog1.rc +++ b/samples/nativdlg/dialog1.rc @@ -1,8 +1,8 @@ //Microsoft Developer Studio generated resource script. // -#ifndef __WINDOWS__ -#define __WINDOWS__ +#ifndef __WXMSW__ +#define __WXMSW__ #endif #ifndef __WIN32__ @@ -13,34 +13,23 @@ #define __WIN95__ #endif -#ifdef __MINGW32__ +//#ifdef _MSC_VER +#define __VISUALC__ _MSC_VER +//#endif + #define wxID_OK 5100 #define wxID_CANCEL 5101 #define wxID_APPLY 5102 #define wxID_YES 5103 #define wxID_NO 5104 -/* #include <wx/msw/gnuwin32/winresrc.h> */ -#else -#include <wx/defs.h> -/* #include <windows.h> */ -#endif #include "resource.h" -#ifndef __MINGW32__ +#if !defined(__GNUWIN32__) #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 @@ -80,63 +69,6 @@ BEGIN 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 ///////////////////////////////////////////////////////////////////////////// - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED -