X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c50e0cc752b6ad0fd3ca960187e7a31d9248e71b..430b5963a633f60c8a6b3a3778358f285a3a345e:/samples/stc/stctest.cpp?ds=sidebyside diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index a8961ae5c8..f34b476e22 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -39,17 +39,13 @@ #include "edit.h" // Edit module #include "prefs.h" // Prefs -#ifndef __WXMSW__ - #include "../sample.xpm" -#endif - //---------------------------------------------------------------------------- // resources //---------------------------------------------------------------------------- // the application icon (under Windows and OS/2 it is in resources) -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) - #include "mondrian.xpm" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" #endif //============================================================================ @@ -83,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 @@ -230,7 +226,6 @@ bool App::OnInit () { // open application frame m_frame->Layout (); m_frame->Show (true); - SetTopWindow (m_frame); return true; } @@ -268,44 +263,18 @@ BEGIN_EVENT_TABLE (AppFrame, wxFrame) EVT_MENU (wxID_PREVIEW, AppFrame::OnPrintPreview) EVT_MENU (wxID_PRINT, AppFrame::OnPrint) EVT_MENU (wxID_EXIT, AppFrame::OnExit) - // edit + // Menu items with standard IDs forwarded to the editor. EVT_MENU (wxID_CLEAR, AppFrame::OnEdit) EVT_MENU (wxID_CUT, AppFrame::OnEdit) EVT_MENU (wxID_COPY, AppFrame::OnEdit) EVT_MENU (wxID_PASTE, AppFrame::OnEdit) - EVT_MENU (myID_INDENTINC, AppFrame::OnEdit) - EVT_MENU (myID_INDENTRED, AppFrame::OnEdit) EVT_MENU (wxID_SELECTALL, AppFrame::OnEdit) - EVT_MENU (myID_SELECTLINE, AppFrame::OnEdit) EVT_MENU (wxID_REDO, AppFrame::OnEdit) EVT_MENU (wxID_UNDO, AppFrame::OnEdit) - // find EVT_MENU (wxID_FIND, AppFrame::OnEdit) - EVT_MENU (myID_FINDNEXT, AppFrame::OnEdit) - EVT_MENU (myID_REPLACE, AppFrame::OnEdit) - EVT_MENU (myID_REPLACENEXT, AppFrame::OnEdit) - EVT_MENU (myID_BRACEMATCH, AppFrame::OnEdit) - EVT_MENU (myID_GOTO, AppFrame::OnEdit) - // view - EVT_MENU_RANGE (myID_HILIGHTFIRST, myID_HILIGHTLAST, + // And all our edit-related menu commands. + EVT_MENU_RANGE (myID_EDIT_FIRST, myID_EDIT_LAST, AppFrame::OnEdit) - EVT_MENU (myID_DISPLAYEOL, AppFrame::OnEdit) - EVT_MENU (myID_INDENTGUIDE, AppFrame::OnEdit) - EVT_MENU (myID_LINENUMBER, AppFrame::OnEdit) - EVT_MENU (myID_LONGLINEON, AppFrame::OnEdit) - EVT_MENU (myID_WHITESPACE, AppFrame::OnEdit) - EVT_MENU (myID_FOLDTOGGLE, AppFrame::OnEdit) - EVT_MENU (myID_OVERTYPE, AppFrame::OnEdit) - EVT_MENU (myID_READONLY, AppFrame::OnEdit) - EVT_MENU (myID_WRAPMODEON, AppFrame::OnEdit) - // extra - EVT_MENU (myID_CHANGELOWER, AppFrame::OnEdit) - EVT_MENU (myID_CHANGEUPPER, AppFrame::OnEdit) - EVT_MENU (myID_CONVERTCR, AppFrame::OnEdit) - EVT_MENU (myID_CONVERTCRLF, AppFrame::OnEdit) - EVT_MENU (myID_CONVERTLF, AppFrame::OnEdit) - EVT_MENU (myID_CHARSETANSI, AppFrame::OnEdit) - EVT_MENU (myID_CHARSETMAC, AppFrame::OnEdit) // help EVT_MENU (wxID_ABOUT, AppFrame::OnAbout) END_EVENT_TABLE () @@ -316,17 +285,13 @@ AppFrame::AppFrame (const wxString &title) { SetIcon(wxICON(sample)); - // intitialize important variables + // initialize important variables m_edit = NULL; // set icon and background SetTitle (*g_appname); - SetIcon (wxICON (mondrian)); SetBackgroundColour (wxT("WHITE")); - // about box shown for 1 seconds - AppAbout dlg(this, 1000); - // create menu m_menuBar = new wxMenuBar; CreateMenu (); @@ -436,7 +401,7 @@ void AppFrame::OnPrintPreview (wxCommandEvent &WXUNUSED(event)) { new wxPrintPreview (new EditPrint (m_edit), new EditPrint (m_edit), &printDialogData); - if (!preview->Ok()) { + if (!preview->IsOk()) { delete preview; wxMessageBox (_("There was a problem with previewing.\n\ Perhaps your current printer is not correctly?"), @@ -550,6 +515,20 @@ void AppFrame::CreateMenu () menuView->AppendSeparator(); menuView->Append (myID_USECHARSET, _("Use &code page of .."), menuCharset); + // Annotations menu + wxMenu* menuAnnotations = new wxMenu; + menuAnnotations->Append(myID_ANNOTATION_ADD, _("&Add or edit an annotation..."), + _("Add an annotation for the current line")); + menuAnnotations->Append(myID_ANNOTATION_REMOVE, _("&Remove annotation"), + _("Remove the annotation for the current line")); + menuAnnotations->Append(myID_ANNOTATION_CLEAR, _("&Clear all annotations")); + + wxMenu* menuAnnotationsStyle = new wxMenu; + menuAnnotationsStyle->AppendRadioItem(myID_ANNOTATION_STYLE_HIDDEN, _("&Hidden")); + menuAnnotationsStyle->AppendRadioItem(myID_ANNOTATION_STYLE_STANDARD, _("&Standard")); + menuAnnotationsStyle->AppendRadioItem(myID_ANNOTATION_STYLE_BOXED, _("&Boxed")); + menuAnnotations->AppendSubMenu(menuAnnotationsStyle, "&Style"); + // change case submenu wxMenu *menuChangeCase = new wxMenu; menuChangeCase->Append (myID_CHANGEUPPER, _("&Upper case")); @@ -583,16 +562,20 @@ void AppFrame::CreateMenu () m_menuBar->Append (menuFile, _("&File")); m_menuBar->Append (menuEdit, _("&Edit")); m_menuBar->Append (menuView, _("&View")); + m_menuBar->Append (menuAnnotations, _("&Annotations")); m_menuBar->Append (menuExtra, _("E&xtra")); m_menuBar->Append (menuWindow, _("&Window")); m_menuBar->Append (menuHelp, _("&Help")); SetMenuBar (m_menuBar); + + m_menuBar->Check(myID_ANNOTATION_STYLE_BOXED, true); } void AppFrame::FileOpen (wxString fname) { wxFileName w(fname); w.Normalize(); fname = w.GetFullPath(); m_edit->LoadFile (fname); + m_edit->SelectNone(); } wxRect AppFrame::DeterminePrintSize () { @@ -656,7 +639,7 @@ AppAbout::AppAbout (wxWindow *parent, // about icontitle//info wxBoxSizer *aboutpane = new wxBoxSizer (wxHORIZONTAL); - wxBitmap bitmap = wxBitmap(wxICON (mondrian)); + wxBitmap bitmap = wxBitmap(wxICON (sample)); aboutpane->Add (new wxStaticBitmap (this, wxID_ANY, bitmap), 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 20); aboutpane->Add (aboutinfo, 1, wxEXPAND); @@ -683,17 +666,13 @@ AppAbout::AppAbout (wxWindow *parent, } AppAbout::~AppAbout () { - if (m_timer) { - delete m_timer; - m_timer = NULL; - } + wxDELETE(m_timer); } //---------------------------------------------------------------------------- // event handlers void AppAbout::OnTimerEvent (wxTimerEvent &WXUNUSED(event)) { - if (m_timer) delete m_timer; - m_timer = NULL; + wxDELETE(m_timer); EndModal (wxID_OK); }