AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no changes, just resolved a conflict

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-09-27 15:40:49 +00:00
parent 1bf0f0af62
commit 4547faae1d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/scrollsub/scrollsub.cpp
View File

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