// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
-// 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/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>
-void wxMenuItemCallback (Widget w, XtPointer clientData,
- XtPointer ptr);
-void wxMenuItemArmCallback (Widget w, XtPointer clientData,
- XtPointer ptr);
-void wxMenuItemDisarmCallback (Widget w, XtPointer clientData,
- XtPointer ptr);
-
-#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)
-wxMenu::wxMenu(const wxString& title, const wxFunction func)
+void wxMenu::Init()
{
- m_title = title;
- m_parent = (wxEvtHandler*) NULL;
- m_eventHandler = this;
- m_noItems = 0;
- m_menuBar = NULL;
-
- //// 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_topMenu = (wxMenu*) NULL;
+ m_topLevelMenu = (wxMenu*) NULL;
m_ownedByMenuBar = FALSE;
- m_menuParent = (wxMenu*) NULL;
- if (m_title != "")
+ if ( !!m_title )
{
- Append(-2, m_title) ;
+ Append(wxID_SEPARATOR, m_title) ;
AppendSeparator() ;
}
- Callback(func);
-
- // TODO create menu
+ 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.
wxMenu::~wxMenu()
{
- // TODO destroy menu and children
-
- wxNode *node = m_menuItems.First();
- while (node)
+ if (m_menuWidget)
{
- wxMenuItem *item = (wxMenuItem *)node->Data();
-
- // Delete child menus.
- // Beware: they must not be appended to children list!!!
- // (because order of delete is significant)
- if (item->GetSubMenu())
- item->DeleteSubMenu();
+ if (m_menuParent)
+ DestroyMenu(TRUE);
+ else
+ DestroyMenu(FALSE);
+ }
- wxNode *next = node->Next();
- delete item;
- delete node;
- node = next;
+ // Not sure if this is right
+ if (m_menuParent && m_menuBar)
+ {
+ m_menuParent = NULL;
+ // m_menuBar = NULL;
}
}
void wxMenu::Break()
{
- // TODO
+ m_numColumns++;
}
// function appends a new item or submenu to the menu
-void wxMenu::Append(wxMenuItem *pItem)
+bool wxMenu::DoAppend(wxMenuItem *pItem)
{
- // TODO
-
- wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" );
+ if (m_menuWidget)
+ {
+ // this is a dynamic Append
+ pItem->CreateItem(m_menuWidget, m_menuBar, m_topLevelMenu);
+ }
- m_menuItems.Append(pItem);
+ if ( pItem->IsSubMenu() )
+ {
+ pItem->GetSubMenu()->m_topLevelMenu = m_topLevelMenu;
+ }
- m_noItems++;
+ return wxMenuBase::DoAppend(pItem);
}
-void wxMenu::AppendSeparator()
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{
- // TODO
- Append(new wxMenuItem(this, ID_SEPARATOR));
-}
+ item->DestroyItem(TRUE);
-// Pullright item
-void wxMenu::Append(int Id, const wxString& label, wxMenu *SubMenu,
- const wxString& helpString)
-{
- Append(new wxMenuItem(this, Id, label, helpString, FALSE, SubMenu));
+ return wxMenuBase::DoRemove(item);
}
-// Ordinary menu item
-void wxMenu::Append(int Id, const wxString& label,
- const wxString& helpString, bool checkable)
+bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- // 'checkable' parameter is useless for Windows.
- Append(new wxMenuItem(this, Id, label, helpString, checkable));
+ if ( !wxMenuBase::DoInsert(pos, item) )
+ return FALSE;
+
+ wxFAIL_MSG(wxT("not implemented"));
+
+ return FALSE;
}
-void wxMenu::Delete(int id)
+void wxMenu::SetTitle(const wxString& label)
{
- 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;
- }
+ m_title = label;
- if (!node)
- return;
+ wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ if ( !node )
+ return;
- m_menuItems.DeleteNode(node);
- delete item;
+ wxMenuItem *item = node->GetData ();
+ Widget widget = (Widget) item->GetButtonWidget();
+ if ( !widget )
+ return;
- // TODO
+ wxXmString title_str(label);
+ XtVaSetValues(widget,
+ XmNlabelString, title_str(),
+ NULL);
}
-void wxMenu::Enable(int Id, bool Flag)
+bool wxMenu::ProcessCommand(wxCommandEvent & event)
{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK_RET( item != NULL, "can't enable non-existing menu item" );
+ bool processed = FALSE;
- item->Enable(Flag);
-}
+#if wxUSE_MENU_CALLBACK
+ // Try a callback
+ if (m_callback)
+ {
+ (void) (*(m_callback)) (*this, event);
+ processed = TRUE;
+ }
+#endif // wxUSE_MENU_CALLBACK
-bool wxMenu::Enabled(int Id) const
-{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK( item != NULL, FALSE );
+ // Try the menu's event handler
+ if ( !processed && GetEventHandler())
+ {
+ processed = GetEventHandler()->ProcessEvent(event);
+ }
+ // Try the window the menu was popped up from (and up
+ // through the hierarchy)
+ if ( !processed && GetInvokingWindow())
+ processed = GetInvokingWindow()->ProcessEvent(event);
- return item->IsEnabled();
+ return processed;
}
-void wxMenu::Check(int Id, bool Flag)
-{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" );
+// ----------------------------------------------------------------------------
+// Menu Bar
+// ----------------------------------------------------------------------------
- item->Check(Flag);
+void wxMenuBar::Init()
+{
+ m_eventHandler = this;
+ m_menuBarFrame = NULL;
+ m_mainWidget = (WXWidget) NULL;
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
+ m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
}
-bool wxMenu::Checked(int Id) const
+wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
{
- wxMenuItem *item = FindItemForId(Id);
- wxCHECK( item != NULL, FALSE );
+ Init();
- return item->IsChecked();
+ for ( int i = 0; i < n; i++ )
+ {
+ m_menus.Append(menus[i]);
+ m_titles.Add(titles[i]);
+ }
}
-void wxMenu::SetTitle(const wxString& label)
+wxMenuBar::~wxMenuBar()
{
- m_title = label ;
- // TODO
+ // nothing to do: wxMenuBarBase will delete the menus
}
-const wxString wxMenu::GetTitle() const
+void wxMenuBar::EnableTop(size_t WXUNUSED(pos), bool WXUNUSED(flag))
{
- return m_title;
+ // wxFAIL_MSG("TODO");
+// wxLogWarning("wxMenuBar::EnableTop not yet implemented.");
}
-void wxMenu::SetLabel(int id, const wxString& label)
+void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
{
- wxMenuItem *item = FindItemForId(id) ;
- if (item==NULL)
+ wxMenu *menu = GetMenu(pos);
+ if ( !menu )
return;
- if (item->GetSubMenu()==NULL)
- {
- // TODO
- }
- else
+ Widget w = (Widget)menu->GetButtonWidget();
+ if (w)
{
- // TODO
- }
- item->SetName(label);
-}
+ wxXmString label_str(label);
-wxString wxMenu::GetLabel(int Id) const
-{
- // TODO
- return wxString("") ;
+ XtVaSetValues(w,
+ XmNlabelString, label_str(),
+ NULL);
+ }
}
-// Finds the item id matching the given string, -1 if not found.
-int wxMenu::FindItem (const wxString& itemString) const
+wxString wxMenuBar::GetLabelTop(size_t pos) const
{
- char buf1[200];
- char buf2[200];
- wxStripMenuCodes ((char *)(const char *)itemString, buf1);
+ wxString str;
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+ wxMenu *menu = GetMenu(pos);
+ if ( menu )
{
- 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();
- }
+ Widget w = (Widget)menu->GetButtonWidget();
+ if (w)
+ {
+ XmString text;
+ XtVaGetValues(w,
+ XmNlabelString, &text,
+ NULL);
+
+ char *s;
+ if ( XmStringGetLtoR(text, XmSTRING_DEFAULT_CHARSET, &s) )
+ {
+ str = s;
+
+ XtFree(s);
+ }
+ }
}
- return -1;
+ return str;
}
-wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
+bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
{
- if (itemMenu)
- *itemMenu = NULL;
- for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+ wxCHECK_MSG( menu, FALSE, wxT("invalid menu") );
+ wxCHECK_MSG( !menu->GetParent() && !menu->GetButtonWidget(), FALSE,
+ wxT("menu already appended") );
+
+ if ( m_menuBarFrame )
{
- wxMenuItem *item = (wxMenuItem *) node->Data ();
+ WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE);
+ wxCHECK_MSG( w, FALSE, wxT("failed to create menu") );
+ menu->SetButtonWidget(w);
+ }
- if (item->GetId() == itemId)
- {
- if (itemMenu)
- *itemMenu = (wxMenu *) this;
- return item;
- }
+ //menu->SetMenuBar(this);
- if (item->GetSubMenu())
- {
- wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu);
- if (ans)
- return ans;
- }
- }
+ m_titles.Add(title);
- if (itemMenu)
- *itemMenu = NULL;
- return NULL;
+ return wxMenuBarBase::Append(menu, title);
}
-void wxMenu::SetHelpString(int itemId, const wxString& helpString)
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
{
- wxMenuItem *item = FindItemForId (itemId);
- if (item)
- item->SetHelp(helpString);
-}
+ if ( !wxMenuBarBase::Insert(pos, menu, title) )
+ return FALSE;
-wxString wxMenu::GetHelpString (int itemId) const
-{
- wxMenuItem *item = FindItemForId (itemId);
- wxString str("");
- return (item == NULL) ? str : item->GetHelp();
+ wxFAIL_MSG(wxT("TODO"));
+
+ return FALSE;
}
-void wxMenu::ProcessCommand(wxCommandEvent & event)
+wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
{
- bool processed = FALSE;
+ if ( !wxMenuBarBase::Replace(pos, menu, title) )
+ return FALSE;
- // Try a callback
- if (m_callback)
- {
- (void) (*(m_callback)) (*this, event);
- processed = TRUE;
- }
+ wxFAIL_MSG(wxT("TODO"));
- // Try the menu's event handler
- if ( !processed && GetEventHandler())
- {
- processed = GetEventHandler()->ProcessEvent(event);
- }
-/* TODO
- // Try the window the menu was popped up from (and up
- // through the hierarchy)
- if ( !processed && GetInvokingWindow())
- processed = GetInvokingWindow()->ProcessEvent(event);
-*/
+ return NULL;
}
-bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
+wxMenu *wxMenuBar::Remove(size_t pos)
{
- // TODO
- return FALSE;
-}
+ wxMenu *menu = wxMenuBarBase::Remove(pos);
+ if ( !menu )
+ return NULL;
-// Menu Bar
-wxMenuBar::wxMenuBar()
-{
- m_eventHandler = this;
- m_menuCount = 0;
- m_menus = NULL;
- m_titles = NULL;
- m_menuBarFrame = NULL;
+ if ( m_menuBarFrame )
+ menu->DestroyMenu(TRUE);
- // TODO
-}
+ menu->SetMenuBar(NULL);
-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_titles.Remove(pos);
- // TODO
+ return menu;
}
-wxMenuBar::~wxMenuBar()
+// Find the menu menuString, item itemString, and return the item id.
+// Returns -1 if none found.
+int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const
{
- int i;
- for (i = 0; i < m_menuCount; i++)
+ char buf1[200];
+ char buf2[200];
+ wxStripMenuCodes ((char *)(const char *)menuString, buf1);
+
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
{
- delete m_menus[i];
+ wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2);
+ if (strcmp (buf1, buf2) == 0)
+ return m_menus[i]->FindItem (itemString);
}
- delete[] m_menus;
- delete[] m_titles;
-
- // TODO
+ return -1;
}
-// 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)
+wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
- return;
+ if (itemMenu)
+ *itemMenu = NULL;
- // TODO
+ wxMenuItem *item = NULL;
+ 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::EnableTop(int pos, bool flag)
+// Create menubar
+bool wxMenuBar::CreateMenuBar(wxFrame* parent)
{
- // TODO
-}
+ if (m_mainWidget)
+ {
+ XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
+ /*
+ if (!XtIsManaged((Widget) m_mainWidget))
+ XtManageChild((Widget) m_mainWidget);
+ */
+ XtMapWidget((Widget) m_mainWidget);
+ return TRUE;
+ }
-// Must only be used AFTER menu has been attached to frame,
-// otherwise use individual menus
-void wxMenuBar::Check(int id, bool flag)
-{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
- return;
+ Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), "MenuBar", NULL, 0);
+ m_mainWidget = (WXWidget) menuBarW;
- if (!item->IsCheckable())
- return ;
+ 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));
- // TODO
-}
+ if (strcmp (wxStripMenuCodes(title), "Help") == 0)
+ XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
-bool wxMenuBar::Checked(int id) const
-{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
- return FALSE;
+ // tear off menu support
+#if (XmVersion >= 1002)
+ if ( menu->IsTearOff() )
+ {
+ 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
+ }
+ }
- // TODO
- return FALSE;
+ SetBackgroundColour(m_backgroundColour);
+ SetForegroundColour(m_foregroundColour);
+ SetFont(m_font);
+
+ XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
+ XtRealizeWidget ((Widget) menuBarW);
+ XtManageChild ((Widget) menuBarW);
+ SetMenuBarFrame(parent);
+
+ return TRUE;
}
-bool wxMenuBar::Enabled(int id) const
+// Destroy menubar, but keep data structures intact so we can recreate it.
+bool wxMenuBar::DestroyMenuBar()
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
- if (!item)
+ if (!m_mainWidget)
+ {
+ SetMenuBarFrame((wxFrame*) NULL);
return FALSE;
+ }
- // TODO
- return FALSE ;
-}
+ XtUnmanageChild ((Widget) m_mainWidget);
+ XtUnrealizeWidget ((Widget) m_mainWidget);
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
+ {
+ wxMenu *menu = GetMenu(i);
+ menu->DestroyMenu(TRUE);
-void wxMenuBar::SetLabel(int id, const wxString& label)
-{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
+ }
+ XtDestroyWidget((Widget) m_mainWidget);
+ m_mainWidget = (WXWidget) 0;
- if (!item)
- return;
+ SetMenuBarFrame((wxFrame*) NULL);
- // TODO
+ return TRUE;
}
-wxString wxMenuBar::GetLabel(int id) const
+//// 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 )
{
- wxMenu *itemMenu = NULL;
- wxMenuItem *item = FindItemForId(id, &itemMenu) ;
+ XtRemoveWorkProc(WorkProcMenuId);
+ wxMenu *menu = (wxMenu *)clientData;
- if (!item)
- return wxString("");
+ if (menu->GetMainWidget())
+ {
+ wxMenu *menuParent = menu->GetParent();
+ if ( menuParent )
+ {
+ wxMenuItemList::Node *node = menuParent->GetMenuItems().GetFirst();
+ while ( node )
+ {
+ if ( node->GetData()->GetSubMenu() == menu )
+ {
+ menuParent->GetMenuItems().DeleteNode(node);
+
+ break;
+ }
+
+ node = node->GetNext();
+ }
+ }
- // TODO
- return wxString("") ;
-}
+ menu->DestroyMenu(TRUE);
+ }
-void wxMenuBar::SetLabelTop(int pos, const wxString& label)
-{
- // TODO
-}
+ // Mark as no longer popped up
+ menu->m_menuId = -1;
-wxString wxMenuBar::GetLabelTop(int pos) const
-{
- // TODO
- return wxString("");
+ return TRUE;
}
-bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos)
+void
+wxMenuPopdownCallback(Widget WXUNUSED(w), XtPointer clientData,
+ XtPointer WXUNUSED(ptr))
{
- // TODO
- return FALSE;
-}
+ wxMenu *menu = (wxMenu *)clientData;
-bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title)
-{
- // TODO
- return FALSE;
+ // 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!! :(
+ */
+
+ WorkProcMenuId = XtAppAddWorkProc(
+ (XtAppContext) wxTheApp->GetAppContext(),
+ (XtWorkProc) PostDeletionOfMenu,
+ (XtPointer) menu );
+ // Apparently not found in Motif headers
+ // XtVaSetValues( w, XmNpopupEnabled, XmPOPUP_DISABLED, NULL );
}
-void wxMenuBar::Append (wxMenu * menu, const wxString& title)
+/*
+* Create a popup or pulldown menu.
+* Submenus of a popup will be pulldown.
+*
+*/
+
+WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topMenu, const wxString& title, bool pullDown)
{
- if (!OnAppend(menu, title))
- return;
+ Widget menu = (Widget) 0;
+ Widget buttonWidget = (Widget) 0;
+ Arg args[5];
+ XtSetArg (args[0], XmNnumColumns, m_numColumns);
+ XtSetArg (args[1], XmNpacking, XmPACK_COLUMN);
- 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 (!pullDown)
+ {
+ menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2);
+ XtAddCallback(menu,
+ XmNunmapCallback,
+ (XtCallbackProc)wxMenuPopdownCallback,
+ (XtPointer)this);
+ }
+ else
+ {
+ char mnem = wxFindMnemonic (title);
+ wxStripMenuCodes ((char*) (const char*) title, wxBuffer);
+
+ menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2);
+
+ 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(),
+ XmNsubMenuId, menu,
+ NULL);
+
+ if (mnem != 0)
+ XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL);
}
- if (m_menus)
+
+ m_menuWidget = (WXWidget) menu;
+
+ m_menuBar = menuBar;
+ m_topLevelMenu = topMenu;
+
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
{
- delete[]m_menus;
- delete[]m_titles;
+ wxMenuItem *item = node->GetData();
+
+ item->CreateItem(menu, menuBar, topMenu);
}
- m_menus = new_menus;
- m_titles = new_titles;
- m_menus[m_menuCount - 1] = (wxMenu *)menu;
- m_titles[m_menuCount - 1] = title;
+ SetBackgroundColour(m_backgroundColour);
+ SetForegroundColour(m_foregroundColour);
+ SetFont(m_font);
- // TODO
+ return buttonWidget;
}
-void wxMenuBar::Delete(wxMenu * menu, int i)
+// Destroys the Motif implementation of the menu,
+// but maintains the wxWindows data structures so we can
+// do a CreateMenu again.
+void wxMenu::DestroyMenu (bool full)
{
- int j;
- int ii = (int) i;
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
+ {
+ wxMenuItem *item = node->GetData();
+ item->SetMenuBar((wxMenuBar*) NULL);
+
+ item->DestroyItem(full);
+ }
- if (menu != 0)
+ if (m_buttonWidget)
{
- for (ii = 0; ii < m_menuCount; ii++)
+ if (full)
{
- if (m_menus[ii] == menu)
- break;
- }
- if (ii >= m_menuCount)
- return;
- } else
+ XtVaSetValues((Widget) m_buttonWidget, XmNsubMenuId, NULL, NULL);
+ XtDestroyWidget ((Widget) m_buttonWidget);
+ m_buttonWidget = (WXWidget) 0;
+ }
+ }
+ if (m_menuWidget && full)
{
- if (ii < 0 || ii >= m_menuCount)
- return;
- menu = m_menus[ii];
+ XtDestroyWidget((Widget) m_menuWidget);
+ m_menuWidget = (WXWidget) NULL;
}
+}
- if (!OnDelete(menu, ii))
- return;
-
- menu->SetParent(NULL);
+WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
+{
+ if (id == m_menuId)
+ {
+ if (it)
+ *it = (wxMenuItem*) NULL;
+ return m_buttonWidget;
+ }
- -- m_menuCount;
- for (j = ii; j < m_menuCount; j++)
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
{
- m_menus[j] = m_menus[j + 1];
- m_titles[j] = m_titles[j + 1];
+ wxMenuItem *item = node->GetData ();
+ if (item->GetId() == id)
+ {
+ if (it)
+ *it = item;
+ return item->GetButtonWidget();
+ }
+
+ if (item->GetSubMenu())
+ {
+ WXWidget w = item->GetSubMenu()->FindMenuItem (id, it);
+ if (w)
+ {
+ return w;
+ }
+ }
}
+
+ if (it)
+ *it = (wxMenuItem*) NULL;
+ return (WXWidget) NULL;
}
-// Find the menu menuString, item itemString, and return the item id.
-// Returns -1 if none found.
-int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const
+void wxMenu::SetBackgroundColour(const wxColour& col)
{
- char buf1[200];
- char buf2[200];
- wxStripMenuCodes ((char *)(const char *)menuString, buf1);
- int i;
- for (i = 0; i < m_menuCount; i++)
+ m_backgroundColour = col;
+ if (m_menuWidget)
+ wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
+ if (m_buttonWidget)
+ wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE);
+
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
{
- wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2);
- if (strcmp (buf1, buf2) == 0)
- return m_menus[i]->FindItem (itemString);
+ wxMenuItem* item = node->GetData();
+ if (item->GetButtonWidget())
+ {
+ // This crashes because it uses gadgets
+ // wxDoChangeBackgroundColour(item->GetButtonWidget(), (wxColour&) col, TRUE);
+ }
+ if (item->GetSubMenu())
+ item->GetSubMenu()->SetBackgroundColour((wxColour&) col);
}
- return -1;
}
-wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const
+void wxMenu::SetForegroundColour(const wxColour& col)
{
- if (itemMenu)
- *itemMenu = NULL;
+ m_foregroundColour = col;
+ if (m_menuWidget)
+ wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);
+ if (m_buttonWidget)
+ wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col);
- wxMenuItem *item = NULL;
- int i;
- for (i = 0; i < m_menuCount; i++)
- if ((item = m_menus[i]->FindItemForId (Id, itemMenu)))
- return item;
- return NULL;
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
+ {
+ wxMenuItem* item = node->GetData();
+ if (item->GetButtonWidget())
+ {
+ // This crashes because it uses gadgets
+ // wxDoChangeForegroundColour(item->GetButtonWidget(), (wxColour&) col);
+ }
+ if (item->GetSubMenu())
+ item->GetSubMenu()->SetForegroundColour((wxColour&) col);
+ }
}
-void wxMenuBar::SetHelpString (int Id, const wxString& helpString)
+void wxMenu::ChangeFont(bool keepOriginalSize)
{
- int i;
- for (i = 0; i < m_menuCount; i++)
+ // lesstif 0.87 hangs when setting XmNfontList
+#ifndef LESSTIF_VERSION
+ if (!m_font.Ok() || !m_menuWidget)
+ return;
+
+ XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_menuWidget));
+
+ XtVaSetValues ((Widget) m_menuWidget,
+ XmNfontList, fontList,
+ NULL);
+ if (m_buttonWidget)
+ {
+ XtVaSetValues ((Widget) m_buttonWidget,
+ XmNfontList, fontList,
+ NULL);
+ }
+
+ for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ node;
+ node = node->GetNext() )
{
- if (m_menus[i]->FindItemForId (Id))
+ wxMenuItem* item = node->GetData();
+ if (m_menuWidget && item->GetButtonWidget() && m_font.Ok())
{
- m_menus[i]->SetHelpString (Id, helpString);
- return;
+ XtVaSetValues ((Widget) item->GetButtonWidget(),
+ XmNfontList, fontList,
+ NULL);
}
+ if (item->GetSubMenu())
+ item->GetSubMenu()->ChangeFont(keepOriginalSize);
}
+#endif
}
-wxString wxMenuBar::GetHelpString (int Id) const
+void wxMenu::SetFont(const wxFont& font)
{
- int i;
- for (i = 0; i < m_menuCount; i++)
- {
- if (m_menus[i]->FindItemForId (Id))
- return wxString(m_menus[i]->GetHelpString (Id));
- }
- return wxString("");
+ m_font = font;
+ ChangeFont();
}
+bool wxMenuBar::SetBackgroundColour(const wxColour& col)
+{
+ m_backgroundColour = col;
+ if (m_mainWidget)
+ wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col);
+
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
+ m_menus[i]->SetBackgroundColour((wxColour&) col);
+
+ return TRUE;
+}
+
+bool wxMenuBar::SetForegroundColour(const wxColour& col)
+{
+ m_foregroundColour = col;
+ if (m_mainWidget)
+ wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col);
+
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
+ m_menus[i]->SetForegroundColour((wxColour&) col);
+
+ return TRUE;
+}
+
+void wxMenuBar::ChangeFont(bool WXUNUSED(keepOriginalSize))
+{
+ // Nothing to do for menubar, fonts are kept in wxMenus
+}
+
+bool wxMenuBar::SetFont(const wxFont& font)
+{
+ m_font = font;
+ ChangeFont();
+
+ size_t menuCount = GetMenuCount();
+ for (size_t i = 0; i < menuCount; i++)
+ m_menus[i]->SetFont(font);
+
+ return TRUE;
+}
projects / wxWidgets.git / blobdiff