X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0f4301209cc58eb5562be289f49bf0fb9e7d6b8..2d1d813e2dc392d2480a2dc9cdf61ce6330db72d:/samples/dialogs/dialogs.cpp diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 96d05b980d..a2fd69d7ac 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -29,6 +29,7 @@ #include "wx/msw/wince/time.h" #endif +#include "wx/numdlg.h" #include "wx/colordlg.h" #include "wx/filedlg.h" #include "wx/dirdlg.h" @@ -38,6 +39,7 @@ #include "wx/progdlg.h" #include "wx/fdrepdlg.h" #include "wx/busyinfo.h" +#include "wx/image.h" #define wxTEST_GENERIC_DIALOGS_IN_MSW 0 @@ -123,6 +125,10 @@ MyCanvas *myCanvas = (MyCanvas *) NULL; // `Main program' equivalent, creating windows and returning main app frame bool MyApp::OnInit() { +#if wxUSE_IMAGE + wxInitAllImageHandlers(); +#endif + #if defined(__WXGTK__) && defined(wxUSE_UNICODE) wxConvCurrent = &wxConvLibc; #endif @@ -131,11 +137,11 @@ bool MyApp::OnInit() m_canvasFont = *wxNORMAL_FONT; // Create the main frame window - MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWindows dialogs example"), wxPoint(20, 20), wxSize(400, 300)); + MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets dialogs example"), wxPoint(20, 20), wxSize(400, 300)); // Make a menubar wxMenu *file_menu = new wxMenu; - + file_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour")); #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW @@ -883,7 +889,7 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) ) dc.SetFont(wxGetApp().m_canvasFont); dc.SetTextForeground(wxGetApp().m_canvasTextColour); dc.SetBackgroundMode(wxTRANSPARENT); - dc.DrawText(_T("wxWindows common dialogs test application"), 10, 10); + dc.DrawText(_T("wxWidgets common dialogs test application"), 10, 10); } // ----------------------------------------------------------------------------