X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ecab4dba7d33782458d7cc8b91c981d03d7b9e37..763f55468e441e94e65a72b127c8fc2a48c91e91:/samples/scrollsub/scrollsub.cpp?ds=sidebyside diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp index da86fbb5ac..3d16d9e91d 100644 --- a/samples/scrollsub/scrollsub.cpp +++ b/samples/scrollsub/scrollsub.cpp @@ -48,18 +48,56 @@ private: DECLARE_EVENT_TABLE() }; +// MyTopLabels + +class MyTopLabels: public wxWindow +{ +public: + MyTopLabels() {} + MyTopLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); + + void OnPaint( wxPaintEvent &event ); + +private: + wxScrolledWindow *m_owner; + + DECLARE_DYNAMIC_CLASS(MyTopLabels) + DECLARE_EVENT_TABLE() +}; + +// MyRightLabels + +class MyRightLabels: public wxWindow +{ +public: + MyRightLabels() {} + MyRightLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); + + void OnPaint( wxPaintEvent &event ); + +private: + wxScrolledWindow *m_owner; + + DECLARE_DYNAMIC_CLASS(MyRightLabels) + DECLARE_EVENT_TABLE() +}; + // MyCanvas class MyCanvas: public wxPanel { public: MyCanvas() {} - MyCanvas( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); + MyCanvas( wxScrolledWindow *parent, MyTopLabels *top, MyRightLabels *right, + wxWindowID id, const wxPoint &pos, const wxSize &size ); ~MyCanvas(); void OnPaint( wxPaintEvent &event ); + void ScrollWindow( int dx, int dy, const wxRect *rect ); private: wxScrolledWindow *m_owner; + MyTopLabels *m_topLabels; + MyRightLabels *m_rightLabels; DECLARE_DYNAMIC_CLASS(MyCanvas) DECLARE_EVENT_TABLE() @@ -74,6 +112,7 @@ public: void OnAbout( wxCommandEvent &event ); void OnQuit( wxCommandEvent &event ); + void OnFullScreen( wxCommandEvent &event ); wxScrolledWindow *m_scrolled; wxTextCtrl *m_log; @@ -107,21 +146,33 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER, "test canvas" ) { - m_canvas = new MyCanvas( this, -1, wxDefaultPosition, wxDefaultSize ); - + MyTopLabels *top = new MyTopLabels( this, -1, wxDefaultPosition, wxSize(-1,25) ); + MyRightLabels *right = new MyRightLabels( this, -1, wxDefaultPosition, wxSize(60,-1) ); + + m_canvas = new MyCanvas( this, top, right, -1, wxDefaultPosition, wxDefaultSize ); + SetTargetWindow( m_canvas ); - SetBackgroundColour( "WHEAT" ); - + SetBackgroundColour( wxT("WHEAT") ); + SetCursor( wxCursor( wxCURSOR_HAND ) ); - - - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - - topsizer->Add( m_canvas, 1, wxEXPAND|wxALL, 30 ); + + wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL ); + topsizer->Add( 60,25 ); + topsizer->Add( top, 1, wxEXPAND ); + + mainsizer->Add( topsizer, 0, wxEXPAND ); + + wxBoxSizer *middlesizer = new wxBoxSizer( wxHORIZONTAL ); + middlesizer->Add( right, 0, wxEXPAND ); + middlesizer->Add( m_canvas, 1, wxEXPAND ); + + mainsizer->Add( middlesizer, 1, wxEXPAND ); SetAutoLayout( TRUE ); - SetSizer( topsizer ); + SetSizer( mainsizer ); } MyScrolledWindow::~MyScrolledWindow() @@ -132,12 +183,63 @@ void MyScrolledWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxPaintDC dc( this ); +/* wxSize size( GetClientSize() ); - + long w,h; dc.GetTextExtent( wxT("Headline"), &w, &h ); dc.DrawText( wxT("Headline"), long (size.x / 2 - w / 2), 10 ); +*/ +} + +// MyTopLabels + +IMPLEMENT_DYNAMIC_CLASS(MyTopLabels,wxWindow) + +BEGIN_EVENT_TABLE(MyTopLabels, wxWindow) + EVT_PAINT( MyTopLabels::OnPaint) +END_EVENT_TABLE() + +MyTopLabels::MyTopLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) + : wxWindow( parent, id, pos, size ) +{ + m_owner = parent; +} + +void MyTopLabels::OnPaint( wxPaintEvent &event ) +{ + wxPaintDC dc(this); + m_owner->PrepareDC( dc ); + dc.DrawText( "Column 1", 5, 5 ); + dc.DrawText( "Column 2", 105, 5 ); + dc.DrawText( "Column 3", 205, 5 ); +} + +// MyRightLabels + +IMPLEMENT_DYNAMIC_CLASS(MyRightLabels,wxWindow) + +BEGIN_EVENT_TABLE(MyRightLabels, wxWindow) + EVT_PAINT( MyRightLabels::OnPaint) +END_EVENT_TABLE() + +MyRightLabels::MyRightLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) + : wxWindow( parent, id, pos, size ) +{ + m_owner = parent; +} + +void MyRightLabels::OnPaint( wxPaintEvent &event ) +{ + wxPaintDC dc(this); + m_owner->PrepareDC( dc ); + 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 ); } // MyCanvas @@ -148,17 +250,22 @@ BEGIN_EVENT_TABLE(MyCanvas, wxPanel) EVT_PAINT( MyCanvas::OnPaint) END_EVENT_TABLE() -MyCanvas::MyCanvas( wxScrolledWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size ) +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" ) { m_owner = parent; - - (void)new wxButton( this, -1, "Hallo I", wxPoint(20,20), wxSize(100,30) ); - (void)new wxButton( this, -1, "Hallo II", wxPoint(220,20), wxSize(100,30) ); + 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 wxTextCtrl( this, -1, "Text I", wxPoint(0,100), wxSize(100,25) ); + (void)new wxTextCtrl( this, -1, "Text II", wxPoint(200,100), wxSize(100,25) ); + + SetBackgroundColour( wxT("WHEAT") ); - SetBackgroundColour( *wxWHITE ); - SetCursor( wxCursor( wxCURSOR_IBEAM ) ); } @@ -171,26 +278,78 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxPaintDC dc( this ); m_owner->PrepareDC( dc ); - dc.DrawText( "Some text", 140, 140 ); - - dc.DrawRectangle( 100, 160, 200, 200 ); - - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - - dc.DrawRectangle( 10, 10, 480, 980 ); + dc.SetPen( *wxBLACK_PEN ); + + // OK, let's assume we are a grid control and we have two + // grid cells. Here in OnPaint we want to know which cell + // to redraw so that we prevent redrawing cells that don't + // need to get redrawn. We have one cell at (0,0) and one + // more at (200,0), both having a size of (100,25). + + // We can query how much the window has been scrolled + // by calling CalcUnscrolledPosition() + + int scroll_x = 0; + int scroll_y = 0; + m_owner->CalcUnscrolledPosition( scroll_x, scroll_y, &scroll_x, &scroll_y ); + + // We also need to know the size of the window to see which + // cells are completely hidden and not get redrawn + + int size_x = 0; + int size_y = 0; + GetClientSize( &size_x, &size_y ); + + // First cell: (0,0)(100,25) + // It it on screen? + if ((0+100-scroll_x > 0) && (0+25-scroll_y > 0) && + (0-scroll_x < size_x) && (0-scroll_y < size_y)) + { + // Has the region on screen been exposed? + if (IsExposed(0,0,100,25)) + { + wxLogMessage( wxT("Redraw first cell") ); + dc.DrawRectangle( 0, 0, 100, 25 ); + dc.DrawText( "First Cell", 5, 5 ); + } + } + + + // Second cell: (0,200)(100,25) + // It it on screen? + if ((200+100-scroll_x > 0) && (0+25-scroll_y > 0) && + (200-scroll_x < size_x) && (0-scroll_y < size_y)) + { + // Has the region on screen been exposed? + if (IsExposed(200,0,100,25)) + { + wxLogMessage( wxT("Redraw second cell") ); + dc.DrawRectangle( 200, 0, 100, 25 ); + dc.DrawText( "Second Cell", 205, 5 ); + } + } + } +void MyCanvas::ScrollWindow( int dx, int dy, const wxRect *rect ) +{ + wxPanel::ScrollWindow( dx, dy, rect ); + m_topLabels->ScrollWindow( dx, 0, rect ); + m_rightLabels->ScrollWindow( 0, dy, rect ); +} // MyFrame const int ID_QUIT = 108; -const int ID_ABOUT = 109; +const int ID_FULL = 109; +const int ID_ABOUT = 110; IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame ) BEGIN_EVENT_TABLE(MyFrame,wxFrame) EVT_MENU (ID_ABOUT, MyFrame::OnAbout) EVT_MENU (ID_QUIT, MyFrame::OnQuit) + EVT_MENU (ID_FULL, MyFrame::OnFullScreen) END_EVENT_TABLE() MyFrame::MyFrame() @@ -198,7 +357,8 @@ MyFrame::MyFrame() wxPoint(20,20), wxSize(470,500) ) { wxMenu *file_menu = new wxMenu(); - file_menu->Append( ID_ABOUT, "&About.."); + file_menu->Append( ID_ABOUT, "&About..."); + file_menu->Append( ID_FULL, "&Full screen on/off"); file_menu->Append( ID_QUIT, "E&xit\tAlt-X"); wxMenuBar *menu_bar = new wxMenuBar(); @@ -210,15 +370,14 @@ MyFrame::MyFrame() int widths[] = { -1, 100 }; SetStatusWidths( 2, widths ); - m_scrolled = new MyScrolledWindow( this, -1, wxPoint(0,0), wxSize(100,100) ); + m_scrolled = new MyScrolledWindow( this, -1, wxDefaultPosition, wxSize(100,100) ); m_scrolled->SetScrollbars( 10, 10, 50, 100 ); - + m_log = new wxTextCtrl( this, -1, "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; - + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - topsizer->Add( m_scrolled, 1, wxEXPAND ); topsizer->Add( m_log, 0, wxEXPAND ); @@ -231,6 +390,11 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) Close( TRUE ); } +void MyFrame::OnFullScreen( wxCommandEvent &WXUNUSED(event) ) +{ + ShowFullScreen( !IsFullScreen(), wxFULLSCREEN_NOBORDER|wxFULLSCREEN_NOCAPTION ); +} + void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) { (void)wxMessageBox( "wxScroll demo II\n"