X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/631f1bfed5d2df0215035207355d838328237578..866592d872daa1f4e3d44948d7d3a6c90b0af9d0:/src/motif/menu.cpp diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index 959d442bb9..ed12ce6732 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -58,7 +58,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) // Menus // Construct a menu with optional title (then use append) -wxMenu::wxMenu(const wxString& title, const wxFunction func) +void wxMenu::Init(const wxString& title, + long style +#ifdef WXWIN_COMPATIBILITY + , const wxFunction func +#endif + ) { m_title = title; m_parent = (wxEvtHandler*) NULL; @@ -66,7 +71,8 @@ wxMenu::wxMenu(const wxString& title, const wxFunction func) m_noItems = 0; m_menuBar = NULL; m_pInvokingWindow = NULL; - + m_style = style; + //// Motif-specific members m_numColumns = 1; m_menuWidget = (WXWidget) NULL; @@ -77,7 +83,7 @@ wxMenu::wxMenu(const wxString& title, const wxFunction func) m_ownedByMenuBar = FALSE; m_menuParent = (wxMenu*) NULL; m_clientData = (void*) NULL; - + if (m_title != "") { Append(ID_SEPARATOR, m_title) ; @@ -86,8 +92,10 @@ wxMenu::wxMenu(const wxString& title, const wxFunction func) m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU); m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT); m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); - + +#ifdef WXWIN_COMPATIBILITY Callback(func); +#endif } // The wxWindow destructor will take care of deleting the submenus. @@ -100,24 +108,24 @@ wxMenu::~wxMenu() else DestroyMenu(FALSE); } - + // Not sure if this is right if (m_menuParent && m_menuBar) { m_menuParent = NULL; // m_menuBar = NULL; } - + wxNode *node = m_menuItems.First(); while (node) { wxMenuItem *item = (wxMenuItem *)node->Data(); - + /* if (item->GetSubMenu()) item->DeleteSubMenu(); */ - + wxNode *next = node->Next(); delete item; delete node; @@ -134,12 +142,12 @@ void wxMenu::Break() void wxMenu::Append(wxMenuItem *pItem) { wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" ); - + m_menuItems.Append(pItem); - + if (m_menuWidget) - pItem->CreateItem (m_menuWidget, m_menuBar, m_topLevelMenu); // this is a dynamic Append - + pItem->CreateItem (m_menuWidget, m_menuBar, m_topLevelMenu); // this is a dynamic Append + m_noItems++; } @@ -154,16 +162,16 @@ void wxMenu::AppendSeparator() // as well as in m_menuItems, whereas we only store it in // m_menuItems here. What implications does this have? -void wxMenu::Append(int id, const wxString& label, wxMenu *subMenu, +void wxMenu::Append(int id, const wxString& label, wxMenu *subMenu, const wxString& helpString) { Append(new wxMenuItem(this, id, label, helpString, FALSE, subMenu)); - + subMenu->m_topLevelMenu = m_topLevelMenu; } // Ordinary menu item -void wxMenu::Append(int id, const wxString& label, +void wxMenu::Append(int id, const wxString& label, const wxString& helpString, bool checkable) { // 'checkable' parameter is useless for Windows. @@ -175,19 +183,19 @@ void wxMenu::Delete(int id) wxNode *node; wxMenuItem *item; int pos; - - for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) + + for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) { item = (wxMenuItem *)node->Data(); if (item->GetId() == id) break; } - + if (!node) return; - + item->DestroyItem(TRUE); - + // See also old code - don't know if this is needed (seems redundant). /* if (item->GetSubMenu()) { @@ -196,7 +204,7 @@ void wxMenu::Delete(int id) children->DeleteObject(item->GetSubMenu()); } */ - + m_menuItems.DeleteNode(node); delete item; } @@ -205,7 +213,7 @@ void wxMenu::Enable(int id, bool flag) { wxMenuItem *item = FindItemForId(id); wxCHECK_RET( item != NULL, "can't enable non-existing menu item" ); - + item->Enable(flag); } @@ -213,7 +221,7 @@ bool wxMenu::Enabled(int Id) const { wxMenuItem *item = FindItemForId(Id); wxCHECK( item != NULL, FALSE ); - + return item->IsEnabled(); } @@ -221,7 +229,7 @@ void wxMenu::Check(int Id, bool Flag) { wxMenuItem *item = FindItemForId(Id); wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" ); - + item->Check(Flag); } @@ -229,23 +237,23 @@ bool wxMenu::Checked(int id) const { wxMenuItem *item = FindItemForId(id); wxCHECK( item != NULL, FALSE ); - + return item->IsChecked(); } void wxMenu::SetTitle(const wxString& label) { m_title = label ; - + wxNode *node = m_menuItems.First (); if (!node) return; - + wxMenuItem *item = (wxMenuItem *) node->Data (); Widget widget = (Widget) item->GetButtonWidget(); if (!widget) return; - + XmString title_str = XmStringCreateSimple ((char*) (const char*) label); XtVaSetValues (widget, XmNlabelString, title_str, @@ -263,7 +271,7 @@ void wxMenu::SetLabel(int id, const wxString& label) wxMenuItem *item = FindItemForId(id); if (item == (wxMenuItem*) NULL) return; - + item->SetLabel(label); } @@ -278,7 +286,7 @@ wxString wxMenu::GetLabel(int id) const XtVaGetValues ((Widget) w, XmNlabelString, &text, NULL); - + if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s)) { wxString str(s); @@ -301,7 +309,7 @@ int wxMenu::FindItem (const wxString& itemString) const char buf1[200]; char buf2[200]; wxStripMenuCodes ((char *)(const char *)itemString, buf1); - + for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) { wxMenuItem *item = (wxMenuItem *) node->Data (); @@ -318,7 +326,7 @@ int wxMenu::FindItem (const wxString& itemString) const return item->GetId(); } } - + return -1; } @@ -329,14 +337,14 @@ wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) { wxMenuItem *item = (wxMenuItem *) node->Data (); - + if (item->GetId() == itemId) { if (itemMenu) *itemMenu = (wxMenu *) this; return item; } - + if (item->GetSubMenu()) { wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu); @@ -344,7 +352,7 @@ wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const return ans; } } - + if (itemMenu) *itemMenu = NULL; return NULL; @@ -367,14 +375,14 @@ wxString wxMenu::GetHelpString (int itemId) const void wxMenu::ProcessCommand(wxCommandEvent & event) { bool processed = FALSE; - + // Try a callback if (m_callback) { (void) (*(m_callback)) (*this, event); processed = TRUE; } - + // Try the menu's event handler if ( !processed && GetEventHandler()) { @@ -426,76 +434,21 @@ void wxMenu::UpdateUI(wxEvtHandler* source) } } -bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) +// Menu Bar +wxMenuBar::wxMenuBar() { - Widget widget = (Widget) GetMainWidget(); - - /* The menuId field seems to be usused, so we'll use it to - indicate whether a menu is popped up or not: - 0: Not currently created as a popup - -1: Created as a popup, but not active - 1: Active popup. - */ - - if (menu->GetParent() && (menu->GetId() != -1)) - return FALSE; - - if (menu->GetMainWidget()) { - menu->DestroyMenu(TRUE); - } - - wxWindow *parent = this; - - menu->SetId(1); /* Mark as popped-up */ - menu->CreateMenu(NULL, widget, menu); - menu->SetInvokingWindow(this); - - menu->UpdateUI(); - - // menu->SetParent(parent); - // parent->children->Append(menu); // Store menu for later deletion - - Widget menuWidget = (Widget) menu->GetMainWidget(); - - int rootX = 0; - int rootY = 0; - - int deviceX = x; - int deviceY = y; - /* - if (this->IsKindOf(CLASSINFO(wxCanvas))) - { - wxCanvas *canvas = (wxCanvas *) this; - deviceX = canvas->GetDC ()->LogicalToDeviceX (x); - deviceY = canvas->GetDC ()->LogicalToDeviceY (y); - } - */ - - Display *display = XtDisplay (widget); - Window rootWindow = RootWindowOfScreen (XtScreen((Widget)widget)); - Window thisWindow = XtWindow (widget); - Window childWindow; - XTranslateCoordinates (display, thisWindow, rootWindow, (int) deviceX, (int) deviceY, - &rootX, &rootY, &childWindow); - - XButtonPressedEvent event; - event.type = ButtonPress; - event.button = 1; - - event.x = deviceX; - event.y = deviceY; - - event.x_root = rootX; - event.y_root = rootY; - - XmMenuPosition (menuWidget, &event); - XtManageChild (menuWidget); - - return TRUE; + m_eventHandler = this; + m_menuCount = 0; + m_menus = NULL; + m_titles = NULL; + 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); } -// Menu Bar -wxMenuBar::wxMenuBar() +wxMenuBar::wxMenuBar(long WXUNUSED(style)) { m_eventHandler = this; m_menuCount = 0; @@ -558,10 +511,10 @@ void wxMenuBar::Check(int id, bool flag) wxMenuItem *item = FindItemForId(id, &itemMenu) ; if (!item) return; - + if (!item->IsCheckable()) return ; - + item->Check(flag); } @@ -571,7 +524,7 @@ bool wxMenuBar::Checked(int id) const wxMenuItem *item = FindItemForId(id, &itemMenu) ; if (!item) return FALSE; - + return item->IsChecked(); } @@ -581,7 +534,7 @@ bool wxMenuBar::Enabled(int id) const wxMenuItem *item = FindItemForId(id, &itemMenu) ; if (!item) return FALSE; - + return item->IsEnabled(); } @@ -589,10 +542,10 @@ void wxMenuBar::SetLabel(int id, const wxString& label) { wxMenu *itemMenu = NULL; wxMenuItem *item = FindItemForId(id, &itemMenu) ; - + if (!item) return; - + item->SetLabel(label); } @@ -600,17 +553,17 @@ wxString wxMenuBar::GetLabel(int id) const { wxMenu *itemMenu = NULL; wxMenuItem *item = FindItemForId(id, &itemMenu) ; - + if (!item) return wxString(""); - + return item->GetLabel(); } void wxMenuBar::SetLabelTop(int pos, const wxString& label) { wxASSERT( (pos < m_menuCount) ); - + Widget w = (Widget) m_menus[pos]->GetButtonWidget(); if (w) { @@ -625,7 +578,7 @@ void wxMenuBar::SetLabelTop(int pos, const wxString& label) wxString wxMenuBar::GetLabelTop(int pos) const { wxASSERT( (pos < m_menuCount) ); - + Widget w = (Widget) m_menus[pos]->GetButtonWidget(); if (w) { @@ -634,7 +587,7 @@ wxString wxMenuBar::GetLabelTop(int pos) const XtVaGetValues (w, XmNlabelString, &text, NULL); - + if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s)) { wxString str(s); @@ -648,7 +601,7 @@ wxString wxMenuBar::GetLabelTop(int pos) const } else return wxEmptyString; - + } bool wxMenuBar::OnDelete(wxMenu *menu, int pos) @@ -656,7 +609,7 @@ bool wxMenuBar::OnDelete(wxMenu *menu, int pos) // Only applies to dynamic deletion (when set in frame) if (!m_menuBarFrame) return TRUE; - + menu->DestroyMenu(TRUE); return TRUE; } @@ -666,18 +619,18 @@ bool wxMenuBar::OnAppend(wxMenu *menu, const char *title) // Only applies to dynamic append (when set in frame) if (!m_menuBarFrame) return TRUE; - + // Probably should be an assert here if (menu->GetParent()) return FALSE; - + // Has already been appended if (menu->GetButtonWidget()) return FALSE; - + WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE); menu->SetButtonWidget(w); - + return TRUE; } @@ -685,12 +638,12 @@ void wxMenuBar::Append (wxMenu * menu, const wxString& title) { if (!OnAppend(menu, title)) return; - + 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]; @@ -705,10 +658,10 @@ void wxMenuBar::Append (wxMenu * menu, const wxString& title) } m_menus = new_menus; m_titles = new_titles; - + m_menus[m_menuCount - 1] = (wxMenu *)menu; m_titles[m_menuCount - 1] = title; - + menu->SetMenuBar(this); menu->SetParent(this); } @@ -717,7 +670,7 @@ void wxMenuBar::Delete(wxMenu * menu, int i) { int j; int ii = (int) i; - + if (menu != 0) { for (ii = 0; ii < m_menuCount; ii++) @@ -733,12 +686,12 @@ void wxMenuBar::Delete(wxMenu * menu, int i) return; menu = m_menus[ii]; } - + if (!OnDelete(menu, ii)) return; - + menu->SetParent((wxEvtHandler*) NULL); - + -- m_menuCount; for (j = ii; j < m_menuCount; j++) { @@ -768,7 +721,7 @@ wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu ** itemMenu) const { if (itemMenu) *itemMenu = NULL; - + wxMenuItem *item = NULL; int i; for (i = 0; i < m_menuCount; i++) @@ -814,35 +767,40 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent) XtMapWidget((Widget) m_mainWidget); return TRUE; } - + Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWindowWidget(), "MenuBar", NULL, 0); m_mainWidget = (WXWidget) menuBarW; - + int i; for (i = 0; i < GetMenuCount(); i++) { wxMenu *menu = GetMenu(i); wxString title(m_titles[i]); menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, title, TRUE)); - - /* - * COMMENT THIS OUT IF YOU DON'T LIKE A RIGHT-JUSTIFIED HELP MENU - */ - wxStripMenuCodes ((char*) (const char*) title, wxBuffer); - - if (strcmp (wxBuffer, "Help") == 0) + + if (strcmp (wxStripMenuCodes(title), "Help") == 0) XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL); + + // tear off menu support +#if (XmVersion >= 1002) + if ( menu->IsTearOff() ) + { + XtVaSetValues(GetWidget(menu), + XmNtearOffModel, XmTEAR_OFF_ENABLED, + NULL); +#endif + } } - + SetBackgroundColour(m_backgroundColour); SetForegroundColour(m_foregroundColour); SetFont(m_font); - + XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); XtRealizeWidget ((Widget) menuBarW); XtManageChild ((Widget) menuBarW); SetMenuBarFrame(parent); - + return TRUE; } @@ -854,22 +812,22 @@ bool wxMenuBar::DestroyMenuBar() SetMenuBarFrame((wxFrame*) NULL); return FALSE; } - + XtUnmanageChild ((Widget) m_mainWidget); XtUnrealizeWidget ((Widget) m_mainWidget); - + int i; for (i = 0; i < GetMenuCount(); i++) { wxMenu *menu = GetMenu(i); menu->DestroyMenu(TRUE); - + } XtDestroyWidget((Widget) m_mainWidget); m_mainWidget = (WXWidget) 0; - + SetMenuBarFrame((wxFrame*) NULL); - + return TRUE; } @@ -887,7 +845,7 @@ int PostDeletionOfMenu( XtPointer* clientData ) { XtRemoveWorkProc(WorkProcMenuId); wxMenu *menu = (wxMenu *)clientData; - + if (menu->GetMainWidget()) { if (menu->GetParent()) { @@ -901,20 +859,20 @@ int PostDeletionOfMenu( XtPointer* clientData ) return TRUE; } -void +void wxMenuPopdownCallback(Widget w, XtPointer clientData, XtPointer ptr) { wxMenu *menu = (wxMenu *)clientData; - + // Added by JOREL Jean-Charles /* 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(), + + WorkProcMenuId = XtAppAddWorkProc( + (XtAppContext) wxTheApp->GetAppContext(), (XtWorkProc) PostDeletionOfMenu, (XtPointer) menu ); // Apparently not found in Motif headers @@ -934,12 +892,12 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM Arg args[5]; XtSetArg (args[0], XmNnumColumns, m_numColumns); XtSetArg (args[1], XmNpacking, XmPACK_COLUMN); - + if (!pullDown) { menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2); XtAddCallback(menu, - XmNunmapCallback, + XmNunmapCallback, (XtCallbackProc)wxMenuPopdownCallback, (XtPointer)this); } @@ -947,57 +905,56 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM { char mnem = wxFindMnemonic (title); wxStripMenuCodes ((char*) (const char*) title, wxBuffer); - + menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2); - - XmString label_str = XmStringCreateSimple (wxBuffer); - buttonWidget = XtVaCreateManagedWidget (wxBuffer, + + 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, + XmNlabelString, label_str(), XmNsubMenuId, menu, NULL); - + if (mnem != 0) XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL); - - XmStringFree (label_str); } - + m_menuWidget = (WXWidget) menu; - + m_menuBar = menuBar; m_topLevelMenu = topMenu; - + for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) { wxMenuItem *item = (wxMenuItem *) node->Data (); item->CreateItem (menu, menuBar, topMenu); } - + SetBackgroundColour(m_backgroundColour); SetForegroundColour(m_foregroundColour); SetFont(m_font); - + return buttonWidget; } // Destroys the Motif implementation of the menu, // but maintains the wxWindows data structures so we can -// do a CreateMenu again. +// do a CreateMenu again. void wxMenu::DestroyMenu (bool full) { for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) { wxMenuItem *item = (wxMenuItem *) node->Data (); item->SetMenuBar((wxMenuBar*) NULL); - + item->DestroyItem(full); - } // for() - + }// for() + if (m_buttonWidget) { if (full) @@ -1022,7 +979,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const *it = (wxMenuItem*) NULL; return m_buttonWidget; } - + for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) { wxMenuItem *item = (wxMenuItem *) node->Data (); @@ -1032,7 +989,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const *it = item; return item->GetButtonWidget(); } - + if (item->GetSubMenu()) { WXWidget w = item->GetSubMenu()->FindMenuItem (id, it); @@ -1041,8 +998,8 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const return w; } } - } // for() - + }// for() + if (it) *it = (wxMenuItem*) NULL; return (WXWidget) NULL; @@ -1055,7 +1012,7 @@ void wxMenu::SetBackgroundColour(const wxColour& col) wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col); if (m_buttonWidget) wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE); - + wxNode* node = m_menuItems.First(); while (node) { @@ -1078,7 +1035,7 @@ void wxMenu::SetForegroundColour(const wxColour& col) wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col); if (m_buttonWidget) wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col); - + wxNode* node = m_menuItems.First(); while (node) { @@ -1097,12 +1054,12 @@ void wxMenu::SetForegroundColour(const wxColour& col) void wxMenu::ChangeFont(bool keepOriginalSize) { // lesstif 0.87 hangs when setting XmNfontList -#ifndef LESSTIF_VERSION +#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); @@ -1137,7 +1094,7 @@ void wxMenu::SetFont(const wxFont& font) void wxMenuBar::SetBackgroundColour(const wxColour& col) { - + m_backgroundColour = col; if (m_mainWidget) wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col); @@ -1151,7 +1108,7 @@ void wxMenuBar::SetForegroundColour(const wxColour& col) m_foregroundColour = col; if (m_mainWidget) wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col); - + int i; for (i = 0; i < m_menuCount; i++) m_menus[i]->SetForegroundColour((wxColour&) col); @@ -1166,7 +1123,7 @@ void wxMenuBar::SetFont(const wxFont& font) { m_font = font; ChangeFont(); - + int i; for (i = 0; i < m_menuCount; i++) m_menus[i]->SetFont(font);