-/*
- Test for menu swapping bug (?) with GTK 2.1.13
-*/
-
-
-
/////////////////////////////////////////////////////////////////////////////
// Name: minimal.cpp
// Purpose: Minimal wxWindows sample
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "minimal.cpp"
- #pragma interface "minimal.cpp"
-#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#endif
// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWindows headers)
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
-
// ----------------------------------------------------------------------------
-// Global variables
+// resources
// ----------------------------------------------------------------------------
-static wxMenuBar *bar[2];
-static int current_bar;
-// ----------------------------------------------------------------------------
-// ressources
-// ----------------------------------------------------------------------------
-// the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+// the application icon (under Windows and OS/2 it is in resources)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
#include "mondrian.xpm"
#endif
{
public:
// ctor(s)
- MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+ MyFrame(const wxString& title);
// event handlers (these functions should _not_ be virtual)
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
- void OnSwapMenus(wxCommandEvent& event);
- void OnReplaceMenu(wxCommandEvent& event);
- void OnRemoveInsertMenu(wxCommandEvent& event);
private:
// any class wishing to process wxWindows events must use this macro
enum
{
// menu items
- Minimal_Quit = 1,
- Minimal_About,
- Minimal_SwapMenus,
- Minimal_ReplaceMenu,
- Minimal_RemoveInsertMenu
+ Minimal_Quit = wxID_EXIT,
+
+ // it is important for the id corresponding to the "About" command to have
+ // this standard value as otherwise it won't be handled properly under Mac
+ // (where it is special and put into the "Apple" menu)
+ Minimal_About = wxID_ABOUT
};
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_About, MyFrame::OnAbout)
- EVT_MENU(Minimal_SwapMenus, MyFrame::OnSwapMenus)
- EVT_MENU(Minimal_ReplaceMenu, MyFrame::OnReplaceMenu)
- EVT_MENU(Minimal_RemoveInsertMenu, MyFrame::OnRemoveInsertMenu)
END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWindows to create
// the application object during program execution (it's better than using a
-// static object for many reasons) and also declares the accessor function
+// static object for many reasons) and also implements the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
// not wxApp)
IMPLEMENT_APP(MyApp)
// implementation
// ============================================================================
-wxString IntTowxString(int number)
-{
- return(wxString(IntToString(number)));
-}
-
-wxMenu *GetFileMenu(int menu_number)
-{
- wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
- menuFile->Append(Minimal_Quit, "E&xit" + IntTowxString(menu_number) +
- "\tAlt-X", "Quit this program");
- menuFile->Append(Minimal_SwapMenus, "&SwapMenus" + IntTowxString(menu_number)
- + "\tAlt-S", "Swap Menus");
- menuFile->Append(Minimal_ReplaceMenu, "&ReplaceMenu" +
- IntTowxString(menu_number) + "\tAlt-R", "Replace Menu");
- menuFile->Append(Minimal_RemoveInsertMenu, "&RemoveInsertMenu" +
- IntTowxString(menu_number) + "\tAlt-I", "Remove Then Insert Menu");
-
- return(menuFile);
-}
-
// ----------------------------------------------------------------------------
// the application class
// ----------------------------------------------------------------------------
-// `Main program' equivalent: the program execution "starts" here
+// 'Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
// create the main application window
- MyFrame *frame = new MyFrame("Minimal wxWindows App",
- wxPoint(50, 50), wxSize(450, 340));
+ MyFrame *frame = new MyFrame(_T("Minimal wxWindows App"));
// and show it (the frames, unlike simple controls, are not shown when
// created initially)
// ----------------------------------------------------------------------------
// frame constructor
-MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
- : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+MyFrame::MyFrame(const wxString& title)
+ : wxFrame(NULL, -1, title)
{
-#ifdef __WXMAC__
- // we need this in order to allow the about menu relocation, since ABOUT is
- // not the default id of the about menu
- wxApp::s_macAboutMenuItemId = Minimal_About;
-#endif
-
// set the frame icon
SetIcon(wxICON(mondrian));
- bar[0] = new wxMenuBar();
-
- wxMenu *menuFile0 = GetFileMenu(0);
-
- wxMenu *helpMenu0 = new wxMenu;
- helpMenu0->Append(Minimal_About, "&About0...\tCtrl-A",
- "Show about dialog");
+#if wxUSE_MENUS
+ // create a menu bar
+ wxMenu *menuFile = new wxMenu;
- bar[0]->Append(menuFile0, "&File0");
- bar[0]->Append(helpMenu0, "&Help0");
+ // the "About" item should be in the help menu
+ wxMenu *helpMenu = new wxMenu;
+ helpMenu->Append(Minimal_About, _T("&About...\tF1"), _T("Show about dialog"));
+ menuFile->Append(Minimal_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
- bar[1] = new wxMenuBar();
-
- wxMenu *menuFile1 = GetFileMenu(1);
-
- wxMenu *helpMenu1 = new wxMenu;
- helpMenu1->Append(Minimal_About, "&About1...\tCtrl-A",
- "Show about dialog");
-
- bar[1]->Append(menuFile1, "&File1");
- bar[1]->Append(helpMenu1, "&Help1");
-
- current_bar = 1;
+ // now append the freshly created menu to the menu bar...
+ wxMenuBar *menuBar = new wxMenuBar();
+ menuBar->Append(menuFile, _T("&File"));
+ menuBar->Append(helpMenu, _T("&Help"));
// ... and attach this menu bar to the frame
- SetMenuBar(bar[current_bar]);
+ SetMenuBar(menuBar);
+#endif // wxUSE_MENUS
-#if wxUSE_STATUSBAR
+#if wxUSE_STATUSBAR && !defined(__WXWINCE__)
// create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2);
- SetStatusText("Welcome to wxWindows!");
+ SetStatusText(_T("Welcome to wxWindows!"));
#endif // wxUSE_STATUSBAR
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxString msg;
- msg.Printf( _T("This is the about dialog of minimal sample.\n")
+ msg.Printf( _T("This is the About dialog of the minimal sample.\n")
_T("Welcome to %s"), wxVERSION_STRING);
- wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
+ wxMessageBox(msg, _T("About Minimal"), wxOK | wxICON_INFORMATION, this);
}
-
-void MyFrame::OnSwapMenus(wxCommandEvent& WXUNUSED(event))
-{
- // Change the menu set around
- current_bar = 1 - current_bar;
- SetMenuBar(bar[current_bar]);
-}
-
-void MyFrame::OnReplaceMenu(wxCommandEvent& WXUNUSED(event))
-{
- wxMenuBar *curr_bar = bar[current_bar];
- wxMenu *menu = GetFileMenu(3);
- wxString title = "&File3";
-
- // Replace the first menu with the same thing
- int pos = 1;
- if (pos != wxNOT_FOUND)
- {
- curr_bar->Replace(pos, menu, title);
-// SetMenuBar(curr_bar);
- }
-}
-
-
-void MyFrame::OnRemoveInsertMenu(wxCommandEvent& WXUNUSED(event))
-{
- wxMenuBar *curr_bar = bar[current_bar];
- wxMenu *menu = GetFileMenu(current_bar);
- wxString title = "&File3";
-
- // Remove the first menu then insert it back in
- int pos = 1;
- if (pos != wxNOT_FOUND)
- {
- curr_bar->Remove(pos);
- if (curr_bar->GetMenuCount() != 0)
- curr_bar->Insert(pos, menu, title);
- else
- curr_bar->Append(menu, title);
-
- SetMenuBar(curr_bar);
- }
-}
-
-
-
projects / wxWidgets.git / blobdiff