X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/820893d0d41b94b22dada287355ad27489c21721..c0b0635cf69537ca32377bad5650b39402cb21b6:/contrib/samples/deprecated/resource/resource.cpp

diff --git a/contrib/samples/deprecated/resource/resource.cpp b/contrib/samples/deprecated/resource/resource.cpp
index 4045cf99ef..accc638501 100644
--- a/contrib/samples/deprecated/resource/resource.cpp
+++ b/contrib/samples/deprecated/resource/resource.cpp
@@ -24,22 +24,24 @@
 #include "wx/wx.h"
 #endif
 
-#if !wxUSE_RESOURCES
-    #error "You should set wxUSE_RESOURCES to 1 to compile this sample"
+#include "wx/deprecated/setup.h"
+
+#if !wxUSE_WX_RESOURCES
+    #error "You should set wxUSE_WX_RESOURCES to 1 to compile this sample"
 #endif
 
 #if wxUSE_UNICODE
 // #error "This sample can't be compiled in Unicode mode."
 #endif // wxUSE_UNICODE
 
-#include "wx/resource.h"
+#include "wx/deprecated/resource.h"
 
 #include <ctype.h>
 #include "resource.h"
 
 // If we wanted to demonstrate total platform independence,
 // then we'd use the dynamic file loading form for all platforms.
-// But this shows how to embed the wxWindows resources
+// But this shows how to embed the wxWidgets resources
 // in the program code/executable for UNIX and Windows
 // platforms.
 
@@ -101,12 +103,14 @@ bool MyApp::OnInit(void)
 #endif
 
     // Create the main frame window
-    frame = new MyFrame( (wxFrame *) NULL, -1,
-                         wxT("wxWindows Resource Sample"),
-                         wxPoint(-1, -1), wxSize(300, 250) );
+    frame = new MyFrame( (wxFrame *) NULL, wxID_ANY,
+                         wxT("wxWidgets Resource Sample"),
+                         wxDefaultPosition, wxSize(300, 250) );
 
+#if wxUSE_STATUSBAR
     // Give it a status line
     frame->CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
 
     wxMenuBar *menu_bar = wxResourceCreateMenuBar(wxT("menu1"));
 
@@ -114,13 +118,13 @@ bool MyApp::OnInit(void)
     frame->SetMenuBar(menu_bar);
 
     // Make a panel
-    frame->panel = new MyPanel( frame, -1, wxPoint(0, 0), wxSize(400, 400),
+    frame->panel = new MyPanel( frame, wxID_ANY, wxPoint(0, 0), wxSize(400, 400),
                                 0, wxT("MyMainFrame") );
-    frame->Show(TRUE);
+    frame->Show(true);
 
     SetTopWindow(frame);
 
-    return TRUE;
+    return true;
 }
 
 MyApp::~MyApp()
@@ -170,32 +174,32 @@ MyFrame::MyFrame
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
-    wxMessageBox(wxT("wxWindows resource sample.\n")
-                 wxT("(c) Julian Smart"), wxT("About wxWindows sample"),
+    wxMessageBox(wxT("wxWidgets resource sample.\n")
+                 wxT("(c) Julian Smart"), wxT("About wxWidgets sample"),
                  wxICON_INFORMATION | wxOK);
 }
 
 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
-    Close(TRUE);
+    Close(true);
 }
 
 void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
 {
     MyDialog *dialog = new MyDialog;
 
-    if (dialog->LoadFromResource(this, wxT("dialog1")))
+    if (wxLoadFromResource(dialog, this, wxT("dialog1")))
     {
         wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName(wxT("multitext3"), dialog);
         if (text)
         {
-            text->SetValue(wxT("wxWindows resource demo"));
+            text->SetValue(wxT("wxWidgets resource demo"));
         }
 
         dialog->ShowModal();
     }
 
-    dialog->Close(TRUE);
+    dialog->Close(true);
 }
 
 BEGIN_EVENT_TABLE(MyDialog, wxDialog)