overseeing the obvious, there is already a perfect scroll call for HIView...

[wxWidgets.git] / contrib / samples / deprecated / resource / resource.cpp

diff --git a/contrib/samples/deprecated/resource/resource.cpp b/contrib/samples/deprecated/resource/resource.cpp
index 4045cf99ef9c9531102b8bbdb0aa81794c9c18fe..548f4ae8acb24e2a1eaaf555add11e5f8afbca37 100644 (file)
--- a/contrib/samples/deprecated/resource/resource.cpp
+++ b/contrib/samples/deprecated/resource/resource.cpp
@@ -24,15 +24,17 @@
 #include "wx/wx.h"
 #endif
 
 #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
 
 #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"
 
 #include <ctype.h>
 #include "resource.h"


@@ -184,7 +186,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
 {
     MyDialog *dialog = new MyDialog;
 
 {
     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)
     {
         wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName(wxT("multitext3"), dialog);
         if (text)