X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a8b04e9c387b5e5295d42f2ed23afcf37e3c2e..0159d534634fb2a64687efc25812676c99ac9295:/samples/stc/edit.h diff --git a/samples/stc/edit.h b/samples/stc/edit.h index 0a4cbf4aba..b96c9f5790 100644 --- a/samples/stc/edit.h +++ b/samples/stc/edit.h @@ -20,10 +20,10 @@ // headers //---------------------------------------------------------------------------- -//! wxWindows headers +//! wxWidgets headers -//! wxWindows/contrib headers -#include // styled text control +//! wxWidgets/contrib headers +#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 @@ -139,6 +143,8 @@ private: }; +#if wxUSE_PRINTING_ARCHITECTURE + //---------------------------------------------------------------------------- //! EditPrint class EditPrint: public wxPrintout { @@ -146,7 +152,7 @@ class EditPrint: public wxPrintout { public: //! constructor - EditPrint (Edit *edit, wxChar *title = _T("")); + EditPrint (Edit *edit, const wxChar *title = _T("")); //! event handlers bool OnPrintPage (int page); @@ -165,5 +171,6 @@ private: bool PrintScaling (wxDC *dc); }; -#endif // _EDIT_H_ +#endif // wxUSE_PRINTING_ARCHITECTURE +#endif // _EDIT_H_