no changes, just resolved a conflict

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp
index 1f09dc1962dfc0431eb69a0d6eb231b1eebc4313..9539d1762597cc427736fbd5dba9670bc211f1e0 100644 (file)
--- a/samples/scrollsub/scrollsub.cpp
+++ b/samples/scrollsub/scrollsub.cpp
@@ -207,7 +207,7 @@ MyTopLabels::MyTopLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint
     m_owner = parent;
 }
 
     m_owner = parent;
 }
 

-void MyTopLabels::OnPaint( wxPaintEvent &WXUNUSED(event) )
+void MyTopLabels::OnPaint( wxPaintEvent& WXUNUSED(event) )

 {
     wxPaintDC dc(this);
 
 {
     wxPaintDC dc(this);
 


@@ -241,7 +241,7 @@ MyRightLabels::MyRightLabels( wxScrolledWindow *parent, wxWindowID id, const wxP
     m_owner = parent;
 }
 
     m_owner = parent;
 }
 

-void MyRightLabels::OnPaint( wxPaintEvent &WXUNUSED(event) )
+void MyRightLabels::OnPaint( wxPaintEvent& WXUNUSED(event) )

 {
     wxPaintDC dc(this);
 
 {
     wxPaintDC dc(this);
 


@@ -396,7 +396,7 @@ MyFrame::MyFrame()
     SetStatusWidths( 2, widths );
 
     m_scrolled = new MyScrolledWindow( this, -1, wxDefaultPosition, wxSize(100,100) );
     SetStatusWidths( 2, widths );
 
     m_scrolled = new MyScrolledWindow( this, -1, wxDefaultPosition, wxSize(100,100) );

-    m_scrolled->SetScrollbars( 10, 10, 50, 100 );
+    m_scrolled->SetScrollbars( 10, 10, 50, 50 );

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