X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..4e15d1caa03346c126015019c1fdf093033ef40b:/samples/stc/edit.h?ds=inline diff --git a/samples/stc/edit.h b/samples/stc/edit.h index 22d5c8cac3..d22222f67c 100644 --- a/samples/stc/edit.h +++ b/samples/stc/edit.h @@ -23,7 +23,7 @@ //! wxWidgets headers //! wxWidgets/contrib headers -#include // styled text control +#include "wx/stc/stc.h" // styled text control //! application headers #include "prefs.h" // preferences @@ -45,10 +45,14 @@ class Edit: public wxStyledTextCtrl { public: //! constructor - Edit (wxWindow *parent, wxWindowID id = -1, + Edit (wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = wxSUNKEN_BORDER|wxVSCROLL + long style = +#ifndef __WXMAC__ + wxSUNKEN_BORDER| +#endif + wxVSCROLL ); //! destructor @@ -93,6 +97,7 @@ public: // stc void OnMarginClick (wxStyledTextEvent &event); void OnCharAdded (wxStyledTextEvent &event); + void OnKey (wxStyledTextEvent &event); //! language/lexer wxString DeterminePrefs (const wxString &filename); @@ -139,6 +144,8 @@ private: }; +#if wxUSE_PRINTING_ARCHITECTURE + //---------------------------------------------------------------------------- //! EditPrint class EditPrint: public wxPrintout { @@ -146,7 +153,7 @@ class EditPrint: public wxPrintout { public: //! constructor - EditPrint (Edit *edit, wxChar *title = _T("")); + EditPrint (Edit *edit, const wxChar *title = wxT("")); //! event handlers bool OnPrintPage (int page); @@ -165,5 +172,6 @@ private: bool PrintScaling (wxDC *dc); }; -#endif // _EDIT_H_ +#endif // wxUSE_PRINTING_ARCHITECTURE +#endif // _EDIT_H_