The UIProgressView is somehow not doing layout :(.

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

diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index 7b4bbe9cb61dd1b986c2d78528755b429ad248a8..7a11cd84fff89ab069a54c1e6add3f081d45a9d7 100644 (file)
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by: Marcin Wojdyr
 // Created:     07.04.02
 // Author:      Vadim Zeitlin
 // Modified by: Marcin Wojdyr
 // Created:     07.04.02

-// RCS-ID:      $Id$

 // Copyright:   (c) 2002 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2002 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -22,6 +21,24 @@
     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

+// IDs for menu items
+enum
+{
+    QuitID = wxID_EXIT,
+    ClearID = wxID_CLEAR,
+    SkipHook = 100,
+    SkipDown,
+
+    // These IDs must be in the same order as MyFrame::InputKind enum elements.
+    IDInputCustom,
+    IDInputEntry,
+    IDInputText,
+
+    TestAccelA,
+    TestAccelCtrlA,
+    TestAccelEsc
+};
+

 // Define a new frame type: this is going to be our main frame
 class MyFrame : public wxFrame
 {
 // Define a new frame type: this is going to be our main frame
 class MyFrame : public wxFrame
 {


@@ -33,7 +50,7 @@ private:
     void OnQuit(wxCommandEvent& WXUNUSED(event)) { Close(true); }
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& WXUNUSED(event)) { Close(true); }
     void OnAbout(wxCommandEvent& event);
 

-    void OnUseTextCtrl(wxCommandEvent& event);
+    void OnInputWindowKind(wxCommandEvent& event);

 
     void OnTestAccelA(wxCommandEvent& WXUNUSED(event))
         { m_logText->AppendText("Test accelerator \"A\" used.\n"); }
 
     void OnTestAccelA(wxCommandEvent& WXUNUSED(event))
         { m_logText->AppendText("Test accelerator \"A\" used.\n"); }


@@ -75,8 +92,15 @@ private:
 
     void LogEvent(const wxString& name, wxKeyEvent& event);
 
 
     void LogEvent(const wxString& name, wxKeyEvent& event);
 

-    // Set m_inputWin to either a new wxWindow or new wxTextCtrl.
-    void DoCreateInputWindow(bool text);
+    // Set m_inputWin to either a new window of the given kind:
+    enum InputKind
+    {
+        Input_Custom,   // Just a plain wxWindow
+        Input_Entry,    // Single-line wxTextCtrl
+        Input_Text      // Multi-line wxTextCtrl
+    };
+
+    void DoCreateInputWindow(InputKind inputKind);

 
     wxTextCtrl *m_logText;
     wxWindow *m_inputWin;
 
     wxTextCtrl *m_logText;
     wxWindow *m_inputWin;


@@ -121,19 +145,6 @@ MyFrame::MyFrame(const wxString& title)
 {
     SetIcon(wxICON(sample));
 
 {
     SetIcon(wxICON(sample));
 

-    // IDs for menu items
-    enum
-    {
-        QuitID = wxID_EXIT,
-        ClearID = wxID_CLEAR,
-        SkipHook = 100,
-        SkipDown,
-        UseTextCtrl,
-        TestAccelA,
-        TestAccelCtrlA,
-        TestAccelEsc
-    };
-

     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 


@@ -155,8 +166,14 @@ MyFrame::MyFrame(const wxString& title)
     menuFile->Check(SkipDown, true);
     menuFile->AppendSeparator();
 
     menuFile->Check(SkipDown, true);
     menuFile->AppendSeparator();
 

-    menuFile->AppendCheckItem(UseTextCtrl, "Use &text control\tCtrl-T",
-        "Use wxTextCtrl or a simple wxWindow for input window"
+    menuFile->AppendRadioItem(IDInputCustom, "Use &custom control\tCtrl-C",
+        "Use custom wxWindow for input window"
+    );
+    menuFile->AppendRadioItem(IDInputEntry, "Use text &entry\tCtrl-E",
+        "Use single-line wxTextCtrl for input window"
+    );
+    menuFile->AppendRadioItem(IDInputText, "Use &text control\tCtrl-T",
+        "Use multi-line wxTextCtrl for input window"

     );
     menuFile->AppendSeparator();
 
     );
     menuFile->AppendSeparator();
 


@@ -174,7 +191,7 @@ MyFrame::MyFrame(const wxString& title)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

-    DoCreateInputWindow(false /* simple window initially */);
+    DoCreateInputWindow(Input_Custom);

 
     wxTextCtrl *headerText = new wxTextCtrl(this, wxID_ANY, "",
                                             wxDefaultPosition, wxDefaultSize,
 
     wxTextCtrl *headerText = new wxTextCtrl(this, wxID_ANY, "",
                                             wxDefaultPosition, wxDefaultSize,


@@ -207,30 +224,30 @@ MyFrame::MyFrame(const wxString& title)
 
     // connect menu event handlers
 
 
     // connect menu event handlers
 

-    Connect(QuitID, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(QuitID, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnQuit));
 
             wxCommandEventHandler(MyFrame::OnQuit));
 

-    Connect(wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(wxID_ABOUT, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnAbout));
 
             wxCommandEventHandler(MyFrame::OnAbout));
 

-    Connect(ClearID, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(ClearID, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnClear));
 
             wxCommandEventHandler(MyFrame::OnClear));
 

-    Connect(SkipHook, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(SkipHook, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnSkipHook));
             wxCommandEventHandler(MyFrame::OnSkipHook));

-    Connect(SkipDown, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(SkipDown, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnSkipDown));
 
             wxCommandEventHandler(MyFrame::OnSkipDown));
 

-    Connect(UseTextCtrl, wxEVT_COMMAND_MENU_SELECTED,
-            wxCommandEventHandler(MyFrame::OnUseTextCtrl));
+    Connect(IDInputCustom, IDInputText, wxEVT_MENU,
+            wxCommandEventHandler(MyFrame::OnInputWindowKind));

 
 

-    Connect(TestAccelA, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(TestAccelA, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnTestAccelA));
 
             wxCommandEventHandler(MyFrame::OnTestAccelA));
 

-    Connect(TestAccelCtrlA, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(TestAccelCtrlA, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnTestAccelCtrlA));
 
             wxCommandEventHandler(MyFrame::OnTestAccelCtrlA));
 

-    Connect(TestAccelEsc, wxEVT_COMMAND_MENU_SELECTED,
+    Connect(TestAccelEsc, wxEVT_MENU,

             wxCommandEventHandler(MyFrame::OnTestAccelEsc));
 
     // notice that we don't connect OnCharHook() to the input window, unlike
             wxCommandEventHandler(MyFrame::OnTestAccelEsc));
 
     // notice that we don't connect OnCharHook() to the input window, unlike


@@ -256,16 +273,29 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
                  wxOK | wxICON_INFORMATION, this);
 }
 
                  wxOK | wxICON_INFORMATION, this);
 }
 

-void MyFrame::DoCreateInputWindow(bool text)
+void MyFrame::DoCreateInputWindow(InputKind inputKind)

 {
     wxWindow* const oldWin = m_inputWin;
 
 {
     wxWindow* const oldWin = m_inputWin;
 

-    m_inputWin = text ? new wxTextCtrl(this, wxID_ANY, "Press keys here",
-                                       wxDefaultPosition, wxSize(-1, 50),
-                                       wxTE_MULTILINE)
-                      : new wxWindow(this, wxID_ANY,
-                                     wxDefaultPosition, wxSize(-1, 50),
-                                     wxRAISED_BORDER);
+    switch ( inputKind )
+    {
+        case Input_Custom:
+            m_inputWin = new wxWindow(this, wxID_ANY,
+                                      wxDefaultPosition, wxSize(-1, 50),
+                                      wxRAISED_BORDER);
+            break;
+
+        case Input_Entry:
+            m_inputWin = new wxTextCtrl(this, wxID_ANY, "Press keys here");
+            break;
+
+        case Input_Text:
+            m_inputWin = new wxTextCtrl(this, wxID_ANY, "Press keys here",
+                                        wxDefaultPosition, wxSize(-1, 50),
+                                        wxTE_MULTILINE);
+            break;
+    }
+

     m_inputWin->SetBackgroundColour(*wxBLUE);
     m_inputWin->SetForegroundColour(*wxWHITE);
 
     m_inputWin->SetBackgroundColour(*wxBLUE);
     m_inputWin->SetForegroundColour(*wxWHITE);
 


@@ -277,7 +307,7 @@ void MyFrame::DoCreateInputWindow(bool text)
     m_inputWin->Connect(wxEVT_CHAR, wxKeyEventHandler(MyFrame::OnChar),
                         NULL, this);
 
     m_inputWin->Connect(wxEVT_CHAR, wxKeyEventHandler(MyFrame::OnChar),
                         NULL, this);
 

-    if ( !text )
+    if ( inputKind == Input_Custom )

     {
         m_inputWin->Connect(wxEVT_PAINT,
                             wxPaintEventHandler(MyFrame::OnPaintInputWin),
     {
         m_inputWin->Connect(wxEVT_PAINT,
                             wxPaintEventHandler(MyFrame::OnPaintInputWin),


@@ -292,9 +322,11 @@ void MyFrame::DoCreateInputWindow(bool text)
     }
 }
 
     }
 }
 

-void MyFrame::OnUseTextCtrl(wxCommandEvent& event)
+void MyFrame::OnInputWindowKind(wxCommandEvent& event)

 {
 {

-    DoCreateInputWindow(event.IsChecked());
+    DoCreateInputWindow(
+        static_cast<InputKind>(event.GetId() - IDInputCustom)
+    );

 }
 
 void MyFrame::OnPaintInputWin(wxPaintEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnPaintInputWin(wxPaintEvent& WXUNUSED(event))