Better temporary fix.

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

diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp
index 7f90285eb75146045561bbf8f1469e0b350ed8f2..f8620259de4b998b205c2bd29df636b5ff4c58ca 100644 (file)
--- a/samples/scrollsub/scrollsub.cpp
+++ b/samples/scrollsub/scrollsub.cpp
@@ -36,11 +36,11 @@ 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 );
     void OnPaint( wxPaintEvent &event );

-
+    void OnSize( wxSizeEvent &event );

 private:
     MyCanvas    *m_canvas;
 
 private:
     MyCanvas    *m_canvas;
 


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


@@ -141,7 +141,8 @@ IMPLEMENT_APP(MyApp)
 IMPLEMENT_DYNAMIC_CLASS(MyScrolledWindow, wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(MyScrolledWindow, wxScrolledWindow)
 IMPLEMENT_DYNAMIC_CLASS(MyScrolledWindow, wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(MyScrolledWindow, wxScrolledWindow)

-  EVT_PAINT(        MyScrolledWindow::OnPaint)
+  EVT_PAINT(      MyScrolledWindow::OnPaint)
+  EVT_SIZE(       MyScrolledWindow::OnSize)

 END_EVENT_TABLE()
 
 MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id,
 END_EVENT_TABLE()
 
 MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id,


@@ -177,8 +178,18 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id,
     SetSizer( mainsizer );
 }
 
     SetSizer( mainsizer );
 }
 

-MyScrolledWindow::~MyScrolledWindow()
+void MyScrolledWindow::OnSize( wxSizeEvent &WXUNUSED(event) )

 {
 {

+    // We need to override OnSize so that our scrolled
+    // window a) does call Layout() to use sizers for
+    // positioning the controls but b) does not query
+    // the sizer for their size and use that for setting
+    // the scrollable area as set that ourselves by
+    // calling SetScrollbar() further down.
+
+    Layout();
+
+    AdjustScrollbars();

 }
 
 void MyScrolledWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 }
 
 void MyScrolledWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )


@@ -296,10 +307,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 );


@@ -367,9 +374,9 @@ void MyCanvas::ScrollWindow( int dx, int dy, const wxRect *rect )
 
 // MyFrame
 
 
 // MyFrame
 

-const int ID_QUIT  = 108;
+const int ID_QUIT  = wxID_EXIT;

 const int ID_FULL  = 109;
 const int ID_FULL  = 109;

-const int ID_ABOUT = 110;
+const int ID_ABOUT = wxID_ABOUT;

 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )