use bitmap mask if any in splash screen (closes #10470)

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

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index fcc754ac748ee6cc1c7485a9de5e82e75da2a436..9003f351d84907874e778369a619e6e411e6a804 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -59,6 +59,10 @@
 #include "copy.xpm"
 #endif
 
 #include "copy.xpm"
 #endif
 

+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
+

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


@@ -84,7 +88,8 @@ protected:
     void OnQuit(wxCommandEvent& event);
 #if USE_LOG_WINDOW
     void OnClearLog(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
 #if USE_LOG_WINDOW
     void OnClearLog(wxCommandEvent& event);

-#endif
+    void OnClearLogUpdateUI(wxUpdateUIEvent& event);
+#endif // USE_LOG_WINDOW

 
     void OnAbout(wxCommandEvent& event);
 
 
     void OnAbout(wxCommandEvent& event);
 


@@ -200,7 +205,7 @@ enum
 {
     Menu_File_Quit = wxID_EXIT,
 #if USE_LOG_WINDOW
 {
     Menu_File_Quit = wxID_EXIT,
 #if USE_LOG_WINDOW

-    Menu_File_ClearLog,
+    Menu_File_ClearLog = 100,

 #endif
 
     Menu_MenuBar_Toggle = 200,
 #endif
 
     Menu_MenuBar_Toggle = 200,


@@ -255,6 +260,8 @@ enum
     Menu_Popup_ToBeChecked,
     Menu_Popup_Submenu,
 
     Menu_Popup_ToBeChecked,
     Menu_Popup_Submenu,
 

+    Menu_PopupChoice,
+

     Menu_Max
 };
 
     Menu_Max
 };
 


@@ -266,6 +273,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Menu_File_Quit,     MyFrame::OnQuit)
 #if USE_LOG_WINDOW
     EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog)
     EVT_MENU(Menu_File_Quit,     MyFrame::OnQuit)
 #if USE_LOG_WINDOW
     EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog)

+    EVT_UPDATE_UI(Menu_File_ClearLog, MyFrame::OnClearLogUpdateUI)

 #endif
 
     EVT_MENU(Menu_Help_About, MyFrame::OnAbout)
 #endif
 
     EVT_MENU(Menu_Help_About, MyFrame::OnAbout)


@@ -342,6 +350,9 @@ IMPLEMENT_APP(MyApp)
 // main frame
 bool MyApp::OnInit()
 {
 // main frame
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // Create the main frame window
     MyFrame* frame = new MyFrame;
 
     // Create the main frame window
     MyFrame* frame = new MyFrame;
 


@@ -364,6 +375,8 @@ bool MyApp::OnInit()
 MyFrame::MyFrame()
        : wxFrame((wxFrame *)NULL, wxID_ANY, _T("wxWidgets menu sample"))
 {
 MyFrame::MyFrame()
        : wxFrame((wxFrame *)NULL, wxID_ANY, _T("wxWidgets menu sample"))
 {

+    SetIcon(wxICON(sample));
+

 #if USE_LOG_WINDOW
     m_textctrl = NULL;
 #endif
 #if USE_LOG_WINDOW
     m_textctrl = NULL;
 #endif


@@ -381,49 +394,67 @@ MyFrame::MyFrame()
     wxMenu *stockSubMenu = new wxMenu;
     stockSubMenu->Append(wxID_ADD);
     stockSubMenu->Append(wxID_APPLY);
     wxMenu *stockSubMenu = new wxMenu;
     stockSubMenu->Append(wxID_ADD);
     stockSubMenu->Append(wxID_APPLY);

+    stockSubMenu->Append(wxID_BACKWARD);

     stockSubMenu->Append(wxID_BOLD);
     stockSubMenu->Append(wxID_BOLD);

+    stockSubMenu->Append(wxID_BOTTOM);

     stockSubMenu->Append(wxID_CANCEL);
     stockSubMenu->Append(wxID_CANCEL);

+    stockSubMenu->Append(wxID_CDROM);

     stockSubMenu->Append(wxID_CLEAR);
     stockSubMenu->Append(wxID_CLOSE);
     stockSubMenu->Append(wxID_CLEAR);
     stockSubMenu->Append(wxID_CLOSE);

+    stockSubMenu->Append(wxID_CONVERT);

     stockSubMenu->Append(wxID_COPY);
     stockSubMenu->Append(wxID_CUT);
     stockSubMenu->Append(wxID_DELETE);
     stockSubMenu->Append(wxID_COPY);
     stockSubMenu->Append(wxID_CUT);
     stockSubMenu->Append(wxID_DELETE);

-    stockSubMenu->Append(wxID_FIND);
-    stockSubMenu->Append(wxID_REPLACE);
-    stockSubMenu->Append(wxID_BACKWARD);

     stockSubMenu->Append(wxID_DOWN);
     stockSubMenu->Append(wxID_DOWN);

+    stockSubMenu->Append(wxID_EXECUTE);
+    stockSubMenu->Append(wxID_EXIT);
+    stockSubMenu->Append(wxID_FIND);
+    stockSubMenu->Append(wxID_FIRST);
+    stockSubMenu->Append(wxID_FLOPPY);

     stockSubMenu->Append(wxID_FORWARD);
     stockSubMenu->Append(wxID_FORWARD);

-    stockSubMenu->Append(wxID_UP);
+    stockSubMenu->Append(wxID_HARDDISK);

     stockSubMenu->Append(wxID_HELP);
     stockSubMenu->Append(wxID_HOME);
     stockSubMenu->Append(wxID_INDENT);
     stockSubMenu->Append(wxID_INDEX);
     stockSubMenu->Append(wxID_HELP);
     stockSubMenu->Append(wxID_HOME);
     stockSubMenu->Append(wxID_INDENT);
     stockSubMenu->Append(wxID_INDEX);

+    stockSubMenu->Append(wxID_INFO);

     stockSubMenu->Append(wxID_ITALIC);
     stockSubMenu->Append(wxID_ITALIC);

+    stockSubMenu->Append(wxID_JUMP_TO);

     stockSubMenu->Append(wxID_JUSTIFY_CENTER);
     stockSubMenu->Append(wxID_JUSTIFY_FILL);
     stockSubMenu->Append(wxID_JUSTIFY_LEFT);
     stockSubMenu->Append(wxID_JUSTIFY_RIGHT);
     stockSubMenu->Append(wxID_JUSTIFY_CENTER);
     stockSubMenu->Append(wxID_JUSTIFY_FILL);
     stockSubMenu->Append(wxID_JUSTIFY_LEFT);
     stockSubMenu->Append(wxID_JUSTIFY_RIGHT);

+    stockSubMenu->Append(wxID_LAST);
+    stockSubMenu->Append(wxID_NETWORK);

     stockSubMenu->Append(wxID_NEW);
     stockSubMenu->Append(wxID_NO);
     stockSubMenu->Append(wxID_OK);
     stockSubMenu->Append(wxID_OPEN);
     stockSubMenu->Append(wxID_PASTE);
     stockSubMenu->Append(wxID_PREFERENCES);
     stockSubMenu->Append(wxID_NEW);
     stockSubMenu->Append(wxID_NO);
     stockSubMenu->Append(wxID_OK);
     stockSubMenu->Append(wxID_OPEN);
     stockSubMenu->Append(wxID_PASTE);
     stockSubMenu->Append(wxID_PREFERENCES);

-    stockSubMenu->Append(wxID_PRINT);

     stockSubMenu->Append(wxID_PREVIEW);
     stockSubMenu->Append(wxID_PREVIEW);

+    stockSubMenu->Append(wxID_PRINT);

     stockSubMenu->Append(wxID_PROPERTIES);
     stockSubMenu->Append(wxID_PROPERTIES);

-    stockSubMenu->Append(wxID_EXIT);

     stockSubMenu->Append(wxID_REDO);
     stockSubMenu->Append(wxID_REFRESH);
     stockSubMenu->Append(wxID_REMOVE);
     stockSubMenu->Append(wxID_REDO);
     stockSubMenu->Append(wxID_REFRESH);
     stockSubMenu->Append(wxID_REMOVE);

+    stockSubMenu->Append(wxID_REPLACE);

     stockSubMenu->Append(wxID_REVERT_TO_SAVED);
     stockSubMenu->Append(wxID_SAVE);
     stockSubMenu->Append(wxID_SAVEAS);
     stockSubMenu->Append(wxID_REVERT_TO_SAVED);
     stockSubMenu->Append(wxID_SAVE);
     stockSubMenu->Append(wxID_SAVEAS);

+    stockSubMenu->Append(wxID_SELECT_COLOR);
+    stockSubMenu->Append(wxID_SELECT_FONT);
+    stockSubMenu->Append(wxID_SORT_ASCENDING);
+    stockSubMenu->Append(wxID_SORT_DESCENDING);
+    stockSubMenu->Append(wxID_SPELL_CHECK);

     stockSubMenu->Append(wxID_STOP);
     stockSubMenu->Append(wxID_STOP);

+    stockSubMenu->Append(wxID_STRIKETHROUGH);
+    stockSubMenu->Append(wxID_TOP);

     stockSubMenu->Append(wxID_UNDELETE);
     stockSubMenu->Append(wxID_UNDERLINE);
     stockSubMenu->Append(wxID_UNDO);
     stockSubMenu->Append(wxID_UNINDENT);
     stockSubMenu->Append(wxID_UNDELETE);
     stockSubMenu->Append(wxID_UNDERLINE);
     stockSubMenu->Append(wxID_UNDO);
     stockSubMenu->Append(wxID_UNINDENT);

+    stockSubMenu->Append(wxID_UP);

     stockSubMenu->Append(wxID_YES);
     stockSubMenu->Append(wxID_ZOOM_100);
     stockSubMenu->Append(wxID_ZOOM_FIT);
     stockSubMenu->Append(wxID_YES);
     stockSubMenu->Append(wxID_ZOOM_100);
     stockSubMenu->Append(wxID_ZOOM_FIT);


@@ -541,7 +572,7 @@ MyFrame::MyFrame()
                                 wxTE_MULTILINE);
     m_textctrl->SetEditable(false);
 
                                 wxTE_MULTILINE);
     m_textctrl->SetEditable(false);
 

-    wxLog::SetTimestamp(NULL);
+    wxLog::DisableTimestamp();

     m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl));
 
     wxLogMessage(_T("Brief explanations: the commands or the \"Menu\" menu ")
     m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl));
 
     wxLogMessage(_T("Brief explanations: the commands or the \"Menu\" menu ")


@@ -629,11 +660,21 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 }
 
 #if USE_LOG_WINDOW
 }
 
 #if USE_LOG_WINDOW

+

 void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 {
     m_textctrl->Clear();
 }
 void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
 {
     m_textctrl->Clear();
 }

-#endif
+
+void MyFrame::OnClearLogUpdateUI(wxUpdateUIEvent& event)
+{
+    // if we only enable this item when the log window is empty, we never see
+    // it in the disable state as a message is logged whenever the menu is
+    // opened, so we disable it if there is not "much" text in the window
+    event.Enable( m_textctrl->GetNumberOfLines() > 5 );
+}
+
+#endif // USE_LOG_WINDOW

 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {


@@ -704,7 +745,7 @@ void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event))
     wxCHECK_RET( count, _T("no last menu?") );
 
     wxLogMessage(_T("The label of the last menu item is '%s'"),
     wxCHECK_RET( count, _T("no last menu?") );
 
     wxLogMessage(_T("The label of the last menu item is '%s'"),

-                 mbar->GetLabelTop(count - 1).c_str());
+                 mbar->GetMenuLabel(count - 1).c_str());

 }
 
 #if wxUSE_TEXTDLG
 }
 
 #if wxUSE_TEXTDLG


@@ -719,13 +760,13 @@ void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
                      (
                         _T("Enter new label: "),
                         _T("Change last menu text"),
                      (
                         _T("Enter new label: "),
                         _T("Change last menu text"),

-                        mbar->GetLabelTop(count - 1),
+                        mbar->GetMenuLabel(count - 1),

                         this
                      );
 
     if ( !label.empty() )
     {
                         this
                      );
 
     if ( !label.empty() )
     {

-        mbar->SetLabelTop(count - 1, label);
+        mbar->SetMenuLabel(count - 1, label);

     }
 }
 
     }
 }
 


@@ -843,8 +884,9 @@ void MyFrame::OnGetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
 
     if ( item )
     {
 
     if ( item )
     {

+        wxString label = item->GetItemLabel();

         wxLogMessage(_T("The label of the last menu item is '%s'"),
         wxLogMessage(_T("The label of the last menu item is '%s'"),

-                     item->GetLabel().c_str());
+                     label.c_str());

     }
 }
 
     }
 }
 


@@ -859,14 +901,14 @@ void MyFrame::OnSetLabelMenuItem(wxCommandEvent& WXUNUSED(event))
                          (
                             _T("Enter new label: "),
                             _T("Change last menu item text"),
                          (
                             _T("Enter new label: "),
                             _T("Change last menu item text"),

-                            item->GetLabel(),
+                            item->GetItemLabel(),

                             this
                          );
         label.Replace( _T("\\t"), _T("\t") );
 
         if ( !label.empty() )
         {
                             this
                          );
         label.Replace( _T("\\t"), _T("\t") );
 
         if ( !label.empty() )
         {

-            item->SetText(label);
+            item->SetItemLabel(label);

         }
     }
 }
         }
     }
 }


@@ -989,27 +1031,50 @@ void MyFrame::ShowContextMenu(const wxPoint& pos)
 {
     wxMenu menu;
 
 {
     wxMenu menu;
 

-    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.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_File_Quit, _T("E&xit"));
-
-    menu.Delete(Menu_Popup_ToBeDeleted);
-    menu.Check(Menu_Popup_ToBeChecked, true);
-    menu.Enable(Menu_Popup_ToBeGreyed, false);
-
-    PopupMenu(&menu, pos.x, pos.y);
-
-    // test for destroying items in popup menus
+    if ( wxGetKeyState(WXK_SHIFT) )
+    {
+        // when Shift is pressed, demonstrate the use of a simple function
+        // returning the id of the item selected in the popup menu
+        menu.SetTitle("Choose one of:");
+        static const char *choices[] = { "Apple", "Banana", "Cherry" };
+        for ( size_t n = 0; n < WXSIZEOF(choices); n++ )
+            menu.Append(Menu_PopupChoice + n, choices[n]);
+
+        const int rc = GetPopupMenuSelectionFromUser(menu, pos);
+        if ( rc == wxID_NONE )
+        {
+            wxLogMessage("No selection");
+        }
+        else
+        {
+            wxLogMessage("You have selected \"%s\"",
+                         choices[rc - Menu_PopupChoice]);
+        }
+    }
+    else // normal case, shift not pressed
+    {
+        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.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_File_Quit, _T("E&xit"));
+
+        menu.Delete(Menu_Popup_ToBeDeleted);
+        menu.Check(Menu_Popup_ToBeChecked, true);
+        menu.Enable(Menu_Popup_ToBeGreyed, false);
+
+        PopupMenu(&menu, pos);
+
+        // test for destroying items in popup menus

 #if 0 // doesn't work in wxGTK!
 #if 0 // doesn't work in wxGTK!

-    menu.Destroy(Menu_Popup_Submenu);
+        menu.Destroy(Menu_Popup_Submenu);

 
 

-    PopupMenu( &menu, event.GetX(), event.GetY() );
+        PopupMenu( &menu, event.GetX(), event.GetY() );

 #endif // 0
 #endif // 0

+    }

 }
 
 void MyFrame::OnTestNormal(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnTestNormal(wxCommandEvent& WXUNUSED(event))