better variant support, fixes #11114

[wxWidgets.git] / samples / stc / edit.h

diff --git a/samples/stc/edit.h b/samples/stc/edit.h
index 22d5c8cac37f5ebf0b369440bf54df0a4556797e..44e185ead93f1c74132e9268f30f0d10515af18c 100644 (file)
--- 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
@@ -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 = wxT(""));
 
     //! 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_