X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..0646084eb258e28101c2cc3dc0173f665c2dfa2d:/samples/stc/edit.h

diff --git a/samples/stc/edit.h b/samples/stc/edit.h
index 22d5c8cac3..f9c5e7e6bc 100644
--- a/samples/stc/edit.h
+++ b/samples/stc/edit.h
@@ -23,7 +23,7 @@
 //! wxWidgets headers
 
 //! wxWidgets/contrib headers
-#include <wx/stc/stc.h>  // 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
@@ -87,12 +91,18 @@ public:
     void OnSetReadOnly (wxCommandEvent &event);
     void OnWrapmodeOn (wxCommandEvent &event);
     void OnUseCharset (wxCommandEvent &event);
+    // annotations
+    void OnAnnotationAdd(wxCommandEvent& event);
+    void OnAnnotationRemove(wxCommandEvent& event);
+    void OnAnnotationClear(wxCommandEvent& event);
+    void OnAnnotationStyle(wxCommandEvent& event);
     //! extra
     void OnChangeCase (wxCommandEvent &event);
     void OnConvertEOL (wxCommandEvent &event);
     // stc
     void OnMarginClick (wxStyledTextEvent &event);
     void OnCharAdded  (wxStyledTextEvent &event);
+    void OnKey  (wxStyledTextEvent &event);
 
     //! language/lexer
     wxString DeterminePrefs (const wxString &filename);
@@ -139,6 +149,8 @@ private:
 
 };
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 //----------------------------------------------------------------------------
 //! EditPrint
 class EditPrint: public wxPrintout {
@@ -146,7 +158,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 +177,6 @@ private:
     bool PrintScaling (wxDC *dc);
 };
 
-#endif // _EDIT_H_
+#endif // wxUSE_PRINTING_ARCHITECTURE
 
+#endif // _EDIT_H_