Fix broken and missing DataView interface items for Phoenix

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

diff --git a/samples/stc/edit.h b/samples/stc/edit.h
index 4a7ecf79d135586491a09742b00dee5ded2c9f91..d22222f67c93b7062099096280e7e5fe15667750 100644 (file)
--- a/samples/stc/edit.h
+++ b/samples/stc/edit.h
@@ -48,7 +48,11 @@ public:
     Edit (wxWindow *parent, wxWindowID id = wxID_ANY,
           const wxPoint &pos = wxDefaultPosition,
           const wxSize &size = wxDefaultSize,
     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
          );
 
     //! 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);


@@ -148,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);