forgot to reset m_iconAdded

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

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 16a3b1913dce7aea17d52f6bcaae493a5d60f629..2949b68133ceb9a83bb92104b52cb2affa42a4e8 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -55,7 +55,9 @@
     #define USE_LOG_WINDOW 0
 #endif
 
     #define USE_LOG_WINDOW 0
 #endif
 

+#if wxUSE_OWNER_DRAWN

 #include "copy.xpm"
 #include "copy.xpm"

+#endif

 
 // ----------------------------------------------------------------------------
 // classes
 
 // ----------------------------------------------------------------------------
 // classes


@@ -347,7 +349,7 @@ bool MyApp::OnInit()
     frame->Show(true);
 
 #if wxUSE_STATUSBAR
     frame->Show(true);
 
 #if wxUSE_STATUSBAR

-    frame->SetStatusText(_T("Welcome to wxWindows menu sample"));
+    frame->SetStatusText(_T("Welcome to wxWidgets menu sample"));

 #endif // wxUSE_STATUSBAR
 
     SetTopWindow(frame);
 #endif // wxUSE_STATUSBAR
 
     SetTopWindow(frame);


@@ -361,7 +363,7 @@ bool MyApp::OnInit()
 
 // Define my frame constructor
 MyFrame::MyFrame()
 
 // Define my frame constructor
 MyFrame::MyFrame()

-       : wxFrame((wxFrame *)NULL, wxID_ANY, _T("wxWindows menu sample"))
+       : wxFrame((wxFrame *)NULL, wxID_ANY, _T("wxWidgets menu sample"))

 {
 #if USE_LOG_WINDOW
     m_textctrl = NULL;
 {
 #if USE_LOG_WINDOW
     m_textctrl = NULL;


@@ -511,7 +513,7 @@ wxMenu *MyFrame::CreateDummyMenu(wxString *title)
     wxMenu *menu = new wxMenu;
     menu->Append(Menu_Dummy_First, _T("&First item\tCtrl-F1"));
     menu->AppendSeparator();
     wxMenu *menu = new wxMenu;
     menu->Append(Menu_Dummy_First, _T("&First item\tCtrl-F1"));
     menu->AppendSeparator();

-    menu->Append(Menu_Dummy_Second, _T("&Second item\tCtrl-F2"), _T(""), true);
+    menu->AppendCheckItem(Menu_Dummy_Second, _T("&Second item\tCtrl-F2"));

 
     if ( title )
     {
 
     if ( title )
     {


@@ -573,8 +575,8 @@ void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    (void)wxMessageBox(_T("wxWindows menu sample\n© 1999-2001 Vadim Zeitlin"),
-                       _T("About wxWindows menu sample"),
+    (void)wxMessageBox(_T("wxWidgets menu sample\n(c) 1999-2001 Vadim Zeitlin"),
+                       _T("About wxWidgets menu sample"),

                        wxICON_INFORMATION);
 }
 
                        wxICON_INFORMATION);
 }
 


@@ -927,7 +929,7 @@ void MyFrame::ShowContextMenu(const wxPoint& pos)
     menu.Append(Menu_Help_About, _T("&About"));
     menu.Append(Menu_Popup_Submenu, _T("&Submenu"), CreateDummyMenu(NULL));
     menu.Append(Menu_Popup_ToBeDeleted, _T("To be &deleted"));
     menu.Append(Menu_Help_About, _T("&About"));
     menu.Append(Menu_Popup_Submenu, _T("&Submenu"), CreateDummyMenu(NULL));
     menu.Append(Menu_Popup_ToBeDeleted, _T("To be &deleted"));

-    menu.Append(Menu_Popup_ToBeChecked, _T("To be &checked"), _T(""), true);
+    menu.AppendCheckItem(Menu_Popup_ToBeChecked, _T("To be &checked"));

     menu.Append(Menu_Popup_ToBeGreyed, _T("To be &greyed"),
                 _T("This menu item should be initially greyed out"));
     menu.AppendSeparator();
     menu.Append(Menu_Popup_ToBeGreyed, _T("To be &greyed"),
                 _T("This menu item should be initially greyed out"));
     menu.AppendSeparator();