X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ecffbff714ff707ded9266bf27c3347946cbcd9..c3d434725bd76bc0306b9751e722ed70bd776876:/samples/minimal/minimal.cpp

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 87122a4e3a..4dcb4bf9df 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_MENU(Minimal_Test, MyFrame::OnTest)
-
-    EVT_PAINT(MyFrame::OnPaint)
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create
@@ -158,7 +149,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
 
     menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
-    menuFile->Append(Minimal_Test, "&Test...\tCtrl-T", "Test");
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program");
 
@@ -169,6 +159,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
+    (void)new wxTextCtrl(this, -1, "Hi!", wxPoint(20, 20),
+                         wxSize(100, 30));
+
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
@@ -202,71 +195,3 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
 }
 
-struct Foo
-{
-    Foo(int n_) { n = n_; }
-
-    int n;
-};
-
-WX_DECLARE_LIST(Foo, FooList);
-
-#include <wx/listimpl.cpp>
-
-WX_DEFINE_LIST(FooList);
-
-int FooSort(const Foo **item1, const Foo **item2)
-{
-    return (*item2)->n - (*item1)->n;
-}
-
-void ShowList(const FooList& list)
-{
-    wxString msg, str;
-    msg = "The list elements: (";
-    for ( FooList::Node *node = list.GetFirst(); node; node = node->GetNext() )
-    {
-        if ( !!str )
-            msg += ", ";
-        str.Printf("%d", node->GetData()->n);
-        msg += str;
-    }
-
-    msg += ')';
-
-    wxMessageBox(msg, "List contents", wxOK | wxICON_INFORMATION);
-}
-
-void MyFrame::OnTest(wxCommandEvent& event)
-{
-    FooList list;
-    list.Append(new Foo(12));
-    list.Append(new Foo(3));
-    list.Append(new Foo(1));
-    list.Append(new Foo(7));
-    list.Append(new Foo(4));
-    ShowList(list);
-    list.Sort(FooSort);
-    ShowList(list);
-}
-
-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);
-}