X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51c9a5db64e3df86e17d5ba4779782db677fdf15..a007b626a76dfab3b5a83565bb7eae1cae57e18f:/src/motif/menu.cpp diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index a394709cbb..00637cc3b8 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/motif/menu.cpp // Purpose: wxMenu, wxMenuBar, wxMenuItem // Author: Julian Smart // Modified by: @@ -20,15 +20,16 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#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" + +#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 @@ -81,10 +82,6 @@ void wxMenu::Init() Append(-3, m_title) ; AppendSeparator() ; } - - 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. @@ -140,7 +137,7 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) item->GetSubMenu()->m_topLevelMenu = m_topLevelMenu; } - return pos == GetMenuItemCount() ? wxMenuBase::DoAppend(item) : + return pos == GetMenuItemCount() ? wxMenuBase::DoAppend(item) : wxMenuBase::DoInsert(pos, item); } @@ -189,9 +186,6 @@ 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); } wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style)) @@ -317,20 +311,17 @@ wxMenu *wxMenuBar::Remove(size_t pos) // 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 (wxConstCast(menuString.c_str(), char), buf1); + const wxString stripped = wxStripMenuCodes(menuString); size_t menuCount = GetMenuCount(); for (size_t i = 0; i < menuCount; i++) { - wxStripMenuCodes (wxConstCast(m_titles[i].c_str(), char), buf2); - if (strcmp (buf1, buf2) == 0) + 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 @@ -338,17 +329,23 @@ 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.Item(i)->GetData()->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); @@ -388,9 +385,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent) } } - SetBackgroundColour(m_backgroundColour); - SetForegroundColour(m_foregroundColour); - SetFont(m_font); + PostCreation(); XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); XtRealizeWidget ((Widget) menuBarW); @@ -465,17 +460,33 @@ void wxMenu::DestroyWidgetAndDetach() * */ -WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topMenu, size_t index, 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; + Display* dpy = XtDisplay((Widget)parent); Arg args[5]; XtSetArg (args[0], XmNnumColumns, m_numColumns); XtSetArg (args[1], XmNpacking, (m_numColumns > 1) ? XmPACK_COLUMN : XmPACK_TIGHT); + if ( !m_font.Ok() ) + { + 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, wxMOTIF_STR("popup"), args, 2); + menu = XmCreatePopupMenu ((Widget) parent, wxMOTIF_STR("popup"), args, 3); #if 0 XtAddCallback(menu, XmNunmapCallback, @@ -486,7 +497,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM else { char mnem = wxFindMnemonic (title); - menu = XmCreatePulldownMenu ((Widget) parent, wxMOTIF_STR("pulldown"), args, 2); + menu = XmCreatePulldownMenu ((Widget) parent, wxMOTIF_STR("pulldown"), args, 3); wxString title2(wxStripMenuCodes(title)); wxXmString label_str(title2); @@ -498,6 +509,8 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM #endif XmNlabelString, label_str(), XmNsubMenuId, menu, + (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + XmNpositionIndex, index, NULL); if (mnem != 0) @@ -518,9 +531,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM item->CreateItem(menu, menuBar, topMenu, i); } - SetBackgroundColour(m_backgroundColour); - SetForegroundColour(m_foregroundColour); - SetFont(m_font); + ChangeFont(); return buttonWidget; } @@ -595,6 +606,8 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const void wxMenu::SetBackgroundColour(const wxColour& col) { m_backgroundColour = col; + if (!col.Ok()) + return; if (m_menuWidget) wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col); if (m_buttonWidget) @@ -618,6 +631,8 @@ void wxMenu::SetBackgroundColour(const wxColour& col) void wxMenu::SetForegroundColour(const wxColour& col) { m_foregroundColour = col; + if (!col.Ok()) + return; if (m_menuWidget) wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col); if (m_buttonWidget) @@ -671,6 +686,8 @@ void wxMenu::ChangeFont(bool keepOriginalSize) if (item->GetSubMenu()) item->GetSubMenu()->ChangeFont(keepOriginalSize); } +#else + wxUnusedVar(keepOriginalSize); #endif } @@ -682,7 +699,10 @@ void wxMenu::SetFont(const wxFont& font) bool wxMenuBar::SetBackgroundColour(const wxColour& col) { - m_backgroundColour = col; + if (!wxWindowBase::SetBackgroundColour(col)) + return false; + if (!col.Ok()) + return false; if (m_mainWidget) wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col); @@ -695,7 +715,10 @@ bool wxMenuBar::SetBackgroundColour(const wxColour& col) bool wxMenuBar::SetForegroundColour(const wxColour& col) { - m_foregroundColour = col; + if (!wxWindowBase::SetForegroundColour(col)) + return false; + if (!col.Ok()) + return false; if (m_mainWidget) wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col); @@ -722,4 +745,3 @@ bool wxMenuBar::SetFont(const wxFont& font) return true; } -