// ============================================================================
-// headers & declarations
+// declarations
// ============================================================================
-// wxWindows headers
-// -----------------
-
#ifdef __GNUG__
-#pragma implementation "menu.h"
-#pragma implementation "menuitem.h"
+ #pragma implementation "menu.h"
#endif
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/defs.h"
+
#include "wx/menu.h"
#include "wx/menuitem.h"
#include "wx/log.h"
#include "wx/frame.h"
#include "wx/settings.h"
+#ifdef __VMS__
+#pragma message disable nosimpint
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/CascadeBG.h>
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#include <Xm/RowColumn.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#include "wx/motif/private.h"
// other standard headers
-// ----------------------
#include <string.h>
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-#endif
// ============================================================================
// implementation
// ============================================================================
+// ----------------------------------------------------------------------------
// Menus
+// ----------------------------------------------------------------------------
// Construct a menu with optional title (then use append)
-void wxMenu::Init(const wxString& title,
- long style
-#ifdef WXWIN_COMPATIBILITY
- , const wxFunction func
-#endif
- )
+void wxMenu::Init()
{
- m_title = title;
- m_parent = (wxEvtHandler*) NULL;
- m_eventHandler = this;
- m_noItems = 0;
- m_menuBar = NULL;
- m_pInvokingWindow = NULL;
- m_style = style;
-
- //// Motif-specific members
+ // Motif-specific members
m_numColumns = 1;
m_menuWidget = (WXWidget) NULL;
m_popupShell = (WXWidget) NULL;
m_menuId = 0;
m_topLevelMenu = (wxMenu*) NULL;
m_ownedByMenuBar = FALSE;
- m_menuParent = (wxMenu*) NULL;
- m_clientData = (void*) NULL;
- if (m_title != "")
+ if ( !!m_title )
{
- Append(ID_SEPARATOR, m_title) ;
+ Append(wxID_SEPARATOR, m_title) ;
AppendSeparator() ;
}
+
m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU);
m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT);
m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-
-#ifdef WXWIN_COMPATIBILITY
- Callback(func);
-#endif
}
// The wxWindow destructor will take care of deleting the submenus.
m_menuParent = NULL;
// m_menuBar = NULL;
}
-
- wxNode *node = m_menuItems.First();
- while (node)
- {
- wxMenuItem *item = (wxMenuItem *)node->Data();
-
- /*
- if (item->GetSubMenu())
- item->DeleteSubMenu();
- */
-
- wxNode *next = node->Next();
- delete item;
- delete node;
- node = next;
- }
}
void wxMenu::Break()
{
- m_numColumns ++;
+ m_numColumns++;
}
// function appends a new item or submenu to the menu
-void wxMenu::Append(wxMenuItem *pItem)
+bool wxMenu::DoAppend(wxMenuItem *pItem)
{
- wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" );
-
- m_menuItems.Append(pItem);
-
if (m_menuWidget)
- pItem->CreateItem (m_menuWidget, m_menuBar, m_topLevelMenu); // this is a dynamic Append
-
- m_noItems++;
-}
-
-void wxMenu::AppendSeparator()
-{
- Append(new wxMenuItem(this, ID_SEPARATOR));
-}
-
-// Pullright item
-// N.B.: difference between old and new code.
-// Old code stores subMenu in 'children' for later deletion,
-// as well as in m_menuItems, whereas we only store it in
-// m_menuItems here. What implications does this have?
-
-void wxMenu::Append(int id, const wxString& label, wxMenu *subMenu,
- const wxString& helpString)
-{
- Append(new wxMenuItem(this, id, label, helpString, FALSE, subMenu));
-
- subMenu->m_topLevelMenu = m_topLevelMenu;
-}
-
-// Ordinary menu item
-void wxMenu::Append(int id, const wxString& label,
- const wxString& helpString, bool checkable)
-{
- // 'checkable' parameter is useless for Windows.
- Append(new wxMenuItem(this, id, label, helpString, checkable));
-}
-
-void wxMenu::Delete(int id)
-{
- wxNode *node;
- wxMenuItem *item;
- int pos;
-
- for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++)
{
- item = (wxMenuItem *)node->Data();
- if (item->GetId() == id)
- break;
+ // this is a dynamic Append
+ pItem->CreateItem(m_menuWidget, m_menuBar, m_topLevelMenu);
}
- if (!node)
- return;
-
- item->DestroyItem(TRUE);
-
- // See also old code - don't know if this is needed (seems redundant).
- /*
- if (item->GetSubMenu()) {
- item->subMenu->top_level_menu = item->GetSubMenu();
- item->subMenu->window_parent = NULL;
- children->DeleteObject(item->GetSubMenu());
+ if ( pItem->IsSubMenu() )
+ {
+ pItem->GetSubMenu()->m_topLevelMenu = m_topLevelMenu;
}
- */
- m_menuItems.DeleteNode(node);
- delete item;
+ return wxMenuBase::DoAppend(pItem);
}
-void wxMenu::Enable(int id, bool flag)
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{
- wxMenuItem *item = FindItemForId(id);
- wxCHECK_RET( item != NULL, "can't enable non-existing menu item" );
-
- item->Enable(flag);
-}
-
-bool wxMenu::Enabled(int Id) const
-{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK( item != NULL, FALSE );
+ item->DestroyItem(TRUE);
- return item->IsEnabled();
+ return wxMenuBase::DoRemove(item);
}
-void wxMenu::Check(int Id, bool Flag)
+bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" );
-
- item->Check(Flag);
-}
+ if ( !wxMenuBase::DoInsert(pos, item) )
+ return FALSE;
-bool wxMenu::Checked(int id) const
-{
- wxMenuItem *item = FindItemForId(id);
- wxCHECK( item != NULL, FALSE );
+ wxFAIL_MSG(wxT("not implemented"));
- return item->IsChecked();
+ return FALSE;
}
void wxMenu::SetTitle(const wxString& label)
{
- m_title = label ;
+ m_title = label;
- wxNode *node = m_menuItems.First ();
- if (!node)
+ wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ if ( !node )
return;
- wxMenuItem *item = (wxMenuItem *) node->Data ();
+ wxMenuItem *item = node->GetData ();
Widget widget = (Widget) item->GetButtonWidget();
- if (!widget)
+ if ( !widget )
return;
- XmString title_str = XmStringCreateSimple ((char*) (const char*) label);
- XtVaSetValues (widget,
- XmNlabelString, title_str,
- NULL);
- // TODO: should we delete title_str now?
+ wxXmString title_str(label);
+ XtVaSetValues(widget,
+ XmNlabelString, title_str(),
+ NULL);
}
-const wxString wxMenu::GetTitle() const
-{
- return m_title;
-}
-
-void wxMenu::SetLabel(int id, const wxString& label)
-{
- wxMenuItem *item = FindItemForId(id);
- if (item == (wxMenuItem*) NULL)
- return;
-
- item->SetLabel(label);
-}
-
-wxString wxMenu::GetLabel(int id) const
-{
- wxMenuItem *it = NULL;
- WXWidget w = FindMenuItem (id, &it);
- if (w)
- {
- XmString text;
- char *s;
- XtVaGetValues ((Widget) w,
- XmNlabelString, &text,
- NULL);
-
- if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
- {
- wxString str(s);
- XtFree (s);
- return str;
- }
- else
- {
- XmStringFree (text);
- return wxEmptyString;
- }
- }
- else
- return wxEmptyString;
-}
-
-// Finds the item id matching the given string, -1 if not found.
-int wxMenu::FindItem (const wxString& itemString) const
-{
- char buf1[200];
- char buf2[200];
- wxStripMenuCodes ((char *)(const char *)itemString, buf1);
-
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
- {
- wxMenuItem *item = (wxMenuItem *) node->Data ();
- if (item->GetSubMenu())
- {
- int ans = item->GetSubMenu()->FindItem(itemString);
- if (ans > -1)
- return ans;
- }
- if ( !item->IsSeparator() )
- {
- wxStripMenuCodes((char *)item->GetName().c_str(), buf2);
- if (strcmp(buf1, buf2) == 0)
- return item->GetId();
- }
- }
-
- return -1;
-}
-
-wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
-{
- if (itemMenu)
- *itemMenu = NULL;
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
- {
- wxMenuItem *item = (wxMenuItem *) node->Data ();
-
- if (item->GetId() == itemId)
- {
- if (itemMenu)
- *itemMenu = (wxMenu *) this;
- return item;
- }
-
- if (item->GetSubMenu())
- {
- wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu);
- if (ans)
- return ans;
- }
- }
-
- if (itemMenu)
- *itemMenu = NULL;
- return NULL;
-}
-
-void wxMenu::SetHelpString(int itemId, const wxString& helpString)
-{
- wxMenuItem *item = FindItemForId (itemId);
- if (item)
- item->SetHelp(helpString);
-}
-
-wxString wxMenu::GetHelpString (int itemId) const
-{
- wxMenuItem *item = FindItemForId (itemId);
- wxString str("");
- return (item == NULL) ? str : item->GetHelp();
-}
-
-void wxMenu::ProcessCommand(wxCommandEvent & event)
+bool wxMenu::ProcessCommand(wxCommandEvent & event)
{
bool processed = FALSE;
+#if wxUSE_MENU_CALLBACK
// Try a callback
if (m_callback)
{
(void) (*(m_callback)) (*this, event);
processed = TRUE;
}
+#endif // wxUSE_MENU_CALLBACK
// Try the menu's event handler
if ( !processed && GetEventHandler())
// Try the window the menu was popped up from (and up
// through the hierarchy)
if ( !processed && GetInvokingWindow())
- processed = GetInvokingWindow()->ProcessEvent(event);
-}
+ processed = GetInvokingWindow()->ProcessEvent(event);
-// Update a menu and all submenus recursively.
-// source is the object that has the update event handlers
-// defined for it. If NULL, the menu or associated window
-// will be used.
-void wxMenu::UpdateUI(wxEvtHandler* source)
-{
- if (!source && GetInvokingWindow())
- source = GetInvokingWindow()->GetEventHandler();
- if (!source)
- source = GetEventHandler();
- if (!source)
- source = this;
-
- wxNode* node = GetItems().First();
- while (node)
- {
- wxMenuItem* item = (wxMenuItem*) node->Data();
- if ( !item->IsSeparator() )
- {
- wxWindowID id = item->GetId();
- wxUpdateUIEvent event(id);
- event.SetEventObject( source );
-
- if (source->ProcessEvent(event))
- {
- if (event.GetSetText())
- SetLabel(id, event.GetText());
- if (event.GetSetChecked())
- Check(id, event.GetChecked());
- if (event.GetSetEnabled())
- Enable(id, event.GetEnabled());
- }
-
- if (item->GetSubMenu())
- item->GetSubMenu()->UpdateUI(source);
- }
- node = node->Next();
- }
+ return processed;
}
+// ----------------------------------------------------------------------------
// Menu Bar
-wxMenuBar::wxMenuBar()
-{
- m_eventHandler = this;
- m_menuCount = 0;
- m_menus = NULL;
- m_titles = NULL;
- m_menuBarFrame = NULL;
- m_mainWidget = (WXWidget) NULL;
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU);
- m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT);
- m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-}
+// ----------------------------------------------------------------------------
-wxMenuBar::wxMenuBar(long WXUNUSED(style))
+void wxMenuBar::Init()
{
m_eventHandler = this;
- m_menuCount = 0;
- m_menus = NULL;
- m_titles = NULL;
m_menuBarFrame = NULL;
m_mainWidget = (WXWidget) NULL;
m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU);
wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
{
- m_eventHandler = this;
- m_menuCount = n;
- m_menus = menus;
- m_titles = new wxString[n];
- int i;
- for ( i = 0; i < n; i++ )
- m_titles[i] = titles[i];
- m_menuBarFrame = NULL;
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU);
- m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT);
- m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-}
+ Init();
-wxMenuBar::~wxMenuBar()
-{
- int i;
- for (i = 0; i < m_menuCount; i++)
+ for ( int i = 0; i < n; i++ )
{
- delete m_menus[i];
+ m_menus.Append(menus[i]);
+ m_titles.Add(titles[i]);
}
- delete[] m_menus;
- delete[] m_titles;
}
-// Must only be used AFTER menu has been attached to frame,
-// otherwise use individual menus to enable/disable items
-void wxMenuBar::Enable(int id, bool flag)
+wxMenuBar::~wxMenuBar()
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
- return;
- item->Enable(flag);
+ // nothing to do: wxMenuBarBase will delete the menus
}
-void wxMenuBar::EnableTop(int pos, bool flag)
+void wxMenuBar::EnableTop(size_t WXUNUSED(pos), bool WXUNUSED(flag))
{
- // TODO
+ // wxFAIL_MSG("TODO");
+// wxLogWarning("wxMenuBar::EnableTop not yet implemented.");
}
-// Must only be used AFTER menu has been attached to frame,
-// otherwise use individual menus
-void wxMenuBar::Check(int id, bool flag)
+void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
+ wxMenu *menu = GetMenu(pos);
+ if ( !menu )
return;
- if (!item->IsCheckable())
- return ;
-
- item->Check(flag);
-}
-
-bool wxMenuBar::Checked(int id) const
-{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
- return FALSE;
-
- return item->IsChecked();
-}
-
-bool wxMenuBar::Enabled(int id) const
-{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
- return FALSE;
-
- return item->IsEnabled();
-}
-
-void wxMenuBar::SetLabel(int id, const wxString& label)
-{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
-
- if (!item)
- return;
+ Widget w = (Widget)menu->GetButtonWidget();
+ if (w)
+ {
+ wxXmString label_str(label);
- item->SetLabel(label);
+ XtVaSetValues(w,
+ XmNlabelString, label_str(),
+ NULL);
+ }
}
-wxString wxMenuBar::GetLabel(int id) const
+wxString wxMenuBar::GetLabelTop(size_t pos) const
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
+ wxString str;
- if (!item)
- return wxString("");
-
- return item->GetLabel();
-}
+ wxMenu *menu = GetMenu(pos);
+ if ( menu )
+ {
+ Widget w = (Widget)menu->GetButtonWidget();
+ if (w)
+ {
+ XmString text;
+ XtVaGetValues(w,
+ XmNlabelString, &text,
+ NULL);
-void wxMenuBar::SetLabelTop(int pos, const wxString& label)
-{
- wxASSERT( (pos < m_menuCount) );
+ char *s;
+ if ( XmStringGetLtoR(text, XmSTRING_DEFAULT_CHARSET, &s) )
+ {
+ str = s;
- Widget w = (Widget) m_menus[pos]->GetButtonWidget();
- if (w)
- {
- XmString label_str = XmStringCreateSimple ((char*) (const char*) label);
- XtVaSetValues (w,
- XmNlabelString, label_str,
- NULL);
- XmStringFree (label_str);
+ XtFree(s);
+ }
+ }
}
+
+ return str;
}
-wxString wxMenuBar::GetLabelTop(int pos) const
+bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
{
- wxASSERT( (pos < m_menuCount) );
+ wxCHECK_MSG( menu, FALSE, wxT("invalid menu") );
+ wxCHECK_MSG( !menu->GetParent() && !menu->GetButtonWidget(), FALSE,
+ wxT("menu already appended") );
- Widget w = (Widget) m_menus[pos]->GetButtonWidget();
- if (w)
+ if ( m_menuBarFrame )
{
- XmString text;
- char *s;
- XtVaGetValues (w,
- XmNlabelString, &text,
- NULL);
-
- if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
- {
- wxString str(s);
- XtFree (s);
- return str;
- }
- else
- {
- return wxEmptyString;
- }
+ WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE);
+ wxCHECK_MSG( w, FALSE, wxT("failed to create menu") );
+ menu->SetButtonWidget(w);
}
- else
- return wxEmptyString;
-}
+ //menu->SetMenuBar(this);
-bool wxMenuBar::OnDelete(wxMenu *menu, int pos)
-{
- // Only applies to dynamic deletion (when set in frame)
- if (!m_menuBarFrame)
- return TRUE;
+ m_titles.Add(title);
- menu->DestroyMenu(TRUE);
- return TRUE;
+ return wxMenuBarBase::Append(menu, title);
}
-bool wxMenuBar::OnAppend(wxMenu *menu, const char *title)
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
{
- // Only applies to dynamic append (when set in frame)
- if (!m_menuBarFrame)
- return TRUE;
-
- // Probably should be an assert here
- if (menu->GetParent())
- return FALSE;
-
- // Has already been appended
- if (menu->GetButtonWidget())
+ if ( !wxMenuBarBase::Insert(pos, menu, title) )
return FALSE;
- WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE);
- menu->SetButtonWidget(w);
+ wxFAIL_MSG(wxT("TODO"));
- return TRUE;
+ return FALSE;
}
-void wxMenuBar::Append (wxMenu * menu, const wxString& title)
+wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
{
- if (!OnAppend(menu, title))
- return;
-
- m_menuCount ++;
- wxMenu **new_menus = new wxMenu *[m_menuCount];
- wxString *new_titles = new wxString[m_menuCount];
- int i;
-
- for (i = 0; i < m_menuCount - 1; i++)
- {
- new_menus[i] = m_menus[i];
- m_menus[i] = NULL;
- new_titles[i] = m_titles[i];
- m_titles[i] = "";
- }
- if (m_menus)
- {
- delete[]m_menus;
- delete[]m_titles;
- }
- m_menus = new_menus;
- m_titles = new_titles;
+ if ( !wxMenuBarBase::Replace(pos, menu, title) )
+ return FALSE;
- m_menus[m_menuCount - 1] = (wxMenu *)menu;
- m_titles[m_menuCount - 1] = title;
+ wxFAIL_MSG(wxT("TODO"));
- menu->SetMenuBar(this);
- menu->SetParent(this);
+ return NULL;
}
-void wxMenuBar::Delete(wxMenu * menu, int i)
+wxMenu *wxMenuBar::Remove(size_t pos)
{
- int j;
- int ii = (int) i;
+ wxMenu *menu = wxMenuBarBase::Remove(pos);
+ if ( !menu )
+ return NULL;
- if (menu != 0)
- {
- for (ii = 0; ii < m_menuCount; ii++)
- {
- if (m_menus[ii] == menu)
- break;
- }
- if (ii >= m_menuCount)
- return;
- } else
- {
- if (ii < 0 || ii >= m_menuCount)
- return;
- menu = m_menus[ii];
- }
+ if ( m_menuBarFrame )
+ menu->DestroyMenu(TRUE);
- if (!OnDelete(menu, ii))
- return;
+ menu->SetMenuBar(NULL);
- menu->SetParent((wxEvtHandler*) NULL);
+ m_titles.Remove(pos);
- -- m_menuCount;
- for (j = ii; j < m_menuCount; j++)
- {
- m_menus[j] = m_menus[j + 1];
- m_titles[j] = m_titles[j + 1];
- }
+ return menu;
}
// Find the menu menuString, item itemString, and return the item id.
char buf1[200];
char buf2[200];
wxStripMenuCodes ((char *)(const char *)menuString, buf1);
- int i;
- for (i = 0; i < m_menuCount; i++)
+
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
{
wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2);
if (strcmp (buf1, buf2) == 0)
return -1;
}
-wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu ** itemMenu) const
+wxMenuItem *wxMenuBar::FindItem(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)))
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
+ if ((item = m_menus[i]->FindItem(id, itemMenu)))
return item;
return NULL;
}
-void wxMenuBar::SetHelpString (int id, const wxString& helpString)
-{
- int i;
- for (i = 0; i < m_menuCount; i++)
- {
- if (m_menus[i]->FindItemForId (id))
- {
- m_menus[i]->SetHelpString (id, helpString);
- return;
- }
- }
-}
-
-wxString wxMenuBar::GetHelpString (int id) const
-{
- int i;
- for (i = 0; i < m_menuCount; i++)
- {
- if (m_menus[i]->FindItemForId (id))
- return wxString(m_menus[i]->GetHelpString (id));
- }
- return wxString("");
-}
-
// Create menubar
bool wxMenuBar::CreateMenuBar(wxFrame* parent)
{
if (m_mainWidget)
{
- XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
+ XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
/*
if (!XtIsManaged((Widget) m_mainWidget))
XtManageChild((Widget) m_mainWidget);
return TRUE;
}
- Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWindowWidget(), "MenuBar", NULL, 0);
+ Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), "MenuBar", NULL, 0);
m_mainWidget = (WXWidget) menuBarW;
- int i;
- for (i = 0; i < GetMenuCount(); i++)
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
{
wxMenu *menu = GetMenu(i);
wxString title(m_titles[i]);
menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, title, TRUE));
- wxStripMenuCodes ((char*) (const char*) title, wxBuffer);
-
- if (strcmp (wxBuffer, "Help") == 0)
+ if (strcmp (wxStripMenuCodes(title), "Help") == 0)
XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
// tear off menu support
XtVaSetValues(GetWidget(menu),
XmNtearOffModel, XmTEAR_OFF_ENABLED,
NULL);
+ Widget tearOff = XmGetTearOffControl(GetWidget(menu));
+ wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour);
+ wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, TRUE);
#endif
}
}
SetForegroundColour(m_foregroundColour);
SetFont(m_font);
- XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
+ XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
XtRealizeWidget ((Widget) menuBarW);
XtManageChild ((Widget) menuBarW);
SetMenuBarFrame(parent);
XtUnmanageChild ((Widget) m_mainWidget);
XtUnrealizeWidget ((Widget) m_mainWidget);
- int i;
- for (i = 0; i < GetMenuCount(); i++)
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
{
wxMenu *menu = GetMenu(i);
menu->DestroyMenu(TRUE);
}
//// Motif-specific
-
-extern wxApp *wxTheApp;
static XtWorkProcId WorkProcMenuId;
/* Since PopupMenu under Motif stills grab right mouse button events
XtRemoveWorkProc(WorkProcMenuId);
wxMenu *menu = (wxMenu *)clientData;
- if (menu->GetMainWidget()) {
- if (menu->GetParent())
+ if (menu->GetMainWidget())
+ {
+ wxMenu *menuParent = menu->GetParent();
+ if ( menuParent )
{
- wxList& list = menu->GetParent()->GetItems();
- list.DeleteObject(menu);
+ wxMenuItemList::Node *node = menuParent->GetMenuItems().GetFirst();
+ while ( node )
+ {
+ if ( node->GetData()->GetSubMenu() == menu )
+ {
+ menuParent->GetMenuItems().DeleteNode(node);
+
+ break;
+ }
+
+ node = node->GetNext();
+ }
}
+
menu->DestroyMenu(TRUE);
}
- /* Mark as no longer popped up */
+
+ // Mark as no longer popped up
menu->m_menuId = -1;
+
return TRUE;
}
void
-wxMenuPopdownCallback(Widget w, XtPointer clientData,
- XtPointer ptr)
+wxMenuPopdownCallback(Widget WXUNUSED(w), XtPointer clientData,
+ XtPointer WXUNUSED(ptr))
{
wxMenu *menu = (wxMenu *)clientData;
menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2);
- XmString label_str = XmStringCreateSimple (wxBuffer);
- buttonWidget = XtVaCreateManagedWidget (wxBuffer,
+ wxString title2(wxStripMenuCodes(title));
+ wxXmString label_str(title2);
+ buttonWidget = XtVaCreateManagedWidget(title2,
#if wxUSE_GADGETS
xmCascadeButtonGadgetClass, (Widget) parent,
#else
xmCascadeButtonWidgetClass, (Widget) parent,
#endif
- XmNlabelString, label_str,
+ XmNlabelString, label_str(),
XmNsubMenuId, menu,
NULL);
if (mnem != 0)
XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL);
-
- XmStringFree (label_str);
}
m_menuWidget = (WXWidget) menu;
m_menuBar = menuBar;
m_topLevelMenu = topMenu;
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
{
- wxMenuItem *item = (wxMenuItem *) node->Data ();
- item->CreateItem (menu, menuBar, topMenu);
+ wxMenuItem *item = node->GetData();
+
+ item->CreateItem(menu, menuBar, topMenu);
}
SetBackgroundColour(m_backgroundColour);
// do a CreateMenu again.
void wxMenu::DestroyMenu (bool full)
{
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
{
- wxMenuItem *item = (wxMenuItem *) node->Data ();
+ wxMenuItem *item = node->GetData();
item->SetMenuBar((wxMenuBar*) NULL);
item->DestroyItem(full);
- }// for()
+ }
if (m_buttonWidget)
{
return m_buttonWidget;
}
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
{
- wxMenuItem *item = (wxMenuItem *) node->Data ();
+ wxMenuItem *item = node->GetData ();
if (item->GetId() == id)
{
if (it)
return w;
}
}
- }// for()
+ }
if (it)
*it = (wxMenuItem*) NULL;
if (m_buttonWidget)
wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE);
- wxNode* node = m_menuItems.First();
- while (node)
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
{
- wxMenuItem* item = (wxMenuItem*) node->Data();
+ wxMenuItem* item = node->GetData();
if (item->GetButtonWidget())
{
// This crashes because it uses gadgets
}
if (item->GetSubMenu())
item->GetSubMenu()->SetBackgroundColour((wxColour&) col);
- node = node->Next();
}
}
if (m_buttonWidget)
wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col);
- wxNode* node = m_menuItems.First();
- while (node)
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
{
- wxMenuItem* item = (wxMenuItem*) node->Data();
+ wxMenuItem* item = node->GetData();
if (item->GetButtonWidget())
{
// This crashes because it uses gadgets
}
if (item->GetSubMenu())
item->GetSubMenu()->SetForegroundColour((wxColour&) col);
- node = node->Next();
}
}
XmNfontList, fontList,
NULL);
}
- wxNode* node = m_menuItems.First();
- while (node)
+
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
{
- wxMenuItem* item = (wxMenuItem*) node->Data();
+ wxMenuItem* item = node->GetData();
if (m_menuWidget && item->GetButtonWidget() && m_font.Ok())
{
XtVaSetValues ((Widget) item->GetButtonWidget(),
}
if (item->GetSubMenu())
item->GetSubMenu()->ChangeFont(keepOriginalSize);
- node = node->Next();
}
#endif
}
ChangeFont();
}
-void wxMenuBar::SetBackgroundColour(const wxColour& col)
+bool wxMenuBar::SetBackgroundColour(const wxColour& col)
{
-
m_backgroundColour = col;
if (m_mainWidget)
wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col);
- int i;
- for (i = 0; i < m_menuCount; i++)
+
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
m_menus[i]->SetBackgroundColour((wxColour&) col);
+
+ return TRUE;
}
-void wxMenuBar::SetForegroundColour(const wxColour& col)
+bool wxMenuBar::SetForegroundColour(const wxColour& col)
{
m_foregroundColour = col;
if (m_mainWidget)
wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col);
- int i;
- for (i = 0; i < m_menuCount; i++)
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
m_menus[i]->SetForegroundColour((wxColour&) col);
+
+ return TRUE;
}
-void wxMenuBar::ChangeFont(bool keepOriginalSize)
+void wxMenuBar::ChangeFont(bool WXUNUSED(keepOriginalSize))
{
// Nothing to do for menubar, fonts are kept in wxMenus
}
-void wxMenuBar::SetFont(const wxFont& font)
+bool wxMenuBar::SetFont(const wxFont& font)
{
m_font = font;
ChangeFont();
- int i;
- for (i = 0; i < m_menuCount; i++)
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
m_menus[i]->SetFont(font);
+
+ return TRUE;
}
projects / wxWidgets.git / blobdiff