trying to speed up wxExecute(SYNC) -- by adding sleep to it (!) (patch 814478)

[wxWidgets.git] / samples / erase / erase.cpp

diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index ec15d7978ea227ec6febaf1f13f84c583b945f04..6e87821b5ef0e49f0e382dc2179b843c998113ed 100644 (file)
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma implementation "erase.cpp"
     #pragma interface "erase.cpp"
 #endif
     #pragma implementation "erase.cpp"
     #pragma interface "erase.cpp"
 #endif


@@ -71,10 +71,14 @@ class MyCanvas : public wxScrolledWindow
 {
 public:
     MyCanvas( MyFrame *parent );
 {
 public:
     MyCanvas( MyFrame *parent );

-    
+

     void OnPaint( wxPaintEvent &event );
     void OnPaint( wxPaintEvent &event );

+    void OnChar( wxKeyEvent &event );

     void OnEraseBackground( wxEraseEvent &event );
 
     void OnEraseBackground( wxEraseEvent &event );
 

+    wxBitmap    m_bitmap;
+    wxString    m_text;
+

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };


@@ -86,8 +90,7 @@ private:
 enum
 {
     // menu items
 enum
 {
     // menu items

-    Minimal_Quit = 1,
-    Minimal_About
+    ID_MENU_QUIT = 1,

 };
 
 
 };
 
 


@@ -99,11 +102,11 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

-    MyFrame *frame = new MyFrame("Minimal wxWindows App",
+    MyFrame *frame = new MyFrame(_T("Erase sample"),

                                  wxPoint(50, 50), wxSize(450, 340));
 
     frame->Show(TRUE);
                                  wxPoint(50, 50), wxSize(450, 340));
 
     frame->Show(TRUE);

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -112,37 +115,33 @@ bool MyApp::OnInit()
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
-    EVT_MENU(Minimal_About, MyFrame::OnAbout)
+    EVT_MENU(ID_MENU_QUIT,  MyFrame::OnQuit)
+    EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)

 END_EVENT_TABLE()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size)
 {
 END_EVENT_TABLE()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size)
 {

-#ifdef __WXMAC__
-    wxApp::s_macAboutMenuItemId = Minimal_About;
-#endif
-

     SetIcon(wxICON(mondrian));
 
     SetIcon(wxICON(mondrian));
 

-    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);

 
     wxMenu *helpMenu = new wxMenu;
 
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
+    helpMenu->Append(wxID_ABOUT, _T("&About...\tCtrl-A"), _T("Show about dialog"));

 
 

-    menuFile->Append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program");
+    menuFile->Append(ID_MENU_QUIT, _T("E&xit\tAlt-X"), _T("Quit this program"));

 
     wxMenuBar *menuBar = new wxMenuBar();
 
     wxMenuBar *menuBar = new wxMenuBar();

-    menuBar->Append(menuFile, "&File");
-    menuBar->Append(helpMenu, "&Help");
+    menuBar->Append(menuFile, _T("&File"));
+    menuBar->Append(helpMenu, _T("&Help"));

 
     SetMenuBar(menuBar);
 
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
 
     SetMenuBar(menuBar);
 
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);

-    SetStatusText("Welcome to wxWindows!");
+    SetStatusText(_T("Welcome to wxWindows erase sample!"));

 #endif // wxUSE_STATUSBAR
 
     (void)new MyCanvas( this );
 #endif // wxUSE_STATUSBAR
 
     (void)new MyCanvas( this );


@@ -156,36 +155,80 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxString msg;
-    msg.Printf( _T("This is the about dialog of the Erase sample.\n")
-                _T("Welcome to %s"), wxVERSION_STRING);
-
-    wxMessageBox(msg, "About Erase", wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(_T("This sample shows how you can draw custom background."),
+                 _T("About Erase Sample"), wxOK | wxICON_INFORMATION, this);

 }
 
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_PAINT(  MyCanvas::OnPaint)
 }
 
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_PAINT(  MyCanvas::OnPaint)

+    EVT_CHAR(  MyCanvas::OnChar)

     EVT_ERASE_BACKGROUND(  MyCanvas::OnEraseBackground)
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( MyFrame *parent )
     EVT_ERASE_BACKGROUND(  MyCanvas::OnEraseBackground)
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( MyFrame *parent )

- : wxScrolledWindow( parent, -1, wxDefaultPosition, wxDefaultSize, 
-                    wxScrolledWindowStyle|wxNO_FULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER )
+        : wxScrolledWindow( parent, -1, wxDefaultPosition, wxDefaultSize,
+                            wxScrolledWindowStyle |
+                            wxNO_FULL_REPAINT_ON_RESIZE|
+                            wxSUNKEN_BORDER )

 {
     SetScrollbars( 10, 10, 40, 100, 0, 0 );
 {
     SetScrollbars( 10, 10, 40, 100, 0, 0 );

+
+    m_bitmap = wxBitmap( wxICON(mondrian) );
+
+    new wxStaticBitmap( this, -1, m_bitmap, wxPoint(80,20) );

 }
 
 }
 

-void MyCanvas::OnPaint( wxPaintEvent &event )
+void MyCanvas::OnChar( wxKeyEvent &event )
+{
+#if wxUSE_UNICODE
+    if (event.m_uniChar)
+    {
+        m_text += event.m_uniChar;
+        Refresh();
+        return;
+    }
+#endif
+
+    // some test cases
+    switch (event.m_keyCode)
+    {
+        case WXK_UP: m_text += wxT( "<UP>" ); break;
+        case WXK_LEFT: m_text += wxT( "<LEFT>" ); break;
+        case WXK_RIGHT: m_text += wxT( "<RIGHT>" ); break;
+        case WXK_DOWN: m_text += wxT( "<DOWN>" ); break;
+        case WXK_RETURN: m_text += wxT( "<ENTER>" ); break;
+        default: m_text += event.m_keyCode; break;
+    }
+    
+}
+
+void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )

 {
     wxPaintDC dc(this);
     PrepareDC( dc );
 {
     wxPaintDC dc(this);
     PrepareDC( dc );

+
+    dc.SetBrush( *wxBLACK_BRUSH );
+    dc.DrawRectangle( 0,0,200,50 );
+
+    dc.DrawBitmap( m_bitmap, 10, 20, TRUE );
+
+    dc.SetTextForeground(*wxBLUE);
+    dc.DrawText(_T("This text is drawn from OnPaint"), 65, 65);

     
     

-#if 0  
+    wxString tmp;
+    tmp.Printf( _T("Hit any key to display more text: %s"), m_text.c_str() );
+    int w,h;
+    dc.GetTextExtent( tmp, &w, &h );
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRectangle( 65, 85, w, h );
+    dc.DrawText( tmp, 65, 85 );
+
+#if 0

     wxRegionIterator upd( GetUpdateRegion() );
     while (upd)
     {
     wxRegionIterator upd( GetUpdateRegion() );
     while (upd)
     {

-        wxLogDebug( "Paint: %d %d %d %d", upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
+        wxLogDebug( _T("Paint: %d %d %d %d"), upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );

         upd ++;
     }
 #endif
         upd ++;
     }
 #endif


@@ -193,29 +236,31 @@ void MyCanvas::OnPaint( wxPaintEvent &event )
 #if 0
     wxSize size = GetSize();
     wxSize client_size = GetClientSize();
 #if 0
     wxSize size = GetSize();
     wxSize client_size = GetClientSize();

-    wxLogDebug( "size %d %d client_size %d %d", size.x, size.y, client_size.x, client_size.y );
+    wxLogDebug( _T("size %d %d client_size %d %d"), size.x, size.y, client_size.x, client_size.y );

 #endif
 #endif

-    
+
+#if 0
+    int i;

     dc.SetPen( *wxWHITE_PEN );
     dc.SetPen( *wxWHITE_PEN );

-    for (int i = 0; i < 20; i += 2)
+    for (i = 0; i < 20; i += 2)

        dc.DrawLine( i,i, i+100,i );
        dc.DrawLine( i,i, i+100,i );

-    
+

     dc.SetPen( *wxWHITE_PEN );
     dc.SetPen( *wxWHITE_PEN );

-    for (int i = 200; i < 220; i += 2)
+    for (i = 200; i < 220; i += 2)

        dc.DrawLine( i-200,i, i-100,i );
        dc.DrawLine( i-200,i, i-100,i );

-    
+

     wxRegion region( 110, 110, 80, 80 );
     wxRegion hole( 130, 130, 40, 1 );
     region.Intersect( hole );
     dc.SetClippingRegion( region );
     wxRegion region( 110, 110, 80, 80 );
     wxRegion hole( 130, 130, 40, 1 );
     region.Intersect( hole );
     dc.SetClippingRegion( region );

-    
+

     dc.SetBrush( *wxRED_BRUSH );
     dc.DrawRectangle( 100, 100, 200, 200 );
     dc.SetBrush( *wxRED_BRUSH );
     dc.DrawRectangle( 100, 100, 200, 200 );

-    
+

     dc.DestroyClippingRegion();
 
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.DestroyClippingRegion();
 
     dc.SetPen( *wxTRANSPARENT_PEN );

-    
+

     wxRegion strip( 110, 200, 30, 1 );
     wxRegionIterator it( strip );
     while (it)
     wxRegion strip( 110, 200, 30, 1 );
     wxRegionIterator it( strip );
     while (it)


@@ -223,10 +268,29 @@ void MyCanvas::OnPaint( wxPaintEvent &event )
         dc.DrawRectangle( it.GetX(), it.GetY(), it.GetWidth(), it.GetHeight() );
         it ++;
     }
         dc.DrawRectangle( it.GetX(), it.GetY(), it.GetWidth(), it.GetHeight() );
         it ++;
     }

+#endif // 0

 }
 
 }
 

-void MyCanvas::OnEraseBackground( wxEraseEvent &event )
+void MyCanvas::OnEraseBackground( wxEraseEvent& event )

 {
 {

-    event.Skip( TRUE );
+    wxDC& dc = *event.GetDC();
+    dc.SetPen(*wxGREEN_PEN);
+
+    // this line is needed, otherwise the junk is left on win the background
+    dc.Clear();
+
+    wxSize size = GetClientSize();
+    for ( int x = 0; x < size.x; x+= 10 )
+    {
+        dc.DrawLine(x, 0, x, size.y);
+    }
+
+    for ( int y = 0; y < size.y; y+= 10 )
+    {
+        dc.DrawLine(0, y, size.x, y);
+    }
+
+    dc.SetTextForeground(*wxRED);
+    dc.DrawText(_T("This text is drawn from OnEraseBackground"), 60, 60);

 }
 
 }