added a period at the end of a sentence (test commit, really)

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

diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index 166f7e10084c81ee9c6e9ac1b183092cd400d612..94dd570ec49a50f0f76025118c2e69bab97ef71b 100644 (file)
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation "erase.cpp"
-    #pragma interface "erase.cpp"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -54,35 +49,52 @@ public:
 };
 
 
 };
 
 

-class MyFrame : public wxFrame
+class MyCanvas : public wxScrolledWindow

 {
 public:
 {
 public:

-    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+    MyCanvas( wxFrame *parent );

 
 

-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
+    void UseBuffer(bool useBuffer) { m_useBuffer = useBuffer; Refresh(); }
+    void EraseBg(bool eraseBg) { m_eraseBg = eraseBg; Refresh(); }

 
 private:
 
 private:

-    DECLARE_EVENT_TABLE()
-};
-
-
-class MyCanvas : public wxScrolledWindow
-{
-public:
-    MyCanvas( MyFrame *parent );
-

     void OnPaint( wxPaintEvent &event );
     void OnChar( wxKeyEvent &event );
     void OnEraseBackground( wxEraseEvent &event );
 
     void OnPaint( wxPaintEvent &event );
     void OnChar( wxKeyEvent &event );
     void OnEraseBackground( wxEraseEvent &event );
 

+    void DoPaint(wxDC& dc);
+
+

     wxBitmap    m_bitmap;
     wxString    m_text;
 
     wxBitmap    m_bitmap;
     wxString    m_text;
 

+    // use wxMemoryDC in OnPaint()?
+    bool m_useBuffer;
+
+    // paint custom background in OnEraseBackground()?
+    bool m_eraseBg;
+
+
+    DECLARE_EVENT_TABLE()
+};
+
+class MyFrame : public wxFrame
+{
+public:
+    MyFrame();
+
+    void OnUseBuffer(wxCommandEvent& event);
+    void OnEraseBg(wxCommandEvent& event);
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+

 private:
 private:

+    MyCanvas *m_canvas;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -90,7 +102,10 @@ private:
 enum
 {
     // menu items
 enum
 {
     // menu items

-    ID_MENU_QUIT = 1,
+    Erase_Menu_UseBuffer = 100,
+    Erase_Menu_EraseBg,
+    Erase_Menu_Exit = wxID_EXIT,
+    Erase_Menu_About = wxID_ABOUT

 };
 
 
 };
 
 


@@ -102,8 +117,10 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

-    MyFrame *frame = new MyFrame(_T("Erase sample"),
-                                 wxPoint(50, 50), wxSize(450, 340));
+    if ( !wxApp::OnInit() )
+        return false;
+
+    MyFrame *frame = new MyFrame;

 
     frame->Show(true);
 
 
     frame->Show(true);
 


@@ -115,22 +132,28 @@ bool MyApp::OnInit()
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_MENU(ID_MENU_QUIT,  MyFrame::OnQuit)
-    EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
+    EVT_MENU(Erase_Menu_UseBuffer,  MyFrame::OnUseBuffer)
+    EVT_MENU(Erase_Menu_EraseBg,  MyFrame::OnEraseBg)
+    EVT_MENU(Erase_Menu_Exit,  MyFrame::OnQuit)
+    EVT_MENU(Erase_Menu_About, MyFrame::OnAbout)

 END_EVENT_TABLE()
 
 // frame constructor
 END_EVENT_TABLE()
 
 // frame constructor

-MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-       : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
+MyFrame::MyFrame()
+       : wxFrame(NULL, wxID_ANY, _T("Erase sample"),
+                 wxPoint(50, 50), wxSize(450, 340))

 {
     SetIcon(wxICON(mondrian));
 
     wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);
 {
     SetIcon(wxICON(mondrian));
 
     wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);

+    menuFile->AppendCheckItem(Erase_Menu_UseBuffer, _T("&Use memory DC\tCtrl-M"));
+    menuFile->AppendCheckItem(Erase_Menu_EraseBg, _T("Custom &background\tCtrl-B"));
+    menuFile->AppendSeparator();
+    menuFile->Append(Erase_Menu_Exit, _T("E&xit\tAlt-X"), _T("Quit this program"));

 
 

-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(wxID_ABOUT, _T("&About...\tCtrl-A"), _T("Show about dialog"));

 
 

-    menuFile->Append(ID_MENU_QUIT, _T("E&xit\tAlt-X"), _T("Quit this program"));
+    wxMenu *helpMenu = new wxMenu;
+    helpMenu->Append(Erase_Menu_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));

 
     wxMenuBar *menuBar = new wxMenuBar();
     menuBar->Append(menuFile, _T("&File"));
 
     wxMenuBar *menuBar = new wxMenuBar();
     menuBar->Append(menuFile, _T("&File"));


@@ -144,9 +167,19 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetStatusText(_T("Welcome to wxWidgets erase sample!"));
 #endif // wxUSE_STATUSBAR
 
     SetStatusText(_T("Welcome to wxWidgets erase sample!"));
 #endif // wxUSE_STATUSBAR
 

-    (void)new MyCanvas( this );
+    m_canvas = new MyCanvas( this );
+}
+
+
+void MyFrame::OnUseBuffer(wxCommandEvent& event)
+{
+    m_canvas->UseBuffer(event.IsChecked());

 }
 
 }
 

+void MyFrame::OnEraseBg(wxCommandEvent& event)
+{
+    m_canvas->EraseBg(event.IsChecked());
+}

 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {


@@ -166,17 +199,20 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_ERASE_BACKGROUND(  MyCanvas::OnEraseBackground)
 END_EVENT_TABLE()
 
     EVT_ERASE_BACKGROUND(  MyCanvas::OnEraseBackground)
 END_EVENT_TABLE()
 

-MyCanvas::MyCanvas( MyFrame *parent )
+MyCanvas::MyCanvas( wxFrame *parent )

         : wxScrolledWindow( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
         : wxScrolledWindow( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,

-                            wxScrolledWindowStyle |
-                            wxNO_FULL_REPAINT_ON_RESIZE|
-                            wxSUNKEN_BORDER )
+                            wxScrolledWindowStyle | wxSUNKEN_BORDER )

 {
 {

+    m_eraseBg =
+    m_useBuffer = false;
+

     SetScrollbars( 10, 10, 40, 100, 0, 0 );
 
     m_bitmap = wxBitmap( wxICON(mondrian) );
 
     new wxStaticBitmap( this, wxID_ANY, m_bitmap, wxPoint(80,20) );
     SetScrollbars( 10, 10, 40, 100, 0, 0 );
 
     m_bitmap = wxBitmap( wxICON(mondrian) );
 
     new wxStaticBitmap( this, wxID_ANY, m_bitmap, wxPoint(80,20) );

+
+    SetFocusIgnoringChildren();

 }
 
 void MyCanvas::OnChar( wxKeyEvent &event )
 }
 
 void MyCanvas::OnChar( wxKeyEvent &event )


@@ -198,24 +234,20 @@ void MyCanvas::OnChar( wxKeyEvent &event )
         case WXK_RIGHT: m_text += wxT( "<RIGHT>" ); break;
         case WXK_DOWN: m_text += wxT( "<DOWN>" ); break;
         case WXK_RETURN: m_text += wxT( "<ENTER>" ); 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;
+        default: m_text += (wxChar)event.m_keyCode; break;

     }
     }

-    

 }
 
 }
 

-void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
+void MyCanvas::DoPaint(wxDC& dc)

 {
 {

-    wxPaintDC dc(this);
-    PrepareDC( dc );
-

     dc.SetBrush( *wxBLACK_BRUSH );
     dc.SetBrush( *wxBLACK_BRUSH );

-    dc.DrawRectangle( 0,0,200,50 );
+    dc.DrawRectangle( 10,10,200,50 );

 
     dc.DrawBitmap( m_bitmap, 10, 20, true );
 
     dc.SetTextForeground(*wxBLUE);
     dc.DrawText(_T("This text is drawn from OnPaint"), 65, 65);
 
     dc.DrawBitmap( m_bitmap, 10, 20, true );
 
     dc.SetTextForeground(*wxBLUE);
     dc.DrawText(_T("This text is drawn from OnPaint"), 65, 65);

-    
+

     wxString tmp;
     tmp.Printf( _T("Hit any key to display more text: %s"), m_text.c_str() );
     int w,h;
     wxString tmp;
     tmp.Printf( _T("Hit any key to display more text: %s"), m_text.c_str() );
     int w,h;


@@ -271,26 +303,58 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 #endif // 0
 }
 
 #endif // 0
 }
 

+void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
+{
+    wxPaintDC dcWin(this);
+    PrepareDC( dcWin );
+
+    if ( m_useBuffer )
+    {
+        const wxSize size = GetClientSize();
+        wxMemoryDC dc;
+        wxBitmap bmp(size.x, size.y);
+        dc.SelectObject(bmp);
+        dc.Blit(0, 0, size.x, size.y, &dcWin, 0, 0);
+        dc.DrawText(_T("(copy of background)"), 5, 120 );
+
+        DoPaint(dc);
+
+        dcWin.Blit(0, 0, size.x, size.y, &dc, 0, 0);
+    }
+    else
+    {
+        DoPaint(dcWin);
+    }
+}
+

 void MyCanvas::OnEraseBackground( wxEraseEvent& event )
 {
 void MyCanvas::OnEraseBackground( wxEraseEvent& event )
 {

+    if ( !m_eraseBg )
+    {
+        event.Skip();
+        return;
+    }
+

     wxDC& dc = *event.GetDC();
     dc.SetPen(*wxGREEN_PEN);
 
     wxDC& dc = *event.GetDC();
     dc.SetPen(*wxGREEN_PEN);
 

-    // this line is needed, otherwise the junk is left on win the background
+    PrepareDC( dc );
+
+    // clear any junk currently displayed

     dc.Clear();
 
     dc.Clear();
 

-    wxSize size = GetClientSize();
-    for ( int x = 0; x < size.x; x+= 10 )
+    const wxSize size = GetClientSize();
+    for ( int x = 0; x < size.x; x += 15 )

     {
         dc.DrawLine(x, 0, x, size.y);
     }
 
     {
         dc.DrawLine(x, 0, x, size.y);
     }
 

-    for ( int y = 0; y < size.y; y+= 10 )
+    for ( int y = 0; y < size.y; y += 15 )

     {
         dc.DrawLine(0, y, size.x, y);
     }
 
     dc.SetTextForeground(*wxRED);
     {
         dc.DrawLine(0, y, size.x, y);
     }
 
     dc.SetTextForeground(*wxRED);

-    dc.DrawText(_T("This text is drawn from OnEraseBackground"), 60, 60);
+    dc.DrawText(_T("This text is drawn from OnEraseBackground"), 60, 160);

 }
 
 }