From 4547faae1dbfbeffb584c1b16b8dd50d1edf26cd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Sep 2003 15:40:49 +0000 Subject: [PATCH] no changes, just resolved a conflict git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/scrollsub/scrollsub.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp index 1f09dc1962..9539d17625 100644 --- 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; } -void MyTopLabels::OnPaint( wxPaintEvent &WXUNUSED(event) ) +void MyTopLabels::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); @@ -241,7 +241,7 @@ MyRightLabels::MyRightLabels( wxScrolledWindow *parent, wxWindowID id, const wxP m_owner = parent; } -void MyRightLabels::OnPaint( wxPaintEvent &WXUNUSED(event) ) +void MyRightLabels::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); @@ -396,7 +396,7 @@ MyFrame::MyFrame() 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 ) ); -- 2.45.2