Added script to help make wxMotif via configure; nativdlg sample works again;

resource sample now works using .rc files for most Windows compilers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/nativdlg/nativdlg.cpp

@@ -91,7 +91,7 @@ void MyFrame::OnQuit(wxCommandEvent& event)
 void MyFrame::OnTest1(wxCommandEvent& event)
 {
       MyDialog *dialog = new MyDialog;
-      if (dialog->LoadNativeDialog(this, dialog1))
+      if (dialog->LoadNativeDialog(this, "dialog1"))
       {
 /*
         wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName("multitext3", dialog);

samples/nativdlg/resource.h

@@ -2,7 +2,7 @@
 // Microsoft Developer Studio generated include file.
 // Used by dialog1.rc
 //
-#define dialog1                         101
+// #define dialog1                         101
 #define IDC_EDIT1                       1000
 #define IDC_CHECK1                      1001
 #define IDC_COMBO1                      1003

samples/resource/resource.cpp

@@ -42,7 +42,7 @@
 // the TEXT resource, for some reason, so either run-time file loading
 // or file inclusion should be used.
 
-#if defined(__WXMSW__) && !defined(__BORLANDC__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__)
 // Under Windows, some compilers can't include
 // a whole .wxr file. So we use a .rc user-defined resource
 // instead. dialog1 will point to the whole .wxr 'file'.
@@ -69,10 +69,10 @@ MyApp::MyApp()
 // main frame
 bool MyApp::OnInit(void)
 {
-#if defined(__WXMSW__)  && !defined(__BORLANDC__)
+#if defined(__WXMSW__)
   // Load the .wxr 'file' from a .rc resource, under Windows.
-  dialog1 = wxLoadUserResource("dialog1");
-  menu1 = wxLoadUserResource("menu1");
+  dialog1 = wxLoadUserResource("dialog1", "WXRDATA");
+  menu1 = wxLoadUserResource("menu1", "WXRDATA");
   // All resources in the file (only one in this case) get parsed
   // by this call.
   wxResourceParseString(dialog1);

samples/resource/resource.rc

@@ -1,7 +1,10 @@
 #include "wx/msw/wx.rc"
 
 /* Comment out these lines for Borland C++ or GNU-WIN32 */
+/*
 dialog1 TEXT "dialog1.wxr"
 menu1 TEXT "menu1.wxr"
-
+*/
+dialog1 WXRDATA "dialog1.wxr"
+menu1 WXRDATA "menu1.wxr"