X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e0666bdc7b5ae503fc9e727b23efe2234dca548a..11393d2900fdd267f22d653721c6be745d0c4649:/samples/scroll/scroll.cpp

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index 9c14457566..a22c23e2a9 100644
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -34,20 +34,22 @@ const long ID_INSERT_NEW = 101;
 // a trivial example
 // ----------------------------------------------------------------------
 
-class MySimpleFrame;
-class MySimpleCanvas;
-
-// MySimpleCanvas
-
+// MySimpleCanvas: a scrolled window which draws a simple rectangle
 class MySimpleCanvas: public wxScrolledWindow
 {
 public:
     MySimpleCanvas() { }
-    MySimpleCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size );
-
-    void OnPaint( wxPaintEvent &event );
+    MySimpleCanvas(wxWindow *parent);
 
 private:
+    void OnPaint(wxPaintEvent& event);
+
+    enum
+    {
+        CANVAS_WIDTH = 292,
+        CANVAS_HEIGHT = 297
+    };
+
     DECLARE_DYNAMIC_CLASS(MyCanvas)
     DECLARE_EVENT_TABLE()
 };
@@ -58,12 +60,14 @@ BEGIN_EVENT_TABLE(MySimpleCanvas, wxScrolledWindow)
   EVT_PAINT(      MySimpleCanvas::OnPaint)
 END_EVENT_TABLE()
 
-MySimpleCanvas::MySimpleCanvas( wxWindow *parent, wxWindowID id,
-                    const wxPoint &pos, const wxSize &size )
-    : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER, _T("test canvas") )
+MySimpleCanvas::MySimpleCanvas(wxWindow *parent)
+              : wxScrolledWindow(parent, wxID_ANY,
+                                 wxDefaultPosition,
+                                 wxDefaultSize,
+                                 wxSUNKEN_BORDER)
 {
     SetScrollRate( 10, 10 );
-    SetVirtualSize( 92, 97 );
+    SetVirtualSize( CANVAS_WIDTH, CANVAS_HEIGHT );
     SetBackgroundColour( *wxWHITE );
 }
 
@@ -74,21 +78,18 @@ void MySimpleCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     dc.SetPen( *wxRED_PEN );
     dc.SetBrush( *wxTRANSPARENT_BRUSH );
-    dc.DrawRectangle( 0,0,92,97 );
+    dc.DrawRectangle( 0, 0, CANVAS_WIDTH, CANVAS_HEIGHT );
 }
 
-// MySimpleFrame
-
+// MySimpleFrame: a frame which contains a MySimpleCanvas
 class MySimpleFrame: public wxFrame
 {
 public:
     MySimpleFrame();
 
-    void OnQuit( wxCommandEvent &event );
-
-    MySimpleCanvas         *m_canvas;
-
 private:
+    void OnClose(wxCommandEvent& WXUNUSED(event)) { Close(true); }
+
     DECLARE_DYNAMIC_CLASS(MySimpleFrame)
     DECLARE_EVENT_TABLE()
 };
@@ -97,27 +98,22 @@ private:
 IMPLEMENT_DYNAMIC_CLASS( MySimpleFrame, wxFrame )
 
 BEGIN_EVENT_TABLE(MySimpleFrame,wxFrame)
-  EVT_MENU    (ID_QUIT,  MySimpleFrame::OnQuit)
+  EVT_MENU(wxID_CLOSE, MySimpleFrame::OnClose)
 END_EVENT_TABLE()
 
 MySimpleFrame::MySimpleFrame()
-       : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxScrolledWindow sample"),
-                  wxPoint(120,120), wxSize(150,150) )
+             : wxFrame(NULL, wxID_ANY, _T("wxScrolledWindow sample"),
+                       wxDefaultPosition, wxSize(200, 200))
 {
     wxMenu *file_menu = new wxMenu();
-    file_menu->Append( ID_QUIT,       _T("E&xit\tAlt-X"));
+    file_menu->Append(wxID_CLOSE);
 
     wxMenuBar *menu_bar = new wxMenuBar();
     menu_bar->Append(file_menu, _T("&File"));
 
     SetMenuBar( menu_bar );
 
-    m_canvas = new MySimpleCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(100,100) );
-}
-
-void MySimpleFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
-{
-  Close( true );
+    new MySimpleCanvas(this);
 }
 
 // ----------------------------------------------------------------------
@@ -535,16 +531,11 @@ MyAutoScrollWindow::MyAutoScrollWindow( wxWindow *parent )
                              wxDefaultPosition,
                              SMALL_BUTTON );
 
-    // We need to do this here, because wxADJUST_MINSIZE below
-    // will cause the initial size to be ignored for Best/Min size.
-    // It would be nice to fix the sizers to handle this a little
-    // more cleanly.
-
     m_button->SetSizeHints( SMALL_BUTTON.GetWidth(), SMALL_BUTTON.GetHeight() );
 
     innersizer->Add( m_button,
                      0,
-                     wxALIGN_CENTER | wxALL | wxADJUST_MINSIZE,
+                     wxALIGN_CENTER | wxALL,
                      20 );
 
     innersizer->Add( new wxStaticText( this, wxID_ANY, _T("This is just") ),
@@ -939,7 +930,9 @@ void MyAutoTimedScrollingWindow::OnDraw(wxDC& dc)
     wxBrush selBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)
             , wxSOLID);
     dc.SetPen(*wxTRANSPARENT_PEN);
-    wxString str = sm_testData;
+    const wxString str = sm_testData;
+    size_t strLength = str.length();
+    wxString::const_iterator str_i;
 
     // draw the characters
     // 1. for each update region
@@ -950,6 +943,7 @@ void MyAutoTimedScrollingWindow::OnDraw(wxDC& dc)
         for (int chY = updRectInGChars.y
                 ; chY <= updRectInGChars.y + updRectInGChars.height; ++chY) {
             // 3. for each character in the row
+            bool isFirstX = true;
             for (int chX = updRectInGChars.x
                     ; chX <= updRectInGChars.x + updRectInGChars.width
                     ; ++chX) {
@@ -971,10 +965,15 @@ void MyAutoTimedScrollingWindow::OnDraw(wxDC& dc)
                 size_t charIndex = chY * sm_lineLen + chX;
                 if (chY < sm_lineCnt &&
                     chX < sm_lineLen &&
-                    charIndex < str.Length())
+                    charIndex < strLength)
                 {
-                    dc.DrawText(str.Mid(charIndex,1),
-                                charPos.x, charPos.y);
+                    if (isFirstX)
+                    {
+                        str_i = str.begin() + charIndex;
+                        isFirstX = false;
+                    }
+                    dc.DrawText(*str_i, charPos.x, charPos.y);
+                    ++str_i;
                 }
             }
         }