projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Have wxDCImpl::GetHandle return NULL by default instead of being pure virtual.
[wxWidgets.git]
/
src
/
motif
/
menu.cpp
diff --git
a/src/motif/menu.cpp
b/src/motif/menu.cpp
index 8868823110204faeb08a35d472218cb9f60515bf..02ada167a3053820350ea0cd81ae0d9b575cc529 100644
(file)
--- 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:
// Purpose: wxMenu, wxMenuBar, wxMenuItem
// Author: Julian Smart
// Modified by:
@@
-9,15
+9,10
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
// ============================================================================
// declarations
// ============================================================================
// ============================================================================
// declarations
// ============================================================================
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "menu.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
@@
-25,20
+20,19
@@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/defs.h"
-
#include "wx/menu.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
#ifdef __VMS__
#pragma message disable nosimpint
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
@@
-58,9
+52,6
@@
// other standard headers
#include <string.h>
// other standard headers
#include <string.h>
-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-
// ============================================================================
// implementation
// ============================================================================
// ============================================================================
// implementation
// ============================================================================
@@
-78,18
+69,14
@@
void wxMenu::Init()
m_popupShell = (WXWidget) NULL;
m_buttonWidget = (WXWidget) NULL;
m_menuId = 0;
m_popupShell = (WXWidget) NULL;
m_buttonWidget = (WXWidget) NULL;
m_menuId = 0;
- m_topLevelMenu =
(wxMenu*)
NULL;
+ m_topLevelMenu = NULL;
m_ownedByMenuBar = false;
m_ownedByMenuBar = false;
- if ( !
!m_title
)
+ if ( !
m_title.empty()
)
{
Append(-3, m_title) ;
AppendSeparator() ;
}
{
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.
}
// The wxWindow destructor will take care of deleting the submenus.
@@
-119,18
+106,7
@@
void wxMenu::Break()
// function appends a new item or submenu to the menu
wxMenuItem* wxMenu::DoAppend(wxMenuItem *pItem)
{
// function appends a new item or submenu to the menu
wxMenuItem* wxMenu::DoAppend(wxMenuItem *pItem)
{
- if (m_menuWidget)
- {
- // this is a dynamic Append
- pItem->CreateItem(m_menuWidget, GetMenuBar(), m_topLevelMenu);
- }
-
- if ( pItem->IsSubMenu() )
- {
- pItem->GetSubMenu()->m_topLevelMenu = m_topLevelMenu;
- }
-
- return wxMenuBase::DoAppend(pItem);
+ return DoInsert(GetMenuItemCount(), pItem);
}
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
}
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
@@
-142,12
+118,22
@@
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- if ( wxMenuBase::DoInsert(pos, item) )
- return item;
+ 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("DoInsert not implemented; or error in wxMenuBase::DoInsert"));
+ if ( item->IsSubMenu() )
+ {
+ item->GetSubMenu()->m_topLevelMenu = m_topLevelMenu;
+ }
- return NULL;
+ return pos == GetMenuItemCount() ? wxMenuBase::DoAppend(item) :
+ wxMenuBase::DoInsert(pos, item);
}
void wxMenu::SetTitle(const wxString& label)
}
void wxMenu::SetTitle(const wxString& label)
@@
-171,26
+157,14
@@
void wxMenu::SetTitle(const wxString& label)
bool wxMenu::ProcessCommand(wxCommandEvent & event)
{
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())
// Try the window the menu was popped up from (and up
// through the hierarchy)
if ( !processed && GetInvokingWindow())
- processed = GetInvokingWindow()->
Process
Event(event);
+ processed = GetInvokingWindow()->
HandleWindow
Event(event);
return processed;
}
return processed;
}
@@
-204,19
+178,16
@@
void wxMenuBar::Init()
m_eventHandler = this;
m_menuBarFrame = NULL;
m_mainWidget = (WXWidget) NULL;
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))
{
}
wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style))
{
- wxASSERT(
size_t(n)
== titles.GetCount() );
+ wxASSERT(
n
== titles.GetCount() );
Init();
m_titles = titles;
Init();
m_titles = titles;
- for (
in
t i = 0; i < n; i++ )
+ for (
size_
t i = 0; i < n; i++ )
m_menus.Append(menus[i]);
}
m_menus.Append(menus[i]);
}
@@
-224,7
+195,7
@@
wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WX
{
Init();
{
Init();
- for (
in
t i = 0; i < n; i++ )
+ for (
size_
t i = 0; i < n; i++ )
{
m_menus.Append(menus[i]);
m_titles.Add(titles[i]);
{
m_menus.Append(menus[i]);
m_titles.Add(titles[i]);
@@
-242,7
+213,7
@@
void wxMenuBar::EnableTop(size_t WXUNUSED(pos), bool WXUNUSED(flag))
// wxLogWarning("wxMenuBar::EnableTop not yet implemented.");
}
// wxLogWarning("wxMenuBar::EnableTop not yet implemented.");
}
-void wxMenuBar::Set
LabelTop
(size_t pos, const wxString& label)
+void wxMenuBar::Set
MenuLabel
(size_t pos, const wxString& label)
{
wxMenu *menu = GetMenu(pos);
if ( !menu )
{
wxMenu *menu = GetMenu(pos);
if ( !menu )
@@
-257,54
+228,39
@@
void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
XmNlabelString, label_str(),
NULL);
}
XmNlabelString, label_str(),
NULL);
}
+ m_titles[pos] = label;
}
}
-wxString wxMenuBar::Get
LabelTop
(size_t pos) const
+wxString wxMenuBar::Get
MenuLabel
(size_t pos) const
{
{
- wxMenu *menu = GetMenu(pos);
- if ( menu )
- {
- Widget w = (Widget)menu->GetButtonWidget();
- if (w)
- {
- XmString text;
- XtVaGetValues(w,
- XmNlabelString, &text,
- NULL);
-
- return wxXmStringToString( text );
- }
- }
-
- return wxEmptyString;
+ wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
+ wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
+ return m_titles[pos];
}
bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
{
}
bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
{
+ 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 )
{
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);
+ WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu,
+ pos, title, true);
wxCHECK_MSG( w, false, wxT("failed to create menu") );
menu->SetButtonWidget(w);
}
wxCHECK_MSG( w, false, wxT("failed to create menu") );
menu->SetButtonWidget(w);
}
- 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)
}
wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
@@
-335,20
+291,17
@@
wxMenu *wxMenuBar::Remove(size_t pos)
// Find the menu menuString, item itemString, and return the item id.
// Returns -1 if none found.
// 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++)
{
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 m_menus.Item(i)->GetData()->FindItem (itemString);
}
- return
-1
;
+ return
wxNOT_FOUND
;
}
wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const
}
wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const
@@
-356,17
+309,23
@@
wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const
if (itemMenu)
*itemMenu = NULL;
if (itemMenu)
*itemMenu = NULL;
- wxMenuItem *item = NULL;
size_t menuCount = GetMenuCount();
for (size_t i = 0; i < menuCount; i++)
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)
{
}
// 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);
if (m_mainWidget)
{
XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
@@
-378,7
+337,8
@@
bool wxMenuBar::CreateMenuBar(wxFrame* parent)
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();
m_mainWidget = (WXWidget) menuBarW;
size_t menuCount = GetMenuCount();
@@
-386,7
+346,7
@@
bool wxMenuBar::CreateMenuBar(wxFrame* parent)
{
wxMenu *menu = GetMenu(i);
wxString title(m_titles[i]);
{
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);
if (strcmp (wxStripMenuCodes(title), "Help") == 0)
XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
@@
-401,13
+361,11
@@
bool wxMenuBar::CreateMenuBar(wxFrame* parent)
Widget tearOff = XmGetTearOffControl(GetWidget(menu));
wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour);
wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, true);
Widget tearOff = XmGetTearOffControl(GetWidget(menu));
wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour);
wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, true);
-#endif
}
}
+#endif
}
}
- SetBackgroundColour(m_backgroundColour);
- SetForegroundColour(m_foregroundColour);
- SetFont(m_font);
+ PostCreation();
XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
XtRealizeWidget ((Widget) menuBarW);
XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
XtRealizeWidget ((Widget) menuBarW);
@@
-422,7
+380,7
@@
bool wxMenuBar::DestroyMenuBar()
{
if (!m_mainWidget)
{
{
if (!m_mainWidget)
{
- SetMenuBarFrame(
(wxFrame*)
NULL);
+ SetMenuBarFrame(NULL);
return false;
}
return false;
}
@@
-439,7
+397,7
@@
bool wxMenuBar::DestroyMenuBar()
XtDestroyWidget((Widget) m_mainWidget);
m_mainWidget = (WXWidget) 0;
XtDestroyWidget((Widget) m_mainWidget);
m_mainWidget = (WXWidget) 0;
- SetMenuBarFrame(
(wxFrame*)
NULL);
+ SetMenuBarFrame(NULL);
return true;
}
return true;
}
@@
-482,17
+440,33
@@
void wxMenu::DestroyWidgetAndDetach()
*
*/
*
*/
-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;
{
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);
Arg args[5];
XtSetArg (args[0], XmNnumColumns, m_numColumns);
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)
{
if (!pullDown)
{
- menu = XmCreatePopupMenu ((Widget) parent,
"popup", args, 2
);
+ menu = XmCreatePopupMenu ((Widget) parent,
wxMOTIF_STR("popup"), args, 3
);
#if 0
XtAddCallback(menu,
XmNunmapCallback,
#if 0
XtAddCallback(menu,
XmNunmapCallback,
@@
-503,7
+477,7
@@
WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
else
{
char mnem = wxFindMnemonic (title);
else
{
char mnem = wxFindMnemonic (title);
- menu = XmCreatePulldownMenu ((Widget) parent,
"pulldown", args, 2
);
+ menu = XmCreatePulldownMenu ((Widget) parent,
wxMOTIF_STR("pulldown"), args, 3
);
wxString title2(wxStripMenuCodes(title));
wxXmString label_str(title2);
wxString title2(wxStripMenuCodes(title));
wxXmString label_str(title2);
@@
-515,6
+489,8
@@
WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
#endif
XmNlabelString, label_str(),
XmNsubMenuId, menu,
#endif
XmNlabelString, label_str(),
XmNsubMenuId, menu,
+ (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ XmNpositionIndex, menuIndex,
NULL);
if (mnem != 0)
NULL);
if (mnem != 0)
@@
-525,18
+501,17
@@
WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
m_topLevelMenu = topMenu;
m_topLevelMenu = topMenu;
+ size_t i = 0;
for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
node;
for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
node;
- node = node->GetNext() )
+ node = node->GetNext()
, ++i
)
{
wxMenuItem *item = node->GetData();
{
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;
}
return buttonWidget;
}
@@
-551,7
+526,7
@@
void wxMenu::DestroyMenu (bool full)
node = node->GetNext() )
{
wxMenuItem *item = node->GetData();
node = node->GetNext() )
{
wxMenuItem *item = node->GetData();
- item->SetMenuBar(
(wxMenuBar*)
NULL);
+ item->SetMenuBar(NULL);
item->DestroyItem(full);
}
item->DestroyItem(full);
}
@@
-577,7
+552,7
@@
WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
if (id == m_menuId)
{
if (it)
if (id == m_menuId)
{
if (it)
- *it =
(wxMenuItem*)
NULL;
+ *it = NULL;
return m_buttonWidget;
}
return m_buttonWidget;
}
@@
-604,13
+579,15
@@
WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
}
if (it)
}
if (it)
- *it =
(wxMenuItem*)
NULL;
+ *it = NULL;
return (WXWidget) NULL;
}
void wxMenu::SetBackgroundColour(const wxColour& col)
{
m_backgroundColour = col;
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)
if (m_menuWidget)
wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
if (m_buttonWidget)
@@
-634,6
+611,8
@@
void wxMenu::SetBackgroundColour(const wxColour& col)
void wxMenu::SetForegroundColour(const wxColour& col)
{
m_foregroundColour = 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)
if (m_menuWidget)
wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);
if (m_buttonWidget)
@@
-656,20
+635,20
@@
void wxMenu::SetForegroundColour(const wxColour& col)
void wxMenu::ChangeFont(bool keepOriginalSize)
{
void wxMenu::ChangeFont(bool keepOriginalSize)
{
- // Lesstif 0.87 hangs here, but 0.93 does not
-#if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 )
- 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.
Is
Ok() || !m_menuWidget)
return;
return;
-
WXFontType fontType = m_font.GetFontType(XtDisplay((Widget) m_menuWidget)
);
+
Display* dpy = XtDisplay((Widget) m_menuWidget
);
XtVaSetValues ((Widget) m_menuWidget,
XtVaSetValues ((Widget) m_menuWidget,
- wxFont::GetFontTag(),
fontType
,
+ wxFont::GetFontTag(),
m_font.GetFontTypeC(dpy)
,
NULL);
if (m_buttonWidget)
{
XtVaSetValues ((Widget) m_buttonWidget,
NULL);
if (m_buttonWidget)
{
XtVaSetValues ((Widget) m_buttonWidget,
- wxFont::GetFontTag(),
fontType
,
+ wxFont::GetFontTag(),
m_font.GetFontTypeC(dpy)
,
NULL);
}
NULL);
}
@@
-678,15
+657,17
@@
void wxMenu::ChangeFont(bool keepOriginalSize)
node = node->GetNext() )
{
wxMenuItem* item = node->GetData();
node = node->GetNext() )
{
wxMenuItem* item = node->GetData();
- if (m_menuWidget && item->GetButtonWidget() && m_font.Ok())
+ if (m_menuWidget && item->GetButtonWidget() && m_font.
Is
Ok())
{
XtVaSetValues ((Widget) item->GetButtonWidget(),
{
XtVaSetValues ((Widget) item->GetButtonWidget(),
- wxFont::GetFontTag(),
fontType
,
+ wxFont::GetFontTag(),
m_font.GetFontTypeC(dpy)
,
NULL);
}
if (item->GetSubMenu())
item->GetSubMenu()->ChangeFont(keepOriginalSize);
}
NULL);
}
if (item->GetSubMenu())
item->GetSubMenu()->ChangeFont(keepOriginalSize);
}
+#else
+ wxUnusedVar(keepOriginalSize);
#endif
}
#endif
}
@@
-698,7
+679,10
@@
void wxMenu::SetFont(const wxFont& font)
bool wxMenuBar::SetBackgroundColour(const wxColour& col)
{
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);
if (m_mainWidget)
wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col);
@@
-711,7
+695,10
@@
bool wxMenuBar::SetBackgroundColour(const wxColour& col)
bool wxMenuBar::SetForegroundColour(const wxColour& col)
{
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);
if (m_mainWidget)
wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col);
@@
-738,4
+725,3
@@
bool wxMenuBar::SetFont(const wxFont& font)
return true;
}
return true;
}
-
projects / wxWidgets.git / blobdiff