X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/820893d0d41b94b22dada287355ad27489c21721..2265a2d51e3338353aeaa56f8d7521d7993342f7:/contrib/samples/deprecated/resource/resource.cpp diff --git a/contrib/samples/deprecated/resource/resource.cpp b/contrib/samples/deprecated/resource/resource.cpp index 4045cf99ef..548f4ae8ac 100644 --- a/contrib/samples/deprecated/resource/resource.cpp +++ b/contrib/samples/deprecated/resource/resource.cpp @@ -24,15 +24,17 @@ #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 #include "resource.h" @@ -184,7 +186,7 @@ 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)