added workaround for GTK+ focus_out bug (and removed Vaclav's mouse capture stack...

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

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 55d27665ecc77bd72c664e204a42fdc2ffbbdaec..59e20e6ca9e09acd0f67f3392771a17ac1b7e78c 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -18,8 +18,8 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "minimal.cpp"
-    #pragma interface "minimal.cpp"
+//    #pragma implementation "minimal.cpp"
+//    #pragma interface "minimal.cpp"

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


@@ -35,6 +35,10 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+#include "wx/dynarray.h"
+
+WX_DEFINE_ARRAY(wxWindow *, wxArrayLboxes);
+

 // ----------------------------------------------------------------------------
 // resources
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // resources
 // ----------------------------------------------------------------------------


@@ -70,8 +74,13 @@ public:
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+    void OnCreateLbox(wxCommandEvent& event);
+    void OnDeleteLbox(wxCommandEvent& event);

 
 private:
 
 private:

+    wxArrayLboxes m_lboxes;
+    wxCoord m_pos;
+

     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
 };
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
 };


@@ -85,9 +94,14 @@ enum
 {
     // menu items
     Minimal_Quit = 1,
 {
     // menu items
     Minimal_Quit = 1,

-    Minimal_About
+    Minimal_About,
+    Minimal_CreateLbox,
+    Minimal_DeleteLbox,

 };
 
 };
 

+static const size_t NUM_LBOXES = 10;
+static const wxCoord POS_STEP = 5;
+

 // ----------------------------------------------------------------------------
 // event tables and other macros for wxWindows
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event tables and other macros for wxWindows
 // ----------------------------------------------------------------------------


@@ -98,6 +112,8 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)

+    EVT_MENU(Minimal_CreateLbox, MyFrame::OnCreateLbox)
+    EVT_MENU(Minimal_DeleteLbox, MyFrame::OnDeleteLbox)

 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create


@@ -140,6 +156,8 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size)
 {
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size)
 {

+    m_pos = 0;
+

 #ifdef __WXMAC__
     // we need this in order to allow the about menu relocation, since ABOUT is
     // not the default id of the about menu
 #ifdef __WXMAC__
     // we need this in order to allow the about menu relocation, since ABOUT is
     // not the default id of the about menu


@@ -149,12 +167,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // set the frame icon
     SetIcon(wxICON(mondrian));
 
     // set the frame icon
     SetIcon(wxICON(mondrian));
 

+#if wxUSE_MENUS

     // create a menu bar
     wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
     // create a menu bar
     wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");

+    helpMenu->Append(Minimal_CreateLbox, "&Create 10 listboxes\tCtrl-C");
+    helpMenu->Append(Minimal_DeleteLbox, "&Delete 10 listboxes\tCtrl-D");

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


@@ -165,6 +186,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);

+#endif // wxUSE_MENUS

 
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
 
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)


@@ -190,3 +212,28 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
     wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
 }
 
     wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
 }

+
+void MyFrame::OnCreateLbox(wxCommandEvent& WXUNUSED(event))
+{
+    for ( size_t n = 0; n < NUM_LBOXES; n++ )
+    {
+        m_lboxes.Add(new wxListBox(this, -1, wxPoint(m_pos, m_pos)));
+        m_pos += POS_STEP;
+    }
+}
+
+void MyFrame::OnDeleteLbox(wxCommandEvent& WXUNUSED(event))
+{
+    size_t count = m_lboxes.GetCount();
+    if ( count < NUM_LBOXES )
+        return;
+
+    for ( size_t n = 0; n < NUM_LBOXES; n++ )
+    {
+        delete m_lboxes[--count];
+        m_lboxes.RemoveAt(count);
+
+        m_pos -= POS_STEP;
+    }
+}
+