X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b2edbedb47a54bea26df1bede371bf761e3a233..1d61ebaca18624cadf455a8859c1d089db5e6a23:/samples/minimal/minimal.cpp

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 82e36b96d9..93536a6b4d 100644
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -69,7 +69,6 @@ public:
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
-    void OnTest(wxCommandEvent& event);
 
     void OnPaint(wxPaintEvent& event);
 
@@ -88,10 +87,6 @@ enum
     // menu items
     Minimal_Quit = 1,
     Minimal_About,
-    Minimal_Test,
-
-    // controls start here (the numbers are, of course, arbitrary)
-    Minimal_Text = 1000,
 };
 
 // ----------------------------------------------------------------------------
@@ -104,10 +99,6 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
-
-    EVT_BUTTON(-1, MyFrame::OnTest)
-
-    EVT_PAINT(MyFrame::OnPaint)
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create
@@ -155,8 +146,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetIcon(wxICON(mondrian));
 
     // create a menu bar
-//    wxMenu *menuFile = new wxMenu;
-    wxMenu *menuFile = new wxMenu(wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
 
     menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
     menuFile->AppendSeparator();
@@ -202,27 +192,3 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
 }
 
-void MyFrame::OnTest(wxCommandEvent& event)
-{
-}
-
-void MyFrame::OnPaint(wxPaintEvent& event)
-{
-    wxPaintDC dc(this);
-
-    wxMemoryDC dcMem;
-    wxSize size(GetClientSize());
-    dcMem.SelectObject(wxBitmap(size.x, size.y, -1));
-
-    dcMem.SetBackground(wxBrush(wxColour(0, 0, 255), wxSOLID));
-    dcMem.SetTextForeground(wxColour(0, 255, 0));
-    dcMem.SetTextBackground(wxColour(0, 0, 0));
-    dcMem.SetBackgroundMode(wxSOLID);
-    dcMem.Clear();
-    dcMem.DrawText("Hello, wxWindows!", 10, 10);
-
-    wxPoint ptOrig(0, 0);
-    dc.Blit(ptOrig, size, &dcMem, ptOrig);
-
-    dcMem.SelectObject(wxNullBitmap);
-}