X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..ab7f0034828cfc121014b3e1e29bba583fb6d832:/samples/stc/stctest.cpp diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index 93eb644522..599722d151 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -44,7 +44,7 @@ //---------------------------------------------------------------------------- // the application icon (under Windows and OS/2 it is in resources) -#if !defined(__WXMSW__) && !defined(__WXPM__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -79,7 +79,7 @@ wxString *g_appname = NULL; //! global print data, to remember settings during the session wxPrintData *g_printData = (wxPrintData*) NULL; -wxPageSetupData *g_pageSetupData = (wxPageSetupData*) NULL; +wxPageSetupDialogData *g_pageSetupData = (wxPageSetupDialogData*) NULL; #endif // wxUSE_PRINTING_ARCHITECTURE @@ -318,9 +318,6 @@ AppFrame::AppFrame (const wxString &title) SetTitle (*g_appname); SetBackgroundColour (wxT("WHITE")); - // about box shown for 1 seconds - AppAbout dlg(this, 1000); - // create menu m_menuBar = new wxMenuBar; CreateMenu (); @@ -587,6 +584,7 @@ void AppFrame::FileOpen (wxString fname) { wxFileName w(fname); w.Normalize(); fname = w.GetFullPath(); m_edit->LoadFile (fname); + m_edit->SelectNone(); } wxRect AppFrame::DeterminePrintSize () {