Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MSW compilation fixes - widgets sample runs!

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-27 00:27:24 +00:00
parent 29149a6491
commit e421922f90
19 changed files with 422 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
samples/menu/menu.cpp
View File

@@ -25,8 +25,11 @@
#endif
#ifndef WX_PRECOMP
#include <wx/wx.h>
#include <wx/app.h>
#include <wx/frame.h>
#include <wx/menu.h>
#include <wx/log.h>
#include <wx/textctrl.h>
#endif
#if !wxUSE_MENUS
@@ -41,9 +44,6 @@
WX_USE_THEME(win32);
WX_USE_THEME(gtk);
// not implemented yet
#define wxMessageBox
#endif // __WXUNIVERSAL__
// ----------------------------------------------------------------------------
@@ -67,7 +67,10 @@ public:
void LogMenuEvent(const wxCommandEvent& event);
protected:
void OnQuit(wxCommandEvent& event);
void OnClearLog(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
void OnDummy(wxCommandEvent& event);
@@ -90,19 +93,29 @@ public:
void OnGetLabelMenu(wxCommandEvent& event);
void OnSetLabelMenu(wxCommandEvent& event);
void OnRightDown(wxMouseEvent& event);
void OnRightUp(wxMouseEvent& event);
void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event);
void OnSize(wxSizeEvent& event);
private:
wxMenu *CreateDummyMenu(wxString *title);
wxMenuItem *GetLastMenuItem() const;
wxMenu *m_menu;
// the menu previously detached from the menubar (may be NULL)
wxMenu *m_menu;
// the count of dummy menus already created
size_t m_countDummy;
// the control used for logging
wxTextCtrl *m_textctrl;
// the previous log target
wxLog *m_logOld;
DECLARE_EVENT_TABLE()
};
@@ -132,6 +145,7 @@ private:
enum
{
Menu_File_Quit = 100,
Menu_File_ClearLog,
Menu_MenuBar_Toggle = 200,
Menu_MenuBar_Append,
@@ -172,7 +186,8 @@ enum
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Menu_File_Quit, MyFrame::OnQuit)
EVT_MENU(Menu_File_Quit, MyFrame::OnQuit)
EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog)
EVT_MENU(Menu_Help_About, MyFrame::OnAbout)
@@ -198,7 +213,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_UPDATE_UI(Menu_Menu_Check, MyFrame::OnUpdateCheckMenuItemUI)
EVT_RIGHT_DOWN(MyFrame::OnRightDown)
EVT_RIGHT_UP(MyFrame::OnRightUp)
EVT_SIZE(MyFrame::OnSize)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
@@ -225,7 +242,7 @@ bool MyApp::OnInit()
frame->Show(TRUE);
#if wxUSE_STATUSBAR
frame->SetStatusText("Hello, wxWindows");
frame->SetStatusText("Welcome to wxWindows menu sample");
#endif // wxUSE_STATUSBAR
SetTopWindow(frame);
@@ -244,19 +261,21 @@ MyFrame::MyFrame()
{
m_menu = NULL;
m_countDummy = 0;
m_logOld = NULL;
#if wxUSE_STATUSBAR
CreateStatusBar(2);
CreateStatusBar();
#endif // wxUSE_STATUSBAR
// create the menubar
wxMenu *fileMenu = new wxMenu;
fileMenu->Append(Menu_File_Quit, "E&xit\tAlt-X", "Quit toolbar sample");
wxMenuItem *itemBitmap = new wxMenuItem(fileMenu, Menu_File_Quit,
"Quit with &bitmap\tAlt-Q");
itemBitmap->SetBitmap(wxBitmap(copy_xpm));
fileMenu->Append(itemBitmap);
wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
"Clear &log\tCtrl-L");
item->SetBitmap(copy_xpm);
fileMenu->Append(item);
fileMenu->AppendSeparator();
fileMenu->Append(Menu_File_Quit, "E&xit\tAlt-X", "Quit menu sample");
wxMenu *menubarMenu = new wxMenu;
menubarMenu->Append(Menu_MenuBar_Append, "&Append menu\tCtrl-A",
@@ -320,6 +339,19 @@ MyFrame::MyFrame()
// intercept all menu events and log them in this custom event handler
PushEventHandler(new MyEvtHandler(this));
// create the log text window
m_textctrl = new wxTextCtrl(this, -1, _T(""),
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE);
m_textctrl->SetEditable(FALSE);
m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_textctrl));
wxLogMessage(_T("Brief explanations: the commands or the \"Menu\" 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("Right click the band below to test popup menus.\n"));
}
MyFrame::~MyFrame()
@@ -328,14 +360,17 @@ MyFrame::~MyFrame()
// delete the event handler installed in ctor
PopEventHandler(TRUE);
// restore old logger
delete wxLog::SetActiveTarget(m_logOld);
}
wxMenu *MyFrame::CreateDummyMenu(wxString *title)
{
wxMenu *menu = new wxMenu;
menu->Append(Menu_Dummy_First, "First item\tCtrl-F1");
menu->Append(Menu_Dummy_First, "&First item\tCtrl-F1");
menu->AppendSeparator();
menu->Append(Menu_Dummy_Second, "Second item\tCtrl-F2", "", TRUE);
menu->Append(Menu_Dummy_Second, "&Second item\tCtrl-F2", "", TRUE);
if ( title )
{
@@ -366,8 +401,9 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
void MyFrame::LogMenuEvent(const wxCommandEvent& event)
{
int id = event.GetId();
if (!GetMenuBar()->FindItem(id))
if ( !GetMenuBar()->FindItem(id) )
return;
wxString msg = wxString::Format("Menu command %d", id);
if ( GetMenuBar()->FindItem(id)->IsCheckable() )
{
@@ -375,9 +411,7 @@ void MyFrame::LogMenuEvent(const wxCommandEvent& event)
event.IsChecked() ? "" : "not ");
}
#if wxUSE_STATUSBAR
SetStatusText(msg, 1);
#endif // wxUSE_STATUSBAR
wxLogMessage(msg);
}
// ----------------------------------------------------------------------------
@@ -389,11 +423,21 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
Close(TRUE);
}
void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
{
m_textctrl->Clear();
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
(void)wxMessageBox("wxWindows toolbar sample",
#ifdef __WXUNIVERSAL__
// wxMessageBox not implemented yet
wxLogMessage("wxWindows menu sample\n<EFBFBD> 1999-2001 Vadim Zeitlin");
#else
(void)wxMessageBox("wxWindows menu sample\n<EFBFBD> 1999-2001 Vadim Zeitlin",
"About wxWindows menu sample",
wxICON_INFORMATION);
#endif
}
void MyFrame::OnDeleteMenu(wxCommandEvent& WXUNUSED(event))
@@ -442,15 +486,12 @@ void MyFrame::OnToggleMenu(wxCommandEvent& WXUNUSED(event))
}
}
void MyFrame::OnEnableMenu(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnEnableMenu(wxCommandEvent& event)
{
wxMenuBar *mbar = GetMenuBar();
size_t count = mbar->GetMenuCount();
static bool s_enabled = TRUE;
s_enabled = !s_enabled;
mbar->EnableTop(count - 1, s_enabled);
mbar->EnableTop(count - 1, event.IsChecked());
}
void MyFrame::OnGetLabelMenu(wxCommandEvent& WXUNUSED(event))
@@ -472,9 +513,7 @@ void MyFrame::OnSetLabelMenu(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnDummy(wxCommandEvent& event)
{
wxString s;
s.Printf("Dummy item #%d", event.GetId() - Menu_Dummy_First + 1);
wxMessageBox(s, "Menu sample", wxICON_INFORMATION);
wxLogMessage("Dummy item #%d", event.GetId() - Menu_Dummy_First + 1);
}
void MyFrame::OnAppendMenuItem(wxCommandEvent& WXUNUSED(event))
@@ -483,7 +522,7 @@ void MyFrame::OnAppendMenuItem(wxCommandEvent& WXUNUSED(event))
wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
menu->AppendSeparator();
menu->Append(Menu_Dummy_Third, "Third dummy item\tCtrl-F3",
menu->Append(Menu_Dummy_Third, "&Third dummy item\tCtrl-F3",
"Checkable item", TRUE);
}
@@ -493,7 +532,7 @@ void MyFrame::OnAppendSubMenu(wxCommandEvent& WXUNUSED(event))
wxMenu *menu = menubar->GetMenu(menubar->GetMenuCount() - 1);
menu->Append(Menu_Dummy_Last, "Dummy sub menu",
menu->Append(Menu_Dummy_Last, "&Dummy sub menu",
CreateDummyMenu(NULL), "Dummy sub menu help");
}
@@ -645,15 +684,15 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
}
}
void MyFrame::OnRightDown(wxMouseEvent &event )
void MyFrame::OnRightUp(wxMouseEvent &event)
{
wxMenu menu("Test popup");
menu.Append(Menu_Help_About, "&About");
menu.Append(Menu_Popup_Submenu, "Submenu", CreateDummyMenu(NULL));
menu.Append(Menu_Popup_ToBeDeleted, "To be deleted");
menu.Append(Menu_Popup_ToBeChecked, "To be checked", "", TRUE);
menu.Append(Menu_Popup_ToBeGreyed, "To be greyed");
menu.Append(Menu_Popup_Submenu, "&Submenu", CreateDummyMenu(NULL));
menu.Append(Menu_Popup_ToBeDeleted, "To be &deleted");
menu.Append(Menu_Popup_ToBeChecked, "To be &checked", "", TRUE);
menu.Append(Menu_Popup_ToBeGreyed, "To be &greyed");
menu.AppendSeparator();
menu.Append(Menu_File_Quit, "E&xit");
@@ -661,12 +700,27 @@ void MyFrame::OnRightDown(wxMouseEvent &event )
menu.Check(Menu_Popup_ToBeChecked, TRUE);
menu.Enable(Menu_Popup_ToBeGreyed, FALSE);
PopupMenu( &menu, event.GetX(), event.GetY() );
PopupMenu(&menu, event.GetX(), event.GetY());
// test for destroying items in popup menus
#if 0
#if 0 // doesn't work in wxGTK!
menu.Destroy(Menu_Popup_Submenu);
PopupMenu( &menu, event.GetX(), event.GetY() );
#endif // 0
}
void MyFrame::OnSize(wxSizeEvent& event)
{
// leave a band below for popup menu testing
wxSize size = GetClientSize();
m_textctrl->SetSize(0, 0, size.x, (3*size.y)/4);
// this is really ugly but we have to do it as we can't just call
// event.Skip() because wxFrameBase would make the text control fill the
// entire frame then
#ifdef __WXUNIVERSAL__
PositionMenuBar();
#endif // __WXUNIVERSAL__
}