Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/samples/stc/edit.h b/samples/stc/edit.h
index 0a4cbf4aba4c4debca7fb710d376c47149013011..d22222f67c93b7062099096280e7e5fe15667750 100644 (file)
--- a/samples/stc/edit.h
+++ b/samples/stc/edit.h
@@ -20,10 +20,10 @@
 // headers
 //----------------------------------------------------------------------------
 
 // headers
 //----------------------------------------------------------------------------
 

-//! wxWindows headers
+//! wxWidgets headers

 
 

-//! wxWindows/contrib headers
-#include <wx/stc/stc.h>  // styled text control
+//! wxWidgets/contrib headers
+#include "wx/stc/stc.h"  // styled text control

 
 //! application headers
 #include "prefs.h"       // preferences
 
 //! application headers
 #include "prefs.h"       // preferences


@@ -45,10 +45,14 @@ class Edit: public wxStyledTextCtrl {
 
 public:
     //! constructor
 
 public:
     //! constructor

-    Edit (wxWindow *parent, wxWindowID id = -1,
+    Edit (wxWindow *parent, wxWindowID id = wxID_ANY,

           const wxPoint &pos = wxDefaultPosition,
           const wxSize &size = wxDefaultSize,
           const wxPoint &pos = wxDefaultPosition,
           const wxSize &size = wxDefaultSize,

-          long style = wxSUNKEN_BORDER|wxVSCROLL
+          long style =
+#ifndef __WXMAC__
+          wxSUNKEN_BORDER|
+#endif
+          wxVSCROLL

          );
 
     //! destructor
          );
 
     //! destructor


@@ -93,6 +97,7 @@ public:
     // stc
     void OnMarginClick (wxStyledTextEvent &event);
     void OnCharAdded  (wxStyledTextEvent &event);
     // stc
     void OnMarginClick (wxStyledTextEvent &event);
     void OnCharAdded  (wxStyledTextEvent &event);

+    void OnKey  (wxStyledTextEvent &event);

 
     //! language/lexer
     wxString DeterminePrefs (const wxString &filename);
 
     //! language/lexer
     wxString DeterminePrefs (const wxString &filename);


@@ -139,6 +144,8 @@ private:
 
 };
 
 
 };
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 //----------------------------------------------------------------------------
 //! EditPrint
 class EditPrint: public wxPrintout {
 //----------------------------------------------------------------------------
 //! EditPrint
 class EditPrint: public wxPrintout {


@@ -146,7 +153,7 @@ class EditPrint: public wxPrintout {
 public:
 
     //! constructor
 public:
 
     //! constructor

-    EditPrint (Edit *edit, wxChar *title = _T(""));
+    EditPrint (Edit *edit, const wxChar *title = wxT(""));

 
     //! event handlers
     bool OnPrintPage (int page);
 
     //! event handlers
     bool OnPrintPage (int page);


@@ -165,5 +172,6 @@ private:
     bool PrintScaling (wxDC *dc);
 };
 
     bool PrintScaling (wxDC *dc);
 };
 

-#endif // _EDIT_H_
+#endif // wxUSE_PRINTING_ARCHITECTURE

 
 

+#endif // _EDIT_H_