Added script to help make wxMotif via configure; nativdlg sample works again;

[wxWidgets.git] / src / motif / menu.cpp

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index d10b977174dc59f6f997fb37ad207438bfe93f7f..1eb8e5a3c950d351dbb60ddf310f810b1c9fdd6a 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -455,6 +455,7 @@ wxMenuBar::wxMenuBar()
     m_menus = NULL;
     m_titles = NULL;
     m_menuBarFrame = NULL;
     m_menus = NULL;
     m_titles = NULL;
     m_menuBarFrame = NULL;

+    m_mainWidget = (WXWidget) NULL;

 }
 
 wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
 }
 
 wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])


@@ -747,6 +748,74 @@ wxString wxMenuBar::GetHelpString (int id) const
     return wxString("");
 }
 
     return wxString("");
 }
 

+// Create menubar
+bool wxMenuBar::CreateMenuBar(wxFrame* parent)
+{
+  if (m_mainWidget)
+  {
+    XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
+    /*
+    if (!XtIsManaged((Widget) m_mainWidget))
+      XtManageChild((Widget) m_mainWidget);
+      */
+    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)
+        XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
+    }
+
+  XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
+  XtRealizeWidget ((Widget) menuBarW);
+  XtManageChild ((Widget) menuBarW);
+  SetMenuBarFrame(parent);
+
+  return TRUE;
+}
+
+// Destroy menubar, but keep data structures intact so we can recreate it.
+bool wxMenuBar::DestroyMenuBar()
+{
+  if (!m_mainWidget)
+  {
+      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;
+}
+

 //// Motif-specific
 
 extern wxApp *wxTheApp;
 //// Motif-specific
 
 extern wxApp *wxTheApp;


@@ -763,8 +832,11 @@ int PostDeletionOfMenu( XtPointer* clientData )
   wxMenu *menu = (wxMenu *)clientData;
 
   if (menu->GetMainWidget()) {
   wxMenu *menu = (wxMenu *)clientData;
 
   if (menu->GetMainWidget()) {

-    wxList& list = menu->GetParent()->GetItems();
-    list.DeleteObject(menu);
+    if (menu->GetParent())
+    {
+      wxList& list = menu->GetParent()->GetItems();
+      list.DeleteObject(menu);
+    }

     menu->DestroyMenu(TRUE);
   }
   /* Mark as no longer popped up */
     menu->DestroyMenu(TRUE);
   }
   /* Mark as no longer popped up */