/////////////////////////////////////////////////////////////////////////////
-// 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"
-#include "wx/menuitem.h"
-#include "wx/log.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/frame.h"
-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/frame.h"
+ #include "wx/settings.h"
+ #include "wx/menuitem.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
// other standard headers
#include <string.h>
-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-
// ============================================================================
// implementation
// ============================================================================
m_popupShell = (WXWidget) NULL;
m_buttonWidget = (WXWidget) NULL;
m_menuId = 0;
- m_topLevelMenu = (wxMenu*) NULL;
- m_ownedByMenuBar = FALSE;
+ m_topLevelMenu = NULL;
+ m_ownedByMenuBar = false;
- if ( !!m_title )
+ if ( !m_title.empty() )
{
- Append(wxID_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);
}
// 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
}
// function appends a new item or submenu to the menu
-bool wxMenu::DoAppend(wxMenuItem *pItem)
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *pItem)
{
- if (m_menuWidget)
- {
- // this is a dynamic Append
- pItem->CreateItem(m_menuWidget, m_menuBar, m_topLevelMenu);
- }
-
- if ( pItem->IsSubMenu() )
- {
- pItem->GetSubMenu()->m_topLevelMenu = m_topLevelMenu;
- }
-
- return wxMenuBase::DoAppend(pItem);
+ return DoInsert(GetMenuItemCount(), pItem);
}
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{
- item->DestroyItem(TRUE);
+ item->DestroyItem(true);
return wxMenuBase::DoRemove(item);
}
-bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- if ( !wxMenuBase::DoInsert(pos, item) )
- return FALSE;
+ if (m_menuWidget)
+ {
+ // 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);
+ }
- wxFAIL_MSG(wxT("not implemented"));
+ if ( item->IsSubMenu() )
+ {
+ item->GetSubMenu()->m_topLevelMenu = m_topLevelMenu;
+ }
- return FALSE;
+ return pos == GetMenuItemCount() ? wxMenuBase::DoAppend(item) :
+ wxMenuBase::DoInsert(pos, item);
}
void wxMenu::SetTitle(const wxString& label)
{
m_title = label;
- wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
if ( !node )
return;
bool wxMenu::ProcessCommand(wxCommandEvent & event)
{
- bool processed = FALSE;
+ // Try the menu's event handler first
+ wxEvtHandler * const handler = GetEventHandler();
+ bool processed = handler ? handler->SafelyProcessEvent(event) : 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())
- {
- 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);
+ processed = GetInvokingWindow()->HandleWindowEvent(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);
}
-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();
+
+ 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 ( int i = 0; i < n; i++ )
+ for ( size_t i = 0; i < n; i++ )
{
m_menus.Append(menus[i]);
m_titles.Add(titles[i]);
// wxLogWarning("wxMenuBar::EnableTop not yet implemented.");
}
-void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
+void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
{
wxMenu *menu = GetMenu(pos);
if ( !menu )
XmNlabelString, label_str(),
NULL);
}
+ m_titles[pos] = label;
}
-wxString wxMenuBar::GetLabelTop(size_t pos) const
+wxString wxMenuBar::GetMenuLabel(size_t pos) const
{
- wxString str;
-
- wxMenu *menu = GetMenu(pos);
- if ( menu )
- {
- 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 str;
+ wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
+ wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
+ return m_titles[pos];
}
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;
}
// 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 wxMenuBar::FindMenuItem(const wxString& menuString, const wxString& itemString) const
{
- char buf1[200];
- char buf2[200];
- wxStripMenuCodes ((char *)(const char *)menuString, buf1);
+ const wxString stripped = wxStripMenuCodes(menuString);
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 m_menus[i]->FindItem (itemString);
+ if ( wxStripMenuCodes(m_titles[i]) == stripped )
+ return m_menus.Item(i)->GetData()->FindItem (itemString);
}
- return -1;
+ return wxNOT_FOUND;
}
wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const
if (itemMenu)
*itemMenu = NULL;
- 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;
+ {
+ wxMenuItem *item = m_menus.Item(i)->GetData()->FindItem(id, itemMenu);
+ if (item) return item;
+ }
+
+ return NULL;
}
// Create menubar
bool wxMenuBar::CreateMenuBar(wxFrame* parent)
{
+ m_parent = parent; // bleach... override it!
+ PreCreation();
+ m_parent = NULL;
+
if (m_mainWidget)
{
XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
XtManageChild((Widget) m_mainWidget);
*/
XtMapWidget((Widget) m_mainWidget);
- return TRUE;
+ return true;
}
- Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), "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);
NULL);
Widget tearOff = XmGetTearOffControl(GetWidget(menu));
wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour);
- wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, TRUE);
-#endif
+ wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, true);
}
+#endif
}
- SetBackgroundColour(m_backgroundColour);
- SetForegroundColour(m_foregroundColour);
- SetFont(m_font);
+ PostCreation();
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;
+ SetMenuBarFrame(NULL);
+ 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);
m_mainWidget = (WXWidget) 0;
- SetMenuBarFrame((wxFrame*) NULL);
+ SetMenuBarFrame(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 (GetMainWidget())
{
- wxMenu *menuParent = menu->GetParent();
+ wxMenu *menuParent = GetParent();
if ( menuParent )
{
- wxMenuItemList::Node *node = menuParent->GetMenuItems().GetFirst();
+ wxMenuItemList::compatibility_iterator node = menuParent->GetMenuItems().GetFirst();
while ( node )
{
- if ( node->GetData()->GetSubMenu() == menu )
+ if ( node->GetData()->GetSubMenu() == this )
{
- menuParent->GetMenuItems().DeleteNode(node);
+ delete node->GetData();
+ menuParent->GetMenuItems().Erase(node);
break;
}
}
}
- menu->DestroyMenu(TRUE);
+ DestroyMenu(true);
}
// Mark as no longer popped up
- menu->m_menuId = -1;
-
- return TRUE;
-}
-
-void
-wxMenuPopdownCallback(Widget WXUNUSED(w), XtPointer clientData,
- XtPointer WXUNUSED(ptr))
-{
- wxMenu *menu = (wxMenu *)clientData;
-
- // 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 );
+ 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 menuIndex,
+ const wxString& title,
+ bool pullDown)
{
Widget menu = (Widget) 0;
Widget buttonWidget = (Widget) 0;
+ Display* dpy = XtDisplay((Widget)parent);
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 ( !m_font.IsOk() )
+ {
+ if ( menuBar )
+ m_font = menuBar->GetFont();
+ else if ( GetInvokingWindow() )
+ m_font = GetInvokingWindow()->GetFont();
+ }
+
+ XtSetArg (args[2], (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) );
if (!pullDown)
{
- menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2);
+ menu = XmCreatePopupMenu ((Widget) parent, wxMOTIF_STR("popup"), args, 3);
+#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, 3);
wxString title2(wxStripMenuCodes(title));
wxXmString label_str(title2);
#endif
XmNlabelString, label_str(),
XmNsubMenuId, menu,
+ (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ XmNpositionIndex, menuIndex,
NULL);
if (mnem != 0)
m_menuWidget = (WXWidget) menu;
- m_menuBar = menuBar;
m_topLevelMenu = topMenu;
- for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ size_t i = 0;
+ for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
node;
- node = node->GetNext() )
+ node = node->GetNext(), ++i )
{
wxMenuItem *item = node->GetData();
- item->CreateItem(menu, menuBar, topMenu);
+ item->CreateItem(menu, menuBar, topMenu, i);
}
- SetBackgroundColour(m_backgroundColour);
- SetForegroundColour(m_foregroundColour);
- SetFont(m_font);
+ ChangeFont();
return buttonWidget;
}
// 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 ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
node;
node = node->GetNext() )
{
wxMenuItem *item = node->GetData();
- item->SetMenuBar((wxMenuBar*) NULL);
+ item->SetMenuBar(NULL);
item->DestroyItem(full);
}
if (id == m_menuId)
{
if (it)
- *it = (wxMenuItem*) NULL;
+ *it = NULL;
return m_buttonWidget;
}
- for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
node;
node = node->GetNext() )
{
}
if (it)
- *it = (wxMenuItem*) NULL;
+ *it = NULL;
return (WXWidget) NULL;
}
void wxMenu::SetBackgroundColour(const wxColour& col)
{
m_backgroundColour = col;
+ if (!col.IsOk())
+ return;
if (m_menuWidget)
wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
if (m_buttonWidget)
- wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE);
+ wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, true);
- for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
node;
node = node->GetNext() )
{
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);
void wxMenu::SetForegroundColour(const wxColour& col)
{
m_foregroundColour = col;
+ if (!col.IsOk())
+ return;
if (m_menuWidget)
wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);
if (m_buttonWidget)
wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col);
- for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
node;
node = node->GetNext() )
{
void wxMenu::ChangeFont(bool keepOriginalSize)
{
- // lesstif 0.87 hangs when setting XmNfontList
-#ifndef LESSTIF_VERSION
- if (!m_font.Ok() || !m_menuWidget)
+ // 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.IsOk() || !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);
}
- for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+ for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
node;
node = node->GetNext() )
{
wxMenuItem* item = node->GetData();
- if (m_menuWidget && item->GetButtonWidget() && m_font.Ok())
+ if (m_menuWidget && item->GetButtonWidget() && m_font.IsOk())
{
XtVaSetValues ((Widget) item->GetButtonWidget(),
- XmNfontList, fontList,
- NULL);
+ wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ NULL);
}
if (item->GetSubMenu())
item->GetSubMenu()->ChangeFont(keepOriginalSize);
}
+#else
+ wxUnusedVar(keepOriginalSize);
#endif
}
bool wxMenuBar::SetBackgroundColour(const wxColour& col)
{
- m_backgroundColour = col;
+ if (!wxWindowBase::SetBackgroundColour(col))
+ return false;
+ if (!col.IsOk())
+ return false;
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);
+ m_menus.Item(i)->GetData()->SetBackgroundColour((wxColour&) col);
- return TRUE;
+ return true;
}
bool wxMenuBar::SetForegroundColour(const wxColour& col)
{
- m_foregroundColour = col;
+ if (!wxWindowBase::SetForegroundColour(col))
+ return false;
+ if (!col.IsOk())
+ return false;
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);
+ 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