// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// headers & declarations
-// ============================================================================
-
-// wxWindows headers
-// -----------------
-
#ifdef __GNUG__
#pragma implementation "menu.h"
#endif
#include "wx/utils.h"
#endif
-#if USE_OWNER_DRAWN
-#include "wx/ownerdrw.h"
+#if wxUSE_OWNER_DRAWN
+ #include "wx/ownerdrw.h"
#endif
#include "wx/msw/private.h"
// ----------------------
#include <string.h>
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the (popup) menu title has this special id
+static const int idMenuTitle = -2;
+
+// ----------------------------------------------------------------------------
+// wxWindows macros
+// ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
+ IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
+ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
#endif
// ============================================================================
m_hMenu = (WXHMENU) CreatePopupMenu();
m_savehMenu = 0 ;
m_topLevelMenu = this;
+ m_clientData = (void*) NULL;
+
if (m_title != "")
{
- Append(-2, m_title) ;
+ Append(idMenuTitle, m_title) ;
AppendSeparator() ;
}
}
// The wxWindow destructor will take care of deleting the submenus.
-wxMenu::~wxMenu(void)
+wxMenu::~wxMenu()
{
if (m_hMenu)
DestroyMenu((HMENU) m_hMenu);
*/
}
-void wxMenu::Break(void)
+void wxMenu::Break()
{
m_doBreak = TRUE ;
}
UINT id;
wxMenu *SubMenu = pItem->GetSubMenu();
if ( SubMenu != NULL ) {
- wxASSERT( SubMenu->m_hMenu != NULL );
+ wxASSERT( SubMenu->m_hMenu != (WXHMENU) NULL );
id = (UINT)SubMenu->m_hMenu;
}
LPCSTR pData;
- wxString name("");
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
if ( pItem->IsOwnerDrawn() ) { // want to get {Measure|Draw}Item messages?
// item draws itself, pass pointer to it in data parameter
flags |= MF_OWNERDRAW;
{
// menu is just a normal string (passed in data parameter)
flags |= MF_STRING;
- name = pItem->GetName();
- pData = (const char*) name;
+ pData = pItem->GetName();
}
- // VZ: what does this magic -2 mean? I just copied the code but have no idea
- // about what it does... ###
- if ( pItem->GetId() == -2 ) {
- flags |= MF_DISABLED | MF_GRAYED;
+ // visually select the menu title
+ if ( id == idMenuTitle )
+ {
+ // TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face
}
HMENU hMenu = (HMENU)((m_hMenu == 0) ? m_savehMenu : m_hMenu);
-
if ( !AppendMenu(hMenu, flags, id, pData) )
{
- // wxLogLastError("AppendMenu");
+ wxLogLastError("AppendMenu");
}
m_noItems++;
}
-void wxMenu::AppendSeparator(void)
+void wxMenu::AppendSeparator()
{
Append(new wxMenuItem(this, ID_SEPARATOR));
}
void wxMenu::Delete(int id)
{
wxNode *node;
- wxMenuItem *item;
int pos;
HMENU menu;
+ wxMenuItem *item = NULL;
for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) {
item = (wxMenuItem *)node->Data();
if (item->GetId() == id)
void wxMenu::SetTitle(const wxString& label)
{
- m_title = label ;
- if (m_hMenu)
- ModifyMenu((HMENU)m_hMenu, 0,
- MF_BYPOSITION | MF_STRING | MF_DISABLED,
- (UINT)-2, (const char *)m_title);
- else if (m_savehMenu)
- ModifyMenu((HMENU)m_savehMenu, 0,
- MF_BYPOSITION | MF_STRING | MF_DISABLED,
- (UINT)-2, (const char *)m_title);
+ bool hasNoTitle = m_title.IsEmpty();
+ m_title = label;
+
+ HMENU hMenu = (HMENU)((m_hMenu == 0) ? m_savehMenu : m_hMenu);
+
+ if ( hasNoTitle )
+ {
+ if ( !label.IsEmpty() )
+ {
+ if ( !InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
+ (unsigned)idMenuTitle, m_title) ||
+ !InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
+ {
+ wxLogLastError("InsertMenu");
+ }
+ }
+ }
+ else
+ {
+ if ( label.IsEmpty() )
+ {
+ // remove the title and the separator after it
+ if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
+ !RemoveMenu(hMenu, 0, MF_BYPOSITION) )
+ {
+ wxLogLastError("RemoveMenu");
+ }
+ }
+ else
+ {
+ // modify the title
+ if ( !ModifyMenu(hMenu, 0u,
+ MF_BYPOSITION | MF_STRING,
+ (unsigned)idMenuTitle, m_title) )
+ {
+ wxLogLastError("ModifyMenu");
+ }
+ }
+ }
+
+ // TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face
}
-const wxString& wxMenu::GetTitle() const
+const wxString wxMenu::GetTitle() const
{
return m_title;
}
item->SetName(label);
}
-wxString wxMenu::GetLabel(int Id) const
+wxString wxMenu::GetLabel(int id) const
{
+/*
static char tmp[128] ;
int len;
if (m_hMenu)
len = 0 ;
tmp[len] = '\0' ;
return wxString(tmp) ;
+
+*/
+ wxMenuItem *pItem = FindItemForId(id) ;
+ if (pItem)
+ return pItem->GetName() ;
+ else
+ return wxEmptyString;
}
-bool wxMenu::MSWCommand(const WXUINT WXUNUSED(param), const WXWORD id)
+bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
{
- wxCommandEvent event(wxEVENT_TYPE_MENU_COMMAND);
+ wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
event.SetEventObject( this );
event.SetId( id );
event.SetInt( id );
return -1;
}
-wxMenuItem *wxMenu::FindItemForId(const int itemId, wxMenu ** itemMenu) const
+wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
{
if (itemMenu)
*itemMenu = NULL;
return NULL;
}
-void wxMenu::SetHelpString(const int itemId, const wxString& helpString)
+void wxMenu::SetHelpString(int itemId, const wxString& helpString)
{
wxMenuItem *item = FindItemForId (itemId);
if (item)
item->SetHelp(helpString);
}
-wxString wxMenu::GetHelpString (const int itemId) const
+wxString wxMenu::GetHelpString (int itemId) const
{
wxMenuItem *item = FindItemForId (itemId);
- wxString str("");
- return (item == NULL) ? str : item->GetHelp();
+ if (item)
+ return item->GetHelp();
+ else
+ return wxEmptyString;
}
void wxMenu::ProcessCommand(wxCommandEvent & event)
// Try a callback
if (m_callback)
{
- (void) (*(m_callback)) (*this, event);
+ (void)(*(m_callback))(*this, event);
processed = TRUE;
}
// Try the window the menu was popped up from (and up
// through the hierarchy)
if ( !processed && GetInvokingWindow())
- processed = GetInvokingWindow()->ProcessEvent(event);
+ processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);
}
extern wxMenu *wxCurrentPopupMenu;
-bool wxWindow::PopupMenu(wxMenu *menu, const int x, const int y)
+bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
{
menu->SetInvokingWindow(this);
}
// Menu Bar
-wxMenuBar::wxMenuBar(void)
+wxMenuBar::wxMenuBar()
{
m_eventHandler = this;
m_hMenu = 0;
}
-wxMenuBar::wxMenuBar(const int N, wxMenu *Menus[], const wxString Titles[])
+wxMenuBar::wxMenuBar(int N, wxMenu *Menus[], const wxString Titles[])
{
m_eventHandler = this;
m_menuCount = N;
m_hMenu = 0;
}
-wxMenuBar::~wxMenuBar(void)
+wxMenuBar::~wxMenuBar()
{
// In fact, don't want menu to be destroyed before MDI
// shuffling has taken place. Let it be destroyed
// Must only be used AFTER menu has been attached to frame,
// otherwise use individual menus to enable/disable items
-void wxMenuBar::Enable(const int Id, const bool Flag)
+void wxMenuBar::Enable(int Id, bool Flag)
{
int ms_flag;
if (Flag)
}
-void wxMenuBar::EnableTop(const int pos, const bool flag)
+void wxMenuBar::EnableTop(int pos, bool flag)
{
int ms_flag;
if (flag)
// Must only be used AFTER menu has been attached to frame,
// otherwise use individual menus
-void wxMenuBar::Check(const int Id, const bool Flag)
+void wxMenuBar::Check(int Id, bool Flag)
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
// CheckMenuItem((HMENU)m_hMenu, Id, MF_BYCOMMAND | ms_flag);
}
-bool wxMenuBar::Checked(const int Id) const
+bool wxMenuBar::Checked(int Id) const
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
if (!item)
return FALSE;
- int Flag ;
+ int Flag = 0;
if (itemMenu->m_hMenu)
Flag=GetMenuState((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND) ;
return FALSE ;
}
-bool wxMenuBar::Enabled(const int Id) const
+bool wxMenuBar::Enabled(int Id) const
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
}
-void wxMenuBar::SetLabel(const int Id, const wxString& label)
+void wxMenuBar::SetLabel(int Id, const wxString& label)
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
}
}
-wxString wxMenuBar::GetLabel(const int Id) const
+wxString wxMenuBar::GetLabel(int Id) const
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
return wxString(tmp) ;
}
-void wxMenuBar::SetLabelTop(const int pos, const wxString& label)
+void wxMenuBar::SetLabelTop(int pos, const wxString& label)
{
UINT was_flag = GetMenuState((HMENU)m_hMenu,pos,MF_BYPOSITION) ;
if (was_flag&MF_POPUP)
ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,pos,(const char *)label) ;
}
-wxString wxMenuBar::GetLabelTop(const int pos) const
+wxString wxMenuBar::GetLabelTop(int pos) const
{
static char tmp[128] ;
int len = GetMenuString((HMENU)m_hMenu,pos,tmp,127,MF_BYPOSITION) ;
return wxString(tmp);
}
-bool wxMenuBar::OnDelete(wxMenu *a_menu, const int pos)
+bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos)
{
if (!m_menuBarFrame)
return TRUE;
((wxMenu *)menu)->SetParent(this);
}
-void wxMenuBar::Delete(wxMenu * menu, const int i)
+void wxMenuBar::Delete(wxMenu * menu, int i)
{
int j;
int ii = (int) i;
return -1;
}
-wxMenuItem *wxMenuBar::FindItemForId (const int Id, wxMenu ** itemMenu) const
+wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const
{
if (itemMenu)
*itemMenu = NULL;
wxMenuItem *item = NULL;
int i;
for (i = 0; i < m_menuCount; i++)
- if ((item = m_menus[i]->FindItemForId (Id, itemMenu)))
+ {
+ item = m_menus[i]->FindItemForId (Id, itemMenu);
+ if (item)
return item;
+ }
return NULL;
}
-void wxMenuBar::SetHelpString (const int Id, const wxString& helpString)
+void wxMenuBar::SetHelpString (int Id, const wxString& helpString)
{
int i;
for (i = 0; i < m_menuCount; i++)
}
}
-wxString wxMenuBar::GetHelpString (const int Id) const
+wxString wxMenuBar::GetHelpString (int Id) const
{
int i;
for (i = 0; i < m_menuCount; i++)
projects / wxWidgets.git / blobdiff