Some work on GTK focus handling and events.

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

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 29da4ca89fa233705cb0d48bcad27fb1b96ddc3e..b60d0c74c9ccb909aff0be25f56108bdcc7fc1cc 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -18,19 +18,20 @@
 // ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
 // ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP

-    #include <wx/app.h>
-    #include <wx/frame.h>
-    #include <wx/menu.h>
-    #include <wx/msgdlg.h>
-    #include <wx/log.h>
-    #include <wx/textctrl.h>
+    #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/menu.h"
+    #include "wx/msgdlg.h"
+    #include "wx/log.h"
+    #include "wx/textctrl.h"
+    #include "wx/textdlg.h"

 #endif
 
 #if !wxUSE_MENUS
 #endif
 
 #if !wxUSE_MENUS


@@ -251,8 +252,9 @@ bool MyApp::OnInit()
 // Define my frame constructor
 MyFrame::MyFrame()
        : wxFrame((wxFrame *)NULL, -1, "wxWindows menu sample",
 // Define my frame constructor
 MyFrame::MyFrame()
        : wxFrame((wxFrame *)NULL, -1, "wxWindows menu sample",

-                 wxDefaultPosition, wxSize(300, 200))
+                 wxDefaultPosition, wxSize(400, 250))

 {
 {

+    m_textctrl = NULL;

     m_menu = NULL;
     m_countDummy = 0;
     m_logOld = NULL;
     m_menu = NULL;
     m_countDummy = 0;
     m_logOld = NULL;


@@ -339,12 +341,14 @@ MyFrame::MyFrame()
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE);
     m_textctrl->SetEditable(FALSE);
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE);
     m_textctrl->SetEditable(FALSE);

+
+    wxLog::SetTimestamp(NULL);

     m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl));
 
     m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl));
 

-    wxLogMessage(_T("Brief explanations: the commands or the \"Menu\" menu\n")
+    wxLogMessage(_T("Brief explanations: the commands or the \"Menu\" menu ")

                  _T("append/insert/delete items to/from the last menu.\n")
                  _T("append/insert/delete items to/from the last menu.\n")

-                 _T("The commands from \"Menubar\" menu work with the\n")
-                 _T("menubar itself.\n")
+                 _T("The commands from \"Menubar\" menu work with the ")
+                 _T("menubar itself.\n\n")

                  _T("Right click the band below to test popup menus.\n"));
 }
 
                  _T("Right click the band below to test popup menus.\n"));
 }
 


@@ -488,6 +492,8 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event))
     wxMenuBar *mbar = GetMenuBar();
     size_t count = mbar->GetMenuCount();
 
     wxMenuBar *mbar = GetMenuBar();
     size_t count = mbar->GetMenuCount();
 

+    wxCHECK_RET( count, _T("no last menu?") );
+

     wxLogMessage(wxT("The label of the last menu item is '%s'"),
                  mbar->GetLabelTop(count - 1).c_str());
 }
     wxLogMessage(wxT("The label of the last menu item is '%s'"),
                  mbar->GetLabelTop(count - 1).c_str());
 }


@@ -497,7 +503,20 @@ void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
     wxMenuBar *mbar = GetMenuBar();
     size_t count = mbar->GetMenuCount();
 
     wxMenuBar *mbar = GetMenuBar();
     size_t count = mbar->GetMenuCount();
 

-    mbar->SetLabelTop(count - 1, "Dummy label &0");
+    wxCHECK_RET( count, _T("no last menu?") );
+
+    wxString label = wxGetTextFromUser
+                     (
+                        _T("Enter new label: "),
+                        _T("Change last menu text"),
+                        mbar->GetLabelTop(count - 1),
+                        this
+                     );
+
+    if ( !label.empty() )
+    {
+        mbar->SetLabelTop(count - 1, label);
+    }

 }
 
 void MyFrame::OnDummy(wxCommandEvent& event)
 }
 
 void MyFrame::OnDummy(wxCommandEvent& event)


@@ -594,7 +613,18 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
 
     if ( item )
     {
 
     if ( item )
     {

-        item->SetText("Dummy menu item text");
+        wxString label = wxGetTextFromUser
+                         (
+                            _T("Enter new label: "),
+                            _T("Change last menu item text"),
+                            item->GetLabel(),
+                            this
+                         );
+
+        if ( !label.empty() )
+        {
+            item->SetText(label);
+        }

     }
 }
 
     }
 }
 


@@ -701,6 +731,9 @@ void MyFrame::OnRightUp(wxMouseEvent &event)
 
 void MyFrame::OnSize(wxSizeEvent& event)
 {
 
 void MyFrame::OnSize(wxSizeEvent& event)
 {

+    if ( !m_textctrl )
+        return;
+

     // leave a band below for popup menu testing
     wxSize size = GetClientSize();
     m_textctrl->SetSize(0, 0, size.x, (3*size.y)/4);
     // leave a band below for popup menu testing
     wxSize size = GetClientSize();
     m_textctrl->SetSize(0, 0, size.x, (3*size.y)/4);