X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a0e49a46ed7dfec7b71b5c517f79bdb080dc6d9..1ecf2613d063f6d600ae817cc44d85cec189af13:/samples/scrollsub/scrollsub.cpp diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp index cc8d3acc7e..f8620259de 100644 --- a/samples/scrollsub/scrollsub.cpp +++ b/samples/scrollsub/scrollsub.cpp @@ -36,11 +36,11 @@ class MyApp; class MyScrolledWindow: public wxScrolledWindow { public: - MyScrolledWindow() {} + MyScrolledWindow(){}; MyScrolledWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); - ~MyScrolledWindow(); + ~MyScrolledWindow(){}; void OnPaint( wxPaintEvent &event ); - + void OnSize( wxSizeEvent &event ); private: MyCanvas *m_canvas; @@ -87,10 +87,10 @@ private: class MyCanvas: public wxPanel { public: - MyCanvas() {} + MyCanvas(){}; 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 ); @@ -115,7 +115,9 @@ public: void OnFullScreen( wxCommandEvent &event ); wxScrolledWindow *m_scrolled; +#if wxUSE_LOG wxTextCtrl *m_log; +#endif // wxUSE_LOG private: DECLARE_DYNAMIC_CLASS(MyFrame) @@ -139,17 +141,18 @@ IMPLEMENT_APP(MyApp) 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, const wxPoint &pos, const wxSize &size ) - : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER, "test canvas" ) + : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER, _T("test canvas") ) { - MyTopLabels *top = new MyTopLabels( this, -1, wxDefaultPosition, wxSize(-1,25) ); - MyRightLabels *right = new MyRightLabels( this, -1, wxDefaultPosition, wxSize(60,-1) ); + MyTopLabels *top = new MyTopLabels( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,25) ); + MyRightLabels *right = new MyRightLabels( this, wxID_ANY, wxDefaultPosition, wxSize(60,wxDefaultCoord) ); - m_canvas = new MyCanvas( this, top, right, -1, wxDefaultPosition, wxDefaultSize ); + m_canvas = new MyCanvas( this, top, right, wxID_ANY, wxDefaultPosition, wxDefaultSize ); SetTargetWindow( m_canvas ); @@ -171,12 +174,22 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id, mainsizer->Add( middlesizer, 1, wxEXPAND ); - SetAutoLayout( TRUE ); + SetAutoLayout( true ); 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) ) @@ -207,7 +220,7 @@ MyTopLabels::MyTopLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint m_owner = parent; } -void MyTopLabels::OnPaint( wxPaintEvent &event ) +void MyTopLabels::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); @@ -222,9 +235,9 @@ void MyTopLabels::OnPaint( wxPaintEvent &event ) m_owner->GetScrollPixelsPerUnit( &xScrollUnits, 0 ); dc.SetDeviceOrigin( -xOrigin * xScrollUnits, 0 ); - dc.DrawText( "Column 1", 5, 5 ); - dc.DrawText( "Column 2", 105, 5 ); - dc.DrawText( "Column 3", 205, 5 ); + dc.DrawText( _T("Column 1"), 5, 5 ); + dc.DrawText( _T("Column 2"), 105, 5 ); + dc.DrawText( _T("Column 3"), 205, 5 ); } // MyRightLabels @@ -241,7 +254,7 @@ MyRightLabels::MyRightLabels( wxScrolledWindow *parent, wxWindowID id, const wxP m_owner = parent; } -void MyRightLabels::OnPaint( wxPaintEvent &event ) +void MyRightLabels::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); @@ -256,12 +269,12 @@ void MyRightLabels::OnPaint( wxPaintEvent &event ) m_owner->GetScrollPixelsPerUnit( 0, &yScrollUnits ); dc.SetDeviceOrigin( 0, -yOrigin * yScrollUnits ); - dc.DrawText( "Row 1", 5, 5 ); - dc.DrawText( "Row 2", 5, 30 ); - dc.DrawText( "Row 3", 5, 55 ); - dc.DrawText( "Row 4", 5, 80 ); - dc.DrawText( "Row 5", 5, 105 ); - dc.DrawText( "Row 6", 5, 130 ); + dc.DrawText( _T("Row 1"), 5, 5 ); + dc.DrawText( _T("Row 2"), 5, 30 ); + dc.DrawText( _T("Row 3"), 5, 55 ); + dc.DrawText( _T("Row 4"), 5, 80 ); + dc.DrawText( _T("Row 5"), 5, 105 ); + dc.DrawText( _T("Row 6"), 5, 130 ); } // MyCanvas @@ -274,30 +287,26 @@ END_EVENT_TABLE() MyCanvas::MyCanvas( wxScrolledWindow *parent, MyTopLabels *top, MyRightLabels *right, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxPanel( parent, id, pos, size, wxSUNKEN_BORDER, "test canvas" ) + : wxPanel( parent, id, pos, size, wxSUNKEN_BORDER, _T("test canvas") ) { m_owner = parent; m_topLabels = top; m_rightLabels = right; - (void)new wxButton( this, -1, "Hallo I", wxPoint(0,50), wxSize(100,25) ); - (void)new wxButton( this, -1, "Hallo II", wxPoint(200,50), wxSize(100,25) ); + (void)new wxButton( this, wxID_ANY, _T("Hallo I"), wxPoint(0,50), wxSize(100,25) ); + (void)new wxButton( this, wxID_ANY, _T("Hallo II"), wxPoint(200,50), wxSize(100,25) ); - (void)new wxTextCtrl( this, -1, "Text I", wxPoint(0,100), wxSize(100,25) ); - (void)new wxTextCtrl( this, -1, "Text II", wxPoint(200,100), wxSize(100,25) ); + (void)new wxTextCtrl( this, wxID_ANY, _T("Text I"), wxPoint(0,100), wxSize(100,25) ); + (void)new wxTextCtrl( this, wxID_ANY, _T("Text II"), wxPoint(200,100), wxSize(100,25) ); - (void)new wxComboBox( this, -1, "ComboBox I", wxPoint(0,150), wxSize(100,25), 0, NULL ); - (void)new wxComboBox( this, -1, "ComboBox II", wxPoint(200,150), wxSize(100,25), 0, NULL ); + (void)new wxComboBox( this, wxID_ANY, _T("ComboBox I"), wxPoint(0,150), wxSize(100,25)); + (void)new wxComboBox( this, wxID_ANY, _T("ComboBox II"), wxPoint(200,150), wxSize(100,25)); SetBackgroundColour( wxT("WHEAT") ); SetCursor( wxCursor( wxCURSOR_IBEAM ) ); } -MyCanvas::~MyCanvas() -{ -} - void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxPaintDC dc( this ); @@ -335,7 +344,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxLogMessage( wxT("Redraw first cell") ); dc.DrawRectangle( 0, 0, 100, 25 ); - dc.DrawText( "First Cell", 5, 5 ); + dc.DrawText( _T("First Cell"), 5, 5 ); } } @@ -350,7 +359,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxLogMessage( wxT("Redraw second cell") ); dc.DrawRectangle( 200, 0, 100, 25 ); - dc.DrawText( "Second Cell", 205, 5 ); + dc.DrawText( _T("Second Cell"), 205, 5 ); } } @@ -365,9 +374,9 @@ void MyCanvas::ScrollWindow( int dx, int dy, const wxRect *rect ) // MyFrame -const int ID_QUIT = 108; +const int ID_QUIT = wxID_EXIT; const int ID_FULL = 109; -const int ID_ABOUT = 110; +const int ID_ABOUT = wxID_ABOUT; IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame ) @@ -378,41 +387,47 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame) END_EVENT_TABLE() MyFrame::MyFrame() - : wxFrame( (wxFrame *)NULL, -1, "wxScrolledWindow sample", + : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxScrolledWindow sample"), wxPoint(20,20), wxSize(470,500) ) { wxMenu *file_menu = new wxMenu(); - file_menu->Append( ID_ABOUT, "&About..."); - file_menu->Append( ID_FULL, "&Full screen on/off"); - file_menu->Append( ID_QUIT, "E&xit\tAlt-X"); + file_menu->Append( ID_ABOUT, _T("&About...")); + file_menu->Append( ID_FULL, _T("&Full screen on/off")); + file_menu->Append( ID_QUIT, _T("E&xit\tAlt-X")); wxMenuBar *menu_bar = new wxMenuBar(); - menu_bar->Append(file_menu, "&File"); + menu_bar->Append(file_menu, _T("&File")); SetMenuBar( menu_bar ); +#if wxUSE_STATUSBAR CreateStatusBar(2); int widths[] = { -1, 100 }; SetStatusWidths( 2, widths ); +#endif // wxUSE_STATUSBAR - m_scrolled = new MyScrolledWindow( this, -1, wxDefaultPosition, wxSize(100,100) ); - m_scrolled->SetScrollbars( 10, 10, 50, 100 ); + m_scrolled = new MyScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize(100,100) ); + m_scrolled->SetScrollbars( 10, 10, 50, 50 ); - m_log = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE ); +#if wxUSE_LOG + m_log = new wxTextCtrl( this, wxID_ANY, _T("This is the log window.\n"), wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE ); wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) ); delete old_log; +#endif // wxUSE_LOG wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); topsizer->Add( m_scrolled, 1, wxEXPAND ); +#if wxUSE_LOG topsizer->Add( m_log, 0, wxEXPAND ); +#endif // wxUSE_LOG - SetAutoLayout( TRUE ); + SetAutoLayout( true ); SetSizer( topsizer ); } void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) { - Close( TRUE ); + Close( true ); } void MyFrame::OnFullScreen( wxCommandEvent &WXUNUSED(event) ) @@ -422,9 +437,9 @@ void MyFrame::OnFullScreen( wxCommandEvent &WXUNUSED(event) ) void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) { - (void)wxMessageBox( "wxScroll demo II\n" - "Robert Roebling (c) 1998", - "About wxScroll II Demo", wxICON_INFORMATION | wxOK ); + (void)wxMessageBox( _T("wxScroll demo II\n") + _T("Robert Roebling (c) 1998"), + _T("About wxScroll II Demo"), wxICON_INFORMATION | wxOK ); } //----------------------------------------------------------------------------- @@ -434,8 +449,8 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) bool MyApp::OnInit() { wxFrame *frame = new MyFrame(); - frame->Show( TRUE ); + frame->Show( true ); - return TRUE; + return true; }