wxMac uses wxStandardPathsCF to mean wxStandardPaths in its wxBase

[wxWidgets.git] / samples / scrollsub / scrollsub.cpp

diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp
index fc9864f45c56faa483166e7b526ef4cb83f9cdba..4891f67dab27166d6386ee2c27929d4aa4477073 100644 (file)
--- a/samples/scrollsub/scrollsub.cpp
+++ b/samples/scrollsub/scrollsub.cpp
@@ -36,9 +36,9 @@ class MyApp;
 class MyScrolledWindow: public wxScrolledWindow
 {
 public:
 class MyScrolledWindow: public wxScrolledWindow
 {
 public:

-    MyScrolledWindow() {}
+    MyScrolledWindow(){};

     MyScrolledWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size );
     MyScrolledWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size );

-    ~MyScrolledWindow();
+    ~MyScrolledWindow(){};

     void OnPaint( wxPaintEvent &event );
 
 private:
     void OnPaint( wxPaintEvent &event );
 
 private:


@@ -87,10 +87,10 @@ private:
 class MyCanvas: public wxPanel
 {
 public:
 class MyCanvas: public wxPanel
 {
 public:

-    MyCanvas() {}
+    MyCanvas(){};

     MyCanvas( wxScrolledWindow *parent, MyTopLabels *top, MyRightLabels *right,
               wxWindowID id, const wxPoint &pos, const wxSize &size );
     MyCanvas( wxScrolledWindow *parent, MyTopLabels *top, MyRightLabels *right,
               wxWindowID id, const wxPoint &pos, const wxSize &size );

-    ~MyCanvas();
+    ~MyCanvas(){};

     void OnPaint( wxPaintEvent &event );
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 
     void OnPaint( wxPaintEvent &event );
     void ScrollWindow( int dx, int dy, const wxRect *rect );
 


@@ -115,7 +115,9 @@ public:
     void OnFullScreen( wxCommandEvent &event );
 
     wxScrolledWindow   *m_scrolled;
     void OnFullScreen( wxCommandEvent &event );
 
     wxScrolledWindow   *m_scrolled;

+#if wxUSE_LOG

     wxTextCtrl         *m_log;
     wxTextCtrl         *m_log;

+#endif // wxUSE_LOG

 
 private:
     DECLARE_DYNAMIC_CLASS(MyFrame)
 
 private:
     DECLARE_DYNAMIC_CLASS(MyFrame)


@@ -146,8 +148,8 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id,
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER, _T("test canvas") )
 {
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER, _T("test canvas") )
 {

-    MyTopLabels *top = new MyTopLabels( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultSize.x,25) );
-    MyRightLabels *right = new MyRightLabels( this, wxID_ANY, wxDefaultPosition, wxSize(60,wxDefaultSize.y) );
+    MyTopLabels *top = new MyTopLabels( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,25) );
+    MyRightLabels *right = new MyRightLabels( this, wxID_ANY, wxDefaultPosition, wxSize(60,wxDefaultCoord) );

 
     m_canvas = new MyCanvas( this, top, right, wxID_ANY, wxDefaultPosition, wxDefaultSize );
 
 
     m_canvas = new MyCanvas( this, top, right, wxID_ANY, wxDefaultPosition, wxDefaultSize );
 


@@ -175,10 +177,6 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id,
     SetSizer( mainsizer );
 }
 
     SetSizer( mainsizer );
 }
 

-MyScrolledWindow::~MyScrolledWindow()
-{
-}
-

 void MyScrolledWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc( this );
 void MyScrolledWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc( this );


@@ -294,10 +292,6 @@ MyCanvas::MyCanvas( wxScrolledWindow *parent, MyTopLabels *top, MyRightLabels *r
     SetCursor( wxCursor( wxCURSOR_IBEAM ) );
 }
 
     SetCursor( wxCursor( wxCURSOR_IBEAM ) );
 }
 

-MyCanvas::~MyCanvas()
-{
-}
-

 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc( this );
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc( this );


@@ -391,20 +385,26 @@ MyFrame::MyFrame()
 
     SetMenuBar( menu_bar );
 
 
     SetMenuBar( menu_bar );
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );
     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );

+#endif // wxUSE_STATUSBAR

 
     m_scrolled = new MyScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize(100,100) );
     m_scrolled->SetScrollbars( 10, 10, 50, 50 );
 
 
     m_scrolled = new MyScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize(100,100) );
     m_scrolled->SetScrollbars( 10, 10, 50, 50 );
 

+#if wxUSE_LOG

     m_log = new wxTextCtrl( this, wxID_ANY, _T("This is the log window.\n"), wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
     wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
     delete old_log;
     m_log = new wxTextCtrl( this, wxID_ANY, _T("This is the log window.\n"), wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
     wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
     delete old_log;

+#endif // wxUSE_LOG

 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     topsizer->Add( m_scrolled, 1, wxEXPAND );
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     topsizer->Add( m_scrolled, 1, wxEXPAND );

+#if wxUSE_LOG

     topsizer->Add( m_log, 0, wxEXPAND );
     topsizer->Add( m_log, 0, wxEXPAND );

+#endif // wxUSE_LOG

 
     SetAutoLayout( true );
     SetSizer( topsizer );
 
     SetAutoLayout( true );
     SetSizer( topsizer );