/////////////////////////////////////////////////////////////////////////////
-// Name: menu.cpp
+// Name: src/motif/menu.cpp
// Purpose: wxMenu, wxMenuBar, wxMenuItem
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
// ============================================================================
// declarations
// ============================================================================
-#ifdef __GNUG__
- #pragma implementation "menu.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/menu.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/frame.h"
+ #include "wx/settings.h"
+#endif
+
#include "wx/menuitem.h"
-#include "wx/log.h"
-#include "wx/utils.h"
-#include "wx/app.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
// ----------------------------------------------------------------------------
// 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_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_buttonWidget = (WXWidget) NULL;
m_menuId = 0;
m_topLevelMenu = (wxMenu*) NULL;
- m_ownedByMenuBar = FALSE;
- m_menuParent = (wxMenu*) NULL;
- m_clientData = (void*) NULL;
+ m_ownedByMenuBar = false;
- if (m_title != "")
+ if ( !m_title.empty() )
{
- Append(ID_SEPARATOR, m_title) ;
+ Append(-3, 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
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
+ m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
}
// The wxWindow destructor will take care of deleting the submenus.
if (m_menuWidget)
{
if (m_menuParent)
- DestroyMenu(TRUE);
+ DestroyMenu(true);
else
- DestroyMenu(FALSE);
+ DestroyMenu(false);
}
// Not sure if this is right
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)
+wxMenuItem* 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++;
+ return DoInsert(GetMenuItemCount(), pItem);
}
-void wxMenu::AppendSeparator()
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{
- 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?
+ item->DestroyItem(true);
-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));
+ return wxMenuBase::DoRemove(item);
}
-void wxMenu::Delete(int id)
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- wxNode *node;
- wxMenuItem *item;
- int pos;
-
- for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++)
+ if (m_menuWidget)
{
- item = (wxMenuItem *)node->Data();
- if (item->GetId() == id)
- break;
+ // this is a dynamic Append
+#ifndef XmNpositionIndex
+ wxCHECK_MSG( pos == GetMenuItemCount(), -1, wxT("insert not implemented"));
+#endif
+ item->CreateItem(m_menuWidget, GetMenuBar(), m_topLevelMenu, pos);
}
- 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 ( item->IsSubMenu() )
+ {
+ item->GetSubMenu()->m_topLevelMenu = m_topLevelMenu;
}
- */
-
- m_menuItems.DeleteNode(node);
- delete item;
-}
-
-void wxMenu::Enable(int id, bool flag)
-{
- 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 );
-
- return item->IsEnabled();
-}
-
-void wxMenu::Check(int Id, bool Flag)
-{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" );
-
- item->Check(Flag);
-}
-bool wxMenu::Checked(int id) const
-{
- wxMenuItem *item = FindItemForId(id);
- wxCHECK( item != NULL, FALSE );
-
- return item->IsChecked();
+ return pos == GetMenuItemCount() ? wxMenuBase::DoAppend(item) :
+ wxMenuBase::DoInsert(pos, item);
}
void wxMenu::SetTitle(const wxString& label)
{
- m_title = label ;
+ m_title = label;
- wxNode *node = m_menuItems.First ();
- if (!node)
+ wxMenuItemList::compatibility_iterator 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?
-}
-
-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->SetText(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);
+ wxXmString title_str(label);
+ XtVaSetValues(widget,
+ XmNlabelString, title_str(),
+ NULL);
}
-wxString wxMenu::GetHelpString (int itemId) const
+bool wxMenu::ProcessCommand(wxCommandEvent & event)
{
- wxMenuItem *item = FindItemForId (itemId);
- wxString str("");
- return (item == NULL) ? str : item->GetHelp();
-}
-
-void wxMenu::ProcessCommand(wxCommandEvent & event)
-{
- bool processed = FALSE;
-
- // Try a callback
- if (m_callback)
- {
- (void) (*(m_callback)) (*this, event);
- processed = TRUE;
- }
+ bool processed = false;
// 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);
-}
-
-// 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();
- }
+ processed = GetInvokingWindow()->ProcessEvent(event);
+
+ return processed;
}
// ----------------------------------------------------------------------------
m_eventHandler = this;
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);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
+ m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
}
-wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style))
{
+ wxASSERT( n == titles.GetCount() );
+
Init();
- for ( int i = 0; i < n; i++ )
+ m_titles = titles;
+ for ( size_t i = 0; i < n; i++ )
+ m_menus.Append(menus[i]);
+}
+
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WXUNUSED(style))
+{
+ Init();
+
+ for ( size_t i = 0; i < n; i++ )
{
m_menus.Append(menus[i]);
m_titles.Add(titles[i]);
void wxMenuBar::EnableTop(size_t WXUNUSED(pos), bool WXUNUSED(flag))
{
- wxFAIL_MSG("TODO");
+ // wxFAIL_MSG("TODO");
+// wxLogWarning("wxMenuBar::EnableTop not yet implemented.");
}
void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
wxString wxMenuBar::GetLabelTop(size_t pos) const
{
- wxString str;
-
wxMenu *menu = GetMenu(pos);
if ( menu )
{
XmNlabelString, &text,
NULL);
- char *s;
- if ( XmStringGetLtoR(text, XmSTRING_DEFAULT_CHARSET, &s) )
- {
- str = s;
-
- XtFree(s);
- }
+ return wxXmStringToString( text );
}
}
- return str;
+ return wxEmptyString;
}
bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
{
- wxCHECK_MSG( menu, FALSE, wxT("invalid menu") );
- wxCHECK_MSG( !menu->GetParent() && !menu->GetButtonWidget(), FALSE,
+ return Insert(GetMenuCount(), menu, title);
+}
+
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
+{
+ wxCHECK_MSG( pos <= GetMenuCount(), false, wxT("invalid position") );
+ wxCHECK_MSG( menu, false, wxT("invalid menu") );
+ wxCHECK_MSG( !menu->GetParent() && !menu->GetButtonWidget(), false,
wxT("menu already appended") );
if ( m_menuBarFrame )
{
- WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE);
- wxCHECK_MSG( w, FALSE, wxT("failed to create menu") );
+ WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu,
+ pos, title, true);
+ wxCHECK_MSG( w, false, wxT("failed to create menu") );
menu->SetButtonWidget(w);
}
- menu->SetMenuBar(this);
-
- m_titles.Add(title);
-
- return wxMenuBarBase::Append(menu, title);
-}
-
-bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
-{
- if ( !wxMenuBarBase::Insert(pos, menu, title) )
- return FALSE;
-
- wxFAIL_MSG(wxT("TODO"));
+ m_titles.Insert(title, pos);
- return FALSE;
+ return wxMenuBarBase::Insert(pos, menu, title);
}
wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
{
if ( !wxMenuBarBase::Replace(pos, menu, title) )
- return FALSE;
+ return NULL;
wxFAIL_MSG(wxT("TODO"));
return NULL;
if ( m_menuBarFrame )
- menu->DestroyMenu(TRUE);
+ menu->DestroyMenu(true);
menu->SetMenuBar(NULL);
- m_titles.Remove(pos);
+ m_titles.RemoveAt(pos);
return menu;
}
{
char buf1[200];
char buf2[200];
- wxStripMenuCodes ((char *)(const char *)menuString, buf1);
+ wxStripMenuCodes (wxConstCast(menuString.c_str(), char), buf1);
size_t menuCount = GetMenuCount();
for (size_t i = 0; i < menuCount; i++)
{
- wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2);
+ wxStripMenuCodes (wxConstCast(m_titles[i].c_str(), char), buf2);
if (strcmp (buf1, buf2) == 0)
- return m_menus[i]->FindItem (itemString);
+ return m_menus.Item(i)->GetData()->FindItem (itemString);
}
return -1;
}
if (itemMenu)
*itemMenu = NULL;
- wxMenuItem *item = NULL;
size_t menuCount = GetMenuCount();
for (size_t i = 0; i < menuCount; i++)
- if ((item = m_menus[i]->FindItemForId (id, itemMenu)))
- return item;
- return NULL;
+ {
+ wxMenuItem *item = m_menus.Item(i)->GetData()->FindItem(id, itemMenu);
+ if (item) return item;
+ }
+
+ return NULL;
}
// Create menubar
{
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);
*/
XtMapWidget((Widget) m_mainWidget);
- return TRUE;
+ return true;
}
- Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWindowWidget(), "MenuBar", NULL, 0);
+ Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(),
+ wxMOTIF_STR("MenuBar"), NULL, 0);
m_mainWidget = (WXWidget) menuBarW;
size_t menuCount = GetMenuCount();
{
wxMenu *menu = GetMenu(i);
wxString title(m_titles[i]);
- menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, title, TRUE));
+ menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, i, title, true));
if (strcmp (wxStripMenuCodes(title), "Help") == 0)
XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
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);
- return TRUE;
+ return true;
}
// Destroy menubar, but keep data structures intact so we can recreate it.
if (!m_mainWidget)
{
SetMenuBarFrame((wxFrame*) NULL);
- return FALSE;
+ return false;
}
XtUnmanageChild ((Widget) m_mainWidget);
for (size_t i = 0; i < menuCount; i++)
{
wxMenu *menu = GetMenu(i);
- menu->DestroyMenu(TRUE);
+ menu->DestroyMenu(true);
}
XtDestroyWidget((Widget) m_mainWidget);
SetMenuBarFrame((wxFrame*) NULL);
- return TRUE;
+ return true;
}
-//// Motif-specific
-static XtWorkProcId WorkProcMenuId;
-
-/* Since PopupMenu under Motif stills grab right mouse button events
-* after it was closed, we need to delete the associated widgets to
-* allow next PopUpMenu to appear...
-*/
-
-int PostDeletionOfMenu( XtPointer* clientData )
+// Since PopupMenu under Motif stills grab right mouse button events
+// after it was closed, we need to delete the associated widgets to
+// allow next PopUpMenu to appear...
+void wxMenu::DestroyWidgetAndDetach()
{
- XtRemoveWorkProc(WorkProcMenuId);
- wxMenu *menu = (wxMenu *)clientData;
-
- if (menu->GetMainWidget()) {
- if (menu->GetParent())
+ if (GetMainWidget())
+ {
+ wxMenu *menuParent = GetParent();
+ if ( menuParent )
{
- wxList& list = menu->GetParent()->GetItems();
- list.DeleteObject(menu);
- }
- menu->DestroyMenu(TRUE);
- }
- /* Mark as no longer popped up */
- menu->m_menuId = -1;
- return TRUE;
-}
+ wxMenuItemList::compatibility_iterator node = menuParent->GetMenuItems().GetFirst();
+ while ( node )
+ {
+ if ( node->GetData()->GetSubMenu() == this )
+ {
+ delete node->GetData();
+ menuParent->GetMenuItems().Erase(node);
-void
-wxMenuPopdownCallback(Widget WXUNUSED(w), XtPointer clientData,
- XtPointer WXUNUSED(ptr))
-{
- wxMenu *menu = (wxMenu *)clientData;
+ break;
+ }
+
+ node = node->GetNext();
+ }
+ }
- // Added by JOREL Jean-Charles <jjorel@silr.ireste.fr>
- /* Since Callbacks of MenuItems are not yet processed, we put a
- * background job which will be done when system will be idle.
- * What awful hack!! :(
- */
+ DestroyMenu(true);
+ }
- WorkProcMenuId = XtAppAddWorkProc(
- (XtAppContext) wxTheApp->GetAppContext(),
- (XtWorkProc) PostDeletionOfMenu,
- (XtPointer) menu );
- // Apparently not found in Motif headers
- // XtVaSetValues( w, XmNpopupEnabled, XmPOPUP_DISABLED, NULL );
+ // Mark as no longer popped up
+ m_menuId = -1;
}
/*
*
*/
-WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topMenu, const wxString& title, bool pullDown)
+WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
+ WXWidget parent,
+ wxMenu * topMenu,
+ size_t WXUNUSED(index),
+ const wxString& title,
+ bool pullDown)
{
Widget menu = (Widget) 0;
Widget buttonWidget = (Widget) 0;
Arg args[5];
XtSetArg (args[0], XmNnumColumns, m_numColumns);
- XtSetArg (args[1], XmNpacking, XmPACK_COLUMN);
+ XtSetArg (args[1], XmNpacking, (m_numColumns > 1) ? XmPACK_COLUMN : XmPACK_TIGHT);
if (!pullDown)
{
- menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2);
+ menu = XmCreatePopupMenu ((Widget) parent, wxMOTIF_STR("popup"), args, 2);
+#if 0
XtAddCallback(menu,
XmNunmapCallback,
(XtCallbackProc)wxMenuPopdownCallback,
(XtPointer)this);
+#endif
}
else
{
char mnem = wxFindMnemonic (title);
- wxStripMenuCodes ((char*) (const char*) title, wxBuffer);
-
- menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2);
+ menu = XmCreatePulldownMenu ((Widget) parent, wxMOTIF_STR("pulldown"), args, 2);
wxString title2(wxStripMenuCodes(title));
wxXmString label_str(title2);
m_menuWidget = (WXWidget) menu;
- m_menuBar = menuBar;
m_topLevelMenu = topMenu;
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+ size_t i = 0;
+ for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext(), ++i )
{
- wxMenuItem *item = (wxMenuItem *) node->Data ();
- item->CreateItem (menu, menuBar, topMenu);
+ wxMenuItem *item = node->GetData();
+
+ item->CreateItem(menu, menuBar, topMenu, i);
}
SetBackgroundColour(m_backgroundColour);
}
// Destroys the Motif implementation of the menu,
-// but maintains the wxWindows data structures so we can
+// but maintains the wxWidgets data structures so we can
// do a CreateMenu again.
void wxMenu::DestroyMenu (bool full)
{
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+ for ( wxMenuItemList::compatibility_iterator 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::compatibility_iterator 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_menuWidget)
wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
if (m_buttonWidget)
- wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE);
+ wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, true);
- wxNode* node = m_menuItems.First();
- while (node)
+ for ( wxMenuItemList::compatibility_iterator 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
- // wxDoChangeBackgroundColour(item->GetButtonWidget(), (wxColour&) col, TRUE);
+ // wxDoChangeBackgroundColour(item->GetButtonWidget(), (wxColour&) col, true);
}
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::compatibility_iterator 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();
}
}
void wxMenu::ChangeFont(bool keepOriginalSize)
{
- // lesstif 0.87 hangs when setting XmNfontList
-#ifndef LESSTIF_VERSION
+ // Lesstif 0.87 hangs here, but 0.93 does not; MBN: sometimes it does
+#if !wxCHECK_LESSTIF() // || wxCHECK_LESSTIF_VERSION( 0, 93 )
if (!m_font.Ok() || !m_menuWidget)
return;
- XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_menuWidget));
+ Display* dpy = XtDisplay((Widget) m_menuWidget);
XtVaSetValues ((Widget) m_menuWidget,
- XmNfontList, fontList,
- NULL);
+ wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ NULL);
if (m_buttonWidget)
{
XtVaSetValues ((Widget) m_buttonWidget,
- XmNfontList, fontList,
- NULL);
+ wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ NULL);
}
- wxNode* node = m_menuItems.First();
- while (node)
+
+ for ( wxMenuItemList::compatibility_iterator 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(),
- XmNfontList, fontList,
- NULL);
+ wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ NULL);
}
if (item->GetSubMenu())
item->GetSubMenu()->ChangeFont(keepOriginalSize);
- node = node->Next();
}
+#else
+ wxUnusedVar(keepOriginalSize);
#endif
}
size_t menuCount = GetMenuCount();
for (size_t i = 0; i < menuCount; i++)
- m_menus[i]->SetBackgroundColour((wxColour&) col);
+ m_menus.Item(i)->GetData()->SetBackgroundColour((wxColour&) col);
- return TRUE;
+ return true;
}
bool wxMenuBar::SetForegroundColour(const wxColour& col)
size_t menuCount = GetMenuCount();
for (size_t i = 0; i < menuCount; i++)
- m_menus[i]->SetForegroundColour((wxColour&) col);
+ m_menus.Item(i)->GetData()->SetForegroundColour((wxColour&) col);
- return TRUE;
+ return true;
}
void wxMenuBar::ChangeFont(bool WXUNUSED(keepOriginalSize))
size_t menuCount = GetMenuCount();
for (size_t i = 0; i < menuCount; i++)
- m_menus[i]->SetFont(font);
+ m_menus.Item(i)->GetData()->SetFont(font);
- return TRUE;
+ return true;
}
-
projects / wxWidgets.git / blobdiff