X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a8b04e9c387b5e5295d42f2ed23afcf37e3c2e..b808efdb885aa82a6c34a8278119bae63c7f4183:/contrib/samples/stc/stctest.cpp diff --git a/contrib/samples/stc/stctest.cpp b/contrib/samples/stc/stctest.cpp index 8c27905685..41aeba8d52 100644 --- a/contrib/samples/stc/stctest.cpp +++ b/contrib/samples/stc/stctest.cpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////// -// File: app.cpp +// File: stctest.cpp // Purpose: STC test application // Maintainer: Otto Wyss // Created: 2003-09-01 @@ -20,18 +20,19 @@ #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all 'standard' wxWindows headers) +// need because it includes almost all 'standard' wxWidgets headers) #ifndef WX_PRECOMP #include #endif -//! wxWindows headers +//! wxWidgets headers #include // configuration support #include // file dialog support #include // filename support #include // notebook support #include // system settings #include // strings support +#include // images support //! application headers #include "defsext.h" // Additional definitions @@ -53,17 +54,17 @@ //============================================================================ #define APP_NAME _T("STC-Test") -#define APP_DESCR _("See http://wxguide.sourceforge.net/indexedit.html") +#define APP_DESCR _("See http://wxguide.sourceforge.net/") #define APP_MAINT _T("Otto Wyss") -#define APP_VENDOR _T("wxWindows") +#define APP_VENDOR _T("wxWidgets") #define APP_COPYRIGTH _T("(C) 2003 Otto Wyss") -#define APP_LICENCE _T("wxWindows") +#define APP_LICENCE _T("wxWidgets") #define APP_VERSION _T("0.1.alpha") #define APP_BUILD __DATE__ -#define APP_WEBSITE _T("http://www.wxWindows.org") +#define APP_WEBSITE _T("http://www.wxWidgets.org") #define APP_MAIL _T("mailto://???") #define NONAME _("") @@ -98,7 +99,7 @@ private: }; -// created dynamically by wxWindows +// created dynamically by wxWidgets DECLARE_APP (App); //---------------------------------------------------------------------------- @@ -190,7 +191,7 @@ IMPLEMENT_APP (App) bool App::OnInit () { wxInitAllImageHandlers(); - + // set application and vendor name SetAppName (APP_NAME); SetVendorName (APP_VENDOR); @@ -288,7 +289,7 @@ BEGIN_EVENT_TABLE (AppFrame, wxFrame) END_EVENT_TABLE () AppFrame::AppFrame (const wxString &title) - : wxFrame ((wxFrame *)NULL, -1, title, wxDefaultPosition, wxSize(600,400), + : wxFrame ((wxFrame *)NULL, wxID_ANY, title, wxDefaultPosition, wxSize(750,550), wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) { // intitialize important variables @@ -300,16 +301,17 @@ AppFrame::AppFrame (const wxString &title) SetBackgroundColour (_T("WHITE")); // about box shown for 1 seconds - AppAbout (this, 1000); + AppAbout dlg(this, 1000); // create menu m_menuBar = new wxMenuBar; CreateMenu (); // open first page - m_edit = new Edit (this, -1); + m_edit = new Edit (this, wxID_ANY); m_edit->SetFocus(); + FileOpen (_T("stctest.cpp")); } AppFrame::~AppFrame () { @@ -327,7 +329,7 @@ void AppFrame::OnClose (wxCloseEvent &event) { } void AppFrame::OnAbout (wxCommandEvent &WXUNUSED(event)) { - AppAbout (this); + AppAbout dlg(this); } void AppFrame::OnExit (wxCommandEvent &WXUNUSED(event)) { @@ -377,12 +379,15 @@ void AppFrame::OnFileClose (wxCommandEvent &WXUNUSED(event)) { } } } + m_edit->SetFilename (wxEmptyString); + m_edit->ClearAll(); + m_edit->SetSavePoint(); } // properties event handlers void AppFrame::OnProperties (wxCommandEvent &WXUNUSED(event)) { if (!m_edit) return; - EditProperties (m_edit, 0); + EditProperties dlg(m_edit, 0); } // print event handlers @@ -581,9 +586,9 @@ END_EVENT_TABLE () AppAbout::AppAbout (wxWindow *parent, int milliseconds, long style) - : wxDialog (parent, -1, wxEmptyString, + : wxDialog (parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { + style | wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { // set timer if any m_timer = NULL; @@ -597,27 +602,27 @@ AppAbout::AppAbout (wxWindow *parent, // about info wxGridSizer *aboutinfo = new wxGridSizer (2, 0, 2); - aboutinfo->Add (new wxStaticText(this, -1, _("Written by: ")), + aboutinfo->Add (new wxStaticText(this, wxID_ANY, _("Written by: ")), 0, wxALIGN_LEFT); - aboutinfo->Add (new wxStaticText(this, -1, APP_MAINT), + aboutinfo->Add (new wxStaticText(this, wxID_ANY, APP_MAINT), 1, wxEXPAND | wxALIGN_LEFT); - aboutinfo->Add (new wxStaticText(this, -1, _("Version: ")), + aboutinfo->Add (new wxStaticText(this, wxID_ANY, _("Version: ")), 0, wxALIGN_LEFT); - aboutinfo->Add (new wxStaticText(this, -1, APP_VERSION), + aboutinfo->Add (new wxStaticText(this, wxID_ANY, APP_VERSION), 1, wxEXPAND | wxALIGN_LEFT); - aboutinfo->Add (new wxStaticText(this, -1, _("Licence type: ")), + aboutinfo->Add (new wxStaticText(this, wxID_ANY, _("Licence type: ")), 0, wxALIGN_LEFT); - aboutinfo->Add (new wxStaticText(this, -1, APP_LICENCE), + aboutinfo->Add (new wxStaticText(this, wxID_ANY, APP_LICENCE), 1, wxEXPAND | wxALIGN_LEFT); - aboutinfo->Add (new wxStaticText(this, -1, _("Copyright: ")), + aboutinfo->Add (new wxStaticText(this, wxID_ANY, _("Copyright: ")), 0, wxALIGN_LEFT); - aboutinfo->Add (new wxStaticText(this, -1, APP_COPYRIGTH), + aboutinfo->Add (new wxStaticText(this, wxID_ANY, APP_COPYRIGTH), 1, wxEXPAND | wxALIGN_LEFT); // about icontitle//info wxBoxSizer *aboutpane = new wxBoxSizer (wxHORIZONTAL); wxBitmap bitmap = wxBitmap(wxICON (mondrian)); - aboutpane->Add (new wxStaticBitmap (this, -1, bitmap), + aboutpane->Add (new wxStaticBitmap (this, wxID_ANY, bitmap), 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 20); aboutpane->Add (aboutinfo, 1, wxEXPAND); aboutpane->Add (60, 0); @@ -625,12 +630,12 @@ AppAbout::AppAbout (wxWindow *parent, // about complete wxBoxSizer *totalpane = new wxBoxSizer (wxVERTICAL); totalpane->Add (0, 20); - wxStaticText *appname = new wxStaticText(this, -1, *g_appname); + wxStaticText *appname = new wxStaticText(this, wxID_ANY, *g_appname); appname->SetFont (wxFont (24, wxDEFAULT, wxNORMAL, wxBOLD)); totalpane->Add (appname, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, 40); totalpane->Add (0, 10); totalpane->Add (aboutpane, 0, wxEXPAND | wxALL, 4); - totalpane->Add (new wxStaticText(this, -1, APP_DESCR), + totalpane->Add (new wxStaticText(this, wxID_ANY, APP_DESCR), 0, wxALIGN_CENTER | wxALL, 10); wxButton *okButton = new wxButton (this, wxID_OK, _("OK")); okButton->SetDefault(); @@ -638,7 +643,7 @@ AppAbout::AppAbout (wxWindow *parent, SetSizerAndFit (totalpane); - CenterOnScreen(); + CenterOnScreen(); ShowModal(); } @@ -651,7 +656,7 @@ AppAbout::~AppAbout () { //---------------------------------------------------------------------------- // event handlers -void AppAbout::OnTimerEvent (wxTimerEvent &event) { +void AppAbout::OnTimerEvent (wxTimerEvent &WXUNUSED(event)) { if (m_timer) delete m_timer; m_timer = NULL; EndModal (wxID_OK);