X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa06a8fdfbc9f4b5af3af38125ec8703742a70ee..c8b34a16f79602ce1173a6f0ac0e5ae43b043da6:/samples/scroll/scroll.cpp?ds=sidebyside

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index 71d7b0e83c..6f27a04ede 100644
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -34,7 +34,7 @@ class MyApp;
 class MyCanvas: public wxScrolledWindow
 {
 public:
-    MyCanvas() {};
+    MyCanvas() {}
     MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size );
     ~MyCanvas();
     void OnPaint( wxPaintEvent &event );
@@ -44,7 +44,6 @@ public:
     void OnMoveButton( wxCommandEvent &event );
     void OnScrollWin( wxCommandEvent &event );
     void OnMouseDown( wxMouseEvent &event );
-    void OnScroll( wxScrollWinEvent &event );
 
     wxButton *m_button;
 
@@ -52,7 +51,54 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
+// ----------------------------------------------------------------------------
+// MyScrolledWindow classes: examples of wxScrolledWindow usage
+// ----------------------------------------------------------------------------
+
+// base class for both of them
+class MyScrolledWindowBase : public wxScrolledWindow
+{
+public:
+    MyScrolledWindowBase(wxWindow *parent) : wxScrolledWindow(parent)
+    {
+        m_nLines = 100;
+
+        InitScrollbars();
+    }
+
+protected:
+    // set the scrollbar params
+    void InitScrollbars();
+
+    // the height of one line on screen
+    wxCoord m_hLine;
+
+    // the number of lines we draw
+    size_t m_nLines;
+};
+
+// this class does "stupid" redrawing - it redraws everything each time
+class MyScrolledWindowDumb : public MyScrolledWindowBase
+{
+public:
+    MyScrolledWindowDumb(wxWindow *parent) : MyScrolledWindowBase(parent) { }
+
+    virtual void OnDraw(wxDC& dc);
+};
+
+// this class does "smart" redrawing - only redraws the lines which must be
+// redrawn
+class MyScrolledWindowSmart : public MyScrolledWindowBase
+{
+public:
+    MyScrolledWindowSmart(wxWindow *parent) : MyScrolledWindowBase(parent) { }
+
+    virtual void OnDraw(wxDC& dc);
+};
+
+// ----------------------------------------------------------------------------
 // MyFrame
+// ----------------------------------------------------------------------------
 
 class MyFrame: public wxFrame
 {
@@ -105,7 +151,6 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
   EVT_BUTTON( ID_DELBUTTON,   MyCanvas::OnDeleteButton)
   EVT_BUTTON( ID_MOVEBUTTON,  MyCanvas::OnMoveButton)
   EVT_BUTTON( ID_SCROLLWIN,   MyCanvas::OnScrollWin)
-  EVT_SCROLLWIN(              MyCanvas::OnScroll)
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
@@ -141,8 +186,8 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     (void) new wxRadioBox( this, -1, "This", wxPoint(10,440), wxDefaultSize, 5, choices, 2, wxRA_SPECIFY_ROWS );
 
     wxListCtrl *m_listCtrl = new wxListCtrl(
-	this, -1, wxPoint(200, 110), wxSize(180, 120),
-	wxLC_REPORT | wxSIMPLE_BORDER | wxLC_SINGLE_SEL );
+            this, -1, wxPoint(200, 110), wxSize(180, 120),
+            wxLC_REPORT | wxSIMPLE_BORDER | wxLC_SINGLE_SEL );
 
     m_listCtrl->InsertColumn(0, "First", wxLIST_FORMAT_LEFT, 90);
     m_listCtrl->InsertColumn(1, "Last", wxLIST_FORMAT_LEFT, 90);
@@ -159,28 +204,28 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
 #endif
 
-    wxPanel *test = new wxPanel( this, -1, wxPoint(10, 10), wxSize(130,50), wxSIMPLE_BORDER | wxTAB_TRAVERSAL );
-    test->SetBackgroundColour( "WHEAT" );
+    wxPanel *test = new wxPanel( this, -1, wxPoint(10, 110), wxSize(130,50), wxSIMPLE_BORDER | wxTAB_TRAVERSAL );
+    test->SetBackgroundColour( wxT("WHEAT") );
 
 #if 0
 
     wxButton *test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
 
     test = new wxPanel( this, -1, wxPoint(160, 530), wxSize(130,120), wxSUNKEN_BORDER | wxTAB_TRAVERSAL );
-    test->SetBackgroundColour( "WHEAT" );
+    test->SetBackgroundColour( wxT("WHEAT") );
     test->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
     test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
     test2->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
 
     test = new wxPanel( this, -1, wxPoint(310, 530), wxSize(130,120), wxRAISED_BORDER | wxTAB_TRAVERSAL );
-    test->SetBackgroundColour( "WHEAT" );
+    test->SetBackgroundColour( wxT("WHEAT") );
     test->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
     test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
     test2->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
 
 #endif
 
-    SetBackgroundColour( "BLUE" );
+    SetBackgroundColour( wxT("BLUE") );
 
     SetCursor( wxCursor( wxCURSOR_IBEAM ) );
 }
@@ -196,10 +241,10 @@ void MyCanvas::OnMouseDown( wxMouseEvent &event )
         wxPoint pt( event.GetPosition() );
         int x,y;
         CalcUnscrolledPosition( pt.x, pt.y, &x, &y );
-        wxLogMessage( "Mouse down event at: %d %d, scrolled: %d %d", pt.x, pt.y, x, y );
+        wxLogMessage( wxT("Mouse down event at: %d %d, scrolled: %d %d"), pt.x, pt.y, x, y );
 
         if ( !event.LeftIsDown() )
-            wxLogMessage( "Error: LeftIsDown() should be TRUE if for LeftDown()" );
+            wxLogMessage( wxT("Error: LeftIsDown() should be TRUE if for LeftDown()") );
     }
 }
 
@@ -218,57 +263,48 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 void MyCanvas::OnQueryPosition( wxCommandEvent &WXUNUSED(event) )
 {
     wxPoint pt( m_button->GetPosition() );
-    wxLogMessage( "Position of ""Query position"" is %d %d", pt.x, pt.y );
+    wxLogMessage( wxT("Position of \"Query position\" is %d %d"), pt.x, pt.y );
     pt = ClientToScreen( pt );
-    wxLogMessage( "Position of ""Query position"" on screen is %d %d", pt.x, pt.y );
+    wxLogMessage( wxT("Position of \"Query position\" on screen is %d %d"), pt.x, pt.y );
 }
 
 void MyCanvas::OnAddButton( wxCommandEvent &WXUNUSED(event) )
 {
-    wxLogMessage( "Inserting button at position 10,70..." );
+    wxLogMessage( wxT("Inserting button at position 10,70...") );
     wxButton *button = new wxButton( this, ID_NEWBUTTON, "new button", wxPoint(10,70), wxSize(80,25) );
     wxPoint pt( button->GetPosition() );
-    wxLogMessage( "-> Position after inserting %d %d", pt.x, pt.y );
+    wxLogMessage( wxT("-> Position after inserting %d %d"), pt.x, pt.y );
 }
 
 void MyCanvas::OnDeleteButton( wxCommandEvent &event )
 {
-    wxLogMessage( "Deleting button inserted with ""Add button""..." );
+    wxLogMessage( wxT("Deleting button inserted with \"Add button\"...") );
     wxWindow *win = FindWindow( ID_NEWBUTTON );
     if (win)
        win->Destroy();
     else
-       wxLogMessage( "-> No window with id = ID_NEWBUTTON found." );
+       wxLogMessage( wxT("-> No window with id = ID_NEWBUTTON found.") );
 }
 
 void MyCanvas::OnMoveButton( wxCommandEvent &event )
 {
-    wxLogMessage( "Moving button 10 pixels downward.." );
+    wxLogMessage( wxT("Moving button 10 pixels downward..") );
     wxWindow *win = FindWindow( event.GetId() );
     wxPoint pt( win->GetPosition() );
-    wxLogMessage( "-> Position before move is %d %d", pt.x, pt.y );
+    wxLogMessage( wxT("-> Position before move is %d %d"), pt.x, pt.y );
     win->Move( -1, pt.y + 10 );
     pt = win->GetPosition();
-    wxLogMessage( "-> Position after move is %d %d", pt.x, pt.y );
+    wxLogMessage( wxT("-> Position after move is %d %d"), pt.x, pt.y );
 }
 
 void MyCanvas::OnScrollWin( wxCommandEvent &WXUNUSED(event) )
 {
-    wxLogMessage( "Scrolling 2 units up.\nThe white square and the controls should move equally!" );
+    wxLogMessage( wxT("Scrolling 2 units up.\nThe white square and the controls should move equally!") );
     int x,y;
-    ViewStart( &x, &y );
+    GetViewStart( &x, &y );
     Scroll( -1, y+2 );
 }
 
-void MyCanvas::OnScroll( wxScrollWinEvent &event )
-{
-    if (( event.GetEventType() == wxEVT_SCROLLWIN_THUMBRELEASE ))
-    {
-        wxLogMessage( "Thumb released; position: %u", event.GetPosition() );
-    }
-    event.Skip();
-}
-
 // MyFrame
 
 const int ID_QUIT  = 108;
@@ -306,15 +342,15 @@ MyFrame::MyFrame()
 
     m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(100,100) );
     m_canvas->SetScrollbars( 10, 10, 50, 100 );
-#if 0
-    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;
-#endif
+
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     topsizer->Add( m_canvas, 1, wxEXPAND );
-//  topsizer->Add( m_log, 0, wxEXPAND );
+
+    wxSizer *sizerBtm = new wxBoxSizer(wxHORIZONTAL);
+    sizerBtm->Add( new MyScrolledWindowDumb(this), 1, wxEXPAND );
+    sizerBtm->Add( new MyScrolledWindowSmart(this), 1, wxEXPAND );
+    topsizer->Add( sizerBtm, 1, wxEXPAND );
 
     SetAutoLayout( TRUE );
     SetSizer( topsizer );
@@ -354,3 +390,62 @@ bool MyApp::OnInit()
   return TRUE;
 }
 
+// ----------------------------------------------------------------------------
+// MyScrolledWindowXXX
+// ----------------------------------------------------------------------------
+
+void MyScrolledWindowBase::InitScrollbars()
+{
+    wxClientDC dc(this);
+    dc.GetTextExtent(_T("Line 17"), NULL, &m_hLine);
+
+    // no horz scrolling
+    SetScrollbars(0, m_hLine, 0, m_nLines + 1, 0, 0, TRUE /* no refresh */);
+}
+
+void MyScrolledWindowDumb::OnDraw(wxDC& dc)
+{
+    // this is useful to see which lines are redrawn
+    static size_t s_redrawCount = 0;
+    dc.SetTextForeground(s_redrawCount++ % 2 ? *wxRED : *wxBLUE);
+
+    wxCoord y = 0;
+    for ( size_t line = 0; line < m_nLines; line++ )
+    {
+        wxCoord yPhys;
+        CalcScrolledPosition(0, y, NULL, &yPhys);
+
+        dc.DrawText(wxString::Format(_T("Line %u (logical %d, physical %d)"),
+                                     line, y, yPhys), 0, y);
+        y += m_hLine;
+    }
+}
+
+void MyScrolledWindowSmart::OnDraw(wxDC& dc)
+{
+    // this is useful to see which lines are redrawn
+    static size_t s_redrawCount = 0;
+    dc.SetTextForeground(s_redrawCount++ % 2 ? *wxRED : *wxBLUE);
+
+    // update region is always in device coords, translate to logical ones
+    wxRect rectUpdate = GetUpdateRegion().GetBox();
+    CalcUnscrolledPosition(rectUpdate.x, rectUpdate.y,
+                           &rectUpdate.x, &rectUpdate.y);
+
+    size_t lineFrom = rectUpdate.y / m_hLine,
+           lineTo = rectUpdate.GetBottom() / m_hLine;
+
+    if ( lineTo > m_nLines - 1)
+        lineTo = m_nLines - 1;
+
+    wxCoord y = lineFrom*m_hLine;
+    for ( size_t line = lineFrom; line <= lineTo; line++ )
+    {
+        wxCoord yPhys;
+        CalcScrolledPosition(0, y, NULL, &yPhys);
+
+        dc.DrawText(wxString::Format(_T("Line %u (logical %d, physical %d)"),
+                                     line, y, yPhys), 0, y);
+        y += m_hLine;
+    }
+}