#ifdef __VMS__
#pragma message disable nosimpint
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
// 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_topLevelMenu = NULL;
m_ownedByMenuBar = false;
if ( !m_title.empty() )
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.
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;
- // 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::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))
// 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
{
- 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)
// 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
// 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);
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);
{
if (!m_mainWidget)
{
- SetMenuBarFrame((wxFrame*) NULL);
+ SetMenuBarFrame(NULL);
return false;
}
XtDestroyWidget((Widget) m_mainWidget);
m_mainWidget = (WXWidget) 0;
- SetMenuBarFrame((wxFrame*) NULL);
+ SetMenuBarFrame(NULL);
return true;
}
WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
WXWidget parent,
wxMenu * topMenu,
- size_t WXUNUSED(index),
+ 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, (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, wxMOTIF_STR("popup"), args, 2);
+ menu = XmCreatePopupMenu ((Widget) parent, wxMOTIF_STR("popup"), args, 3);
#if 0
XtAddCallback(menu,
XmNunmapCallback,
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);
#endif
XmNlabelString, label_str(),
XmNsubMenuId, menu,
+ (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ XmNpositionIndex, menuIndex,
NULL);
if (mnem != 0)
item->CreateItem(menu, menuBar, topMenu, i);
}
- SetBackgroundColour(m_backgroundColour);
- SetForegroundColour(m_foregroundColour);
- SetFont(m_font);
+ ChangeFont();
return buttonWidget;
}
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;
}
}
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)
void wxMenu::SetForegroundColour(const wxColour& col)
{
m_foregroundColour = col;
+ if (!col.IsOk())
+ return;
if (m_menuWidget)
wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);
if (m_buttonWidget)
{
// 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)
+ if (!m_font.IsOk() || !m_menuWidget)
return;
Display* dpy = XtDisplay((Widget) m_menuWidget);
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(),
wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
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);
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);
projects / wxWidgets.git / blobdiff