added group 'grid' (fixes #10217)

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

diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp
index e26edd550f332484596c92b49f4ea5add9b12e16..d1f400d426e8e9216491d53d975f76cb7a933177 100644 (file)
--- a/samples/scrollsub/scrollsub.cpp
+++ b/samples/scrollsub/scrollsub.cpp
@@ -36,11 +36,15 @@ 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(){};
+

     void OnPaint( wxPaintEvent &event );
     void OnSize( wxSizeEvent &event );
     void OnPaint( wxPaintEvent &event );
     void OnSize( wxSizeEvent &event );

+
+protected:
+    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size);
+

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


@@ -174,10 +178,19 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id,
 
     mainsizer->Add( middlesizer, 1, wxEXPAND );
 
 
     mainsizer->Add( middlesizer, 1, wxEXPAND );
 

-    SetAutoLayout( true );

     SetSizer( mainsizer );
 }
 
     SetSizer( mainsizer );
 }
 

+wxSize MyScrolledWindow::GetSizeAvailableForScrollTarget(const wxSize& size)
+{
+    // decrease the total size by the size of the non-scrollable parts above/to
+    // the left of the canvas
+    wxSize sizeCanvas(size);
+    sizeCanvas.x -= 60;
+    sizeCanvas.y -= 25;
+    return sizeCanvas;
+}
+

 void MyScrolledWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     // We need to override OnSize so that our scrolled
 void MyScrolledWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     // We need to override OnSize so that our scrolled


@@ -421,7 +434,6 @@ MyFrame::MyFrame()
     topsizer->Add( m_log, 0, wxEXPAND );
 #endif // wxUSE_LOG
 
     topsizer->Add( m_log, 0, wxEXPAND );
 #endif // wxUSE_LOG
 

-    SetAutoLayout( true );

     SetSizer( topsizer );
 }
 
     SetSizer( topsizer );
 }