fix sizing of extra control

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

diff --git a/samples/stc/edit.h b/samples/stc/edit.h
index 54034003ae9115571d4f0afdf61c4d7437a33150..b96c9f5790dbe83944bca6b5906e30a4443a076f 100644 (file)
--- a/samples/stc/edit.h
+++ b/samples/stc/edit.h
@@ -23,7 +23,7 @@
 //! wxWidgets headers
 
 //! wxWidgets/contrib headers
 //! 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
 
 //! application headers
 #include "prefs.h"       // preferences


@@ -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


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

+#if wxUSE_PRINTING_ARCHITECTURE
+

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


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

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

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


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

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

 
 

+#endif // _EDIT_H_