New makefile system in place, obsoletes libtool,

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 53df95214ba6bf59e9fff0bc31043318afc6c293..ed12ce6732e24f0343b8bedfcc6880987d577b20 100644 (file)
--- 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
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -28,6 +28,7 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/frame.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/frame.h"

+#include "wx/settings.h"

 
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>


@@ -57,13 +58,20 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
 // Menus
 
 // Construct a menu with optional title (then use append)
 // 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;
     m_eventHandler = this;
     m_noItems = 0;
     m_menuBar = NULL;
 {
     m_title = title;
     m_parent = (wxEvtHandler*) NULL;
     m_eventHandler = this;
     m_noItems = 0;
     m_menuBar = NULL;

+    m_pInvokingWindow = NULL;
+    m_style = style;

 
     //// Motif-specific members
     m_numColumns = 1;
 
     //// Motif-specific members
     m_numColumns = 1;


@@ -74,14 +82,20 @@ wxMenu::wxMenu(const wxString& title, const wxFunction func)
     m_topLevelMenu  = (wxMenu*) NULL;
     m_ownedByMenuBar = FALSE;
     m_menuParent = (wxMenu*) NULL;
     m_topLevelMenu  = (wxMenu*) NULL;
     m_ownedByMenuBar = FALSE;
     m_menuParent = (wxMenu*) NULL;

+    m_clientData = (void*) NULL;

 
     if (m_title != "")
     {
         Append(ID_SEPARATOR, m_title) ;
         AppendSeparator() ;
     }
 
     if (m_title != "")
     {
         Append(ID_SEPARATOR, m_title) ;
         AppendSeparator() ;
     }

+    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);
     Callback(func);

+#endif

 }
 
 // The wxWindow destructor will take care of deleting the submenus.
 }
 
 // The wxWindow destructor will take care of deleting the submenus.


@@ -89,17 +103,17 @@ wxMenu::~wxMenu()
 {
     if (m_menuWidget)
     {
 {
     if (m_menuWidget)
     {

-      if (m_menuParent)
-        DestroyMenu(TRUE);
-      else
-        DestroyMenu(FALSE);
+        if (m_menuParent)
+            DestroyMenu(TRUE);
+        else
+            DestroyMenu(FALSE);

     }
 
     // Not sure if this is right
     if (m_menuParent && m_menuBar)
     {
     }
 
     // Not sure if this is right
     if (m_menuParent && m_menuBar)
     {

-      m_menuParent = NULL;
-      //      m_menuBar = NULL;
+        m_menuParent = NULL;
+        //      m_menuBar = NULL;

     }
 
     wxNode *node = m_menuItems.First();
     }
 
     wxNode *node = m_menuItems.First();


@@ -107,9 +121,9 @@ wxMenu::~wxMenu()
     {
         wxMenuItem *item = (wxMenuItem *)node->Data();
 
     {
         wxMenuItem *item = (wxMenuItem *)node->Data();
 

-       /*
+        /*

         if (item->GetSubMenu())
         if (item->GetSubMenu())

-            item->DeleteSubMenu();
+        item->DeleteSubMenu();

         */
 
         wxNode *next = node->Next();
         */
 
         wxNode *next = node->Next();


@@ -132,7 +146,7 @@ void wxMenu::Append(wxMenuItem *pItem)
     m_menuItems.Append(pItem);
 
     if (m_menuWidget)
     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++;
 }
 
     m_noItems++;
 }


@@ -148,7 +162,7 @@ void wxMenu::AppendSeparator()
 // as well as in m_menuItems, whereas we only store it in
 // m_menuItems here. What implications does this have?
 
 // 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));
                     const wxString& helpString)
 {
     Append(new wxMenuItem(this, id, label, helpString, FALSE, subMenu));


@@ -157,10 +171,10 @@ void wxMenu::Append(int id, const wxString& label, wxMenu *subMenu,
 }
 
 // Ordinary menu item
 }
 
 // Ordinary menu item

-void wxMenu::Append(int id, const wxString& label, 
+void wxMenu::Append(int id, const wxString& label,

                     const wxString& helpString, bool checkable)
 {
                     const wxString& helpString, bool checkable)
 {

-  // 'checkable' parameter is useless for Windows.
+    // 'checkable' parameter is useless for Windows.

     Append(new wxMenuItem(this, id, label, helpString, checkable));
 }
 
     Append(new wxMenuItem(this, id, label, helpString, checkable));
 }
 


@@ -170,26 +184,26 @@ void wxMenu::Delete(int id)
     wxMenuItem *item;
     int pos;
 
     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;
+        item = (wxMenuItem *)node->Data();
+        if (item->GetId() == id)
+            break;

     }
 
     if (!node)
     }
 
     if (!node)

-       return;
+        return;

 
     item->DestroyItem(TRUE);
 
     // See also old code - don't know if this is needed (seems redundant).
     /*
 
     item->DestroyItem(TRUE);
 
     // See also old code - don't know if this is needed (seems redundant).
     /*

-  if (item->GetSubMenu()) {
+    if (item->GetSubMenu()) {

     item->subMenu->top_level_menu = item->GetSubMenu();
     item->subMenu->window_parent = NULL;
     children->DeleteObject(item->GetSubMenu());
     item->subMenu->top_level_menu = item->GetSubMenu();
     item->subMenu->window_parent = NULL;
     children->DeleteObject(item->GetSubMenu());

-  }
-  */
+    }
+    */

 
     m_menuItems.DeleteNode(node);
     delete item;
 
     m_menuItems.DeleteNode(node);
     delete item;


@@ -233,17 +247,17 @@ void wxMenu::SetTitle(const wxString& label)
 
     wxNode *node = m_menuItems.First ();
     if (!node)
 
     wxNode *node = m_menuItems.First ();
     if (!node)

-      return;
+        return;

 
     wxMenuItem *item = (wxMenuItem *) node->Data ();
     Widget widget = (Widget) item->GetButtonWidget();
     if (!widget)
 
     wxMenuItem *item = (wxMenuItem *) node->Data ();
     Widget widget = (Widget) item->GetButtonWidget();
     if (!widget)

-      return;
+        return;

 
     XmString title_str = XmStringCreateSimple ((char*) (const char*) label);
     XtVaSetValues (widget,
 
     XmString title_str = XmStringCreateSimple ((char*) (const char*) label);
     XtVaSetValues (widget,

-                   XmNlabelString, title_str,
-                   NULL);
+        XmNlabelString, title_str,
+        NULL);

     // TODO: should we delete title_str now?
 }
 
     // TODO: should we delete title_str now?
 }
 


@@ -256,37 +270,37 @@ void wxMenu::SetLabel(int id, const wxString& label)
 {
     wxMenuItem *item = FindItemForId(id);
     if (item == (wxMenuItem*) NULL)
 {
     wxMenuItem *item = FindItemForId(id);
     if (item == (wxMenuItem*) NULL)

-      return;
+        return;

 
     item->SetLabel(label);
 }
 
 wxString wxMenu::GetLabel(int id) const
 {
 
     item->SetLabel(label);
 }
 
 wxString wxMenu::GetLabel(int id) const
 {

-  wxMenuItem *it = NULL;
-  WXWidget w = FindMenuItem (id, &it);
-  if (w)
+    wxMenuItem *it = NULL;
+    WXWidget w = FindMenuItem (id, &it);
+    if (w)

     {
     {

-      XmString text;
-      char *s;
-      XtVaGetValues ((Widget) w,
-                    XmNlabelString, &text,
-                    NULL);
+        XmString text;
+        char *s;
+        XtVaGetValues ((Widget) w,
+            XmNlabelString, &text,
+            NULL);

 
 

-      if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
-       {
-         wxString str(s);
-         XtFree (s);
-         return str;
-       }
-      else
-       {
-         XmStringFree (text);
-         return wxEmptyString;
-       }
+        if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
+        {
+            wxString str(s);
+            XtFree (s);
+            return str;
+        }
+        else
+        {
+            XmStringFree (text);
+            return wxEmptyString;
+        }

     }
     }

-  else
-    return wxEmptyString;
+    else
+        return wxEmptyString;

 }
 
 // Finds the item id matching the given string, -1 if not found.
 }
 
 // Finds the item id matching the given string, -1 if not found.


@@ -298,19 +312,19 @@ int wxMenu::FindItem (const wxString& itemString) const
 
     for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
     {
 
     for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
     {

-      wxMenuItem *item = (wxMenuItem *) node->Data ();
-      if (item->GetSubMenu())
-      {
-        int ans = item->GetSubMenu()->FindItem(itemString);
-        if (ans > -1)
-          return ans;
-      }
-      if ( !item->IsSeparator() )
-      {
-        wxStripMenuCodes((char *)item->GetName().c_str(), buf2);
-        if (strcmp(buf1, buf2) == 0)
-          return item->GetId();
-      }
+        wxMenuItem *item = (wxMenuItem *) node->Data ();
+        if (item->GetSubMenu())
+        {
+            int ans = item->GetSubMenu()->FindItem(itemString);
+            if (ans > -1)
+                return ans;
+        }
+        if ( !item->IsSeparator() )
+        {
+            wxStripMenuCodes((char *)item->GetName().c_str(), buf2);
+            if (strcmp(buf1, buf2) == 0)
+                return item->GetId();
+        }

     }
 
     return -1;
     }
 
     return -1;


@@ -365,85 +379,59 @@ void wxMenu::ProcessCommand(wxCommandEvent & event)
     // Try a callback
     if (m_callback)
     {
     // Try a callback
     if (m_callback)
     {

-            (void) (*(m_callback)) (*this, event);
-            processed = TRUE;
+        (void) (*(m_callback)) (*this, event);
+        processed = TRUE;

     }
 
     // Try the menu's event handler
     if ( !processed && GetEventHandler())
     {
     }
 
     // Try the menu's event handler
     if ( !processed && GetEventHandler())
     {

-            processed = GetEventHandler()->ProcessEvent(event);
+        processed = GetEventHandler()->ProcessEvent(event);

     }
     }

-/* TODO

     // 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()->ProcessEvent(event);
-*/
+    processed = GetInvokingWindow()->ProcessEvent(event);

 }
 
 }
 

-bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
+// Update a menu and all submenus recursively.
+// source is the object that has the update event handlers
+// defined for it. If NULL, the menu or associated window
+// will be used.
+void wxMenu::UpdateUI(wxEvtHandler* source)

 {
 {

-  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->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)))
+  if (!source && GetInvokingWindow())
+    source = GetInvokingWindow()->GetEventHandler();
+  if (!source)
+    source = GetEventHandler();
+  if (!source)
+    source = this;
+
+  wxNode* node = GetItems().First();
+  while (node)

   {
   {

-    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;
+    wxMenuItem* item = (wxMenuItem*) node->Data();
+    if ( !item->IsSeparator() )
+    {
+      wxWindowID id = item->GetId();
+      wxUpdateUIEvent event(id);
+      event.SetEventObject( source );

 
 

-  XmMenuPosition (menuWidget, &event);
-  XtManageChild (menuWidget);
+      if (source->ProcessEvent(event))
+      {
+        if (event.GetSetText())
+          SetLabel(id, event.GetText());
+        if (event.GetSetChecked())
+          Check(id, event.GetChecked());
+        if (event.GetSetEnabled())
+          Enable(id, event.GetEnabled());
+      }

 
 

-  return TRUE;
+      if (item->GetSubMenu())
+        item->GetSubMenu()->UpdateUI(source);
+    }
+    node = node->Next();
+  }

 }
 
 // Menu Bar
 }
 
 // Menu Bar


@@ -454,6 +442,23 @@ wxMenuBar::wxMenuBar()
     m_menus = NULL;
     m_titles = NULL;
     m_menuBarFrame = NULL;
     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);
+}
+
+wxMenuBar::wxMenuBar(long WXUNUSED(style))
+{
+    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);

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


@@ -464,8 +469,11 @@ wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
     m_titles = new wxString[n];
     int i;
     for ( i = 0; i < n; i++ )
     m_titles = new wxString[n];
     int i;
     for ( i = 0; i < n; i++ )

-       m_titles[i] = titles[i];
+        m_titles[i] = titles[i];

     m_menuBarFrame = NULL;
     m_menuBarFrame = NULL;

+    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU);
+    m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT);
+    m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);

 }
 
 wxMenuBar::~wxMenuBar()
 }
 
 wxMenuBar::~wxMenuBar()


@@ -554,45 +562,45 @@ wxString wxMenuBar::GetLabel(int id) const
 
 void wxMenuBar::SetLabelTop(int pos, const wxString& label)
 {
 
 void wxMenuBar::SetLabelTop(int pos, const wxString& label)
 {

-  wxASSERT( (pos < m_menuCount) );
+    wxASSERT( (pos < m_menuCount) );

 
 

-  Widget w = (Widget) m_menus[pos]->GetButtonWidget();
-  if (w)
+    Widget w = (Widget) m_menus[pos]->GetButtonWidget();
+    if (w)

     {
     {

-      XmString label_str = XmStringCreateSimple ((char*) (const char*) label);
-      XtVaSetValues (w,
-                    XmNlabelString, label_str,
-                    NULL);
-      XmStringFree (label_str);
+        XmString label_str = XmStringCreateSimple ((char*) (const char*) label);
+        XtVaSetValues (w,
+            XmNlabelString, label_str,
+            NULL);
+        XmStringFree (label_str);

     }
 }
 
 wxString wxMenuBar::GetLabelTop(int pos) const
 {
     }
 }
 
 wxString wxMenuBar::GetLabelTop(int pos) const
 {

-  wxASSERT( (pos < m_menuCount) );
+    wxASSERT( (pos < m_menuCount) );

 
 

-  Widget w = (Widget) m_menus[pos]->GetButtonWidget();
-  if (w)
+    Widget w = (Widget) m_menus[pos]->GetButtonWidget();
+    if (w)

     {
     {

-      XmString text;
-      char *s;
-      XtVaGetValues (w,
-                    XmNlabelString, &text,
-                    NULL);
+        XmString text;
+        char *s;
+        XtVaGetValues (w,
+            XmNlabelString, &text,
+            NULL);

 
 

-      if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
-       {
-         wxString str(s);
-         XtFree (s);
-         return str;
-       }
-      else
-       {
-         return wxEmptyString;
-       }
+        if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
+        {
+            wxString str(s);
+            XtFree (s);
+            return str;
+        }
+        else
+        {
+            return wxEmptyString;
+        }

     }
     }

-  else
-    return wxEmptyString;
+    else
+        return wxEmptyString;

 
 }
 
 
 }
 


@@ -637,7 +645,7 @@ void wxMenuBar::Append (wxMenu * menu, const wxString& title)
     int i;
 
     for (i = 0; i < m_menuCount - 1; i++)
     int i;
 
     for (i = 0; i < m_menuCount - 1; i++)

-       {
+    {

         new_menus[i] = m_menus[i];
         m_menus[i] = NULL;
         new_titles[i] = m_titles[i];
         new_menus[i] = m_menus[i];
         m_menus[i] = NULL;
         new_titles[i] = m_titles[i];


@@ -665,11 +673,11 @@ void wxMenuBar::Delete(wxMenu * menu, int i)
 
     if (menu != 0)
     {
 
     if (menu != 0)
     {

-           for (ii = 0; ii < m_menuCount; ii++)
+        for (ii = 0; ii < m_menuCount; ii++)

         {
             if (m_menus[ii] == menu)
         {
             if (m_menus[ii] == menu)

-            break;
-           }
+                break;
+        }

         if (ii >= m_menuCount)
             return;
     } else
         if (ii >= m_menuCount)
             return;
     } else


@@ -719,7 +727,7 @@ wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu ** itemMenu) const
     for (i = 0; i < m_menuCount; i++)
         if ((item = m_menus[i]->FindItemForId (id, itemMenu)))
             return item;
     for (i = 0; i < m_menuCount; i++)
         if ((item = m_menus[i]->FindItemForId (id, itemMenu)))
             return item;

-    return NULL;
+        return NULL;

 }
 
 void wxMenuBar::SetHelpString (int id, const wxString& helpString)
 }
 
 void wxMenuBar::SetHelpString (int id, const wxString& helpString)


@@ -746,170 +754,378 @@ 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));
+
+        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;
+}
+
+// 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;
 static XtWorkProcId WorkProcMenuId;
 
 /* Since PopupMenu under Motif stills grab right mouse button events
 //// Motif-specific
 
 extern wxApp *wxTheApp;
 static XtWorkProcId WorkProcMenuId;
 
 /* Since PopupMenu under Motif stills grab right mouse button events

- * after it was closed, we need to delete the associated widgets to
- * allow next PopUpMenu to appear...
- */
+* after it was closed, we need to delete the associated widgets to
+* allow next PopUpMenu to appear...
+*/

 
 int PostDeletionOfMenu( XtPointer* clientData )
 {
 
 int PostDeletionOfMenu( XtPointer* clientData )
 {

-  XtRemoveWorkProc(WorkProcMenuId);
-  wxMenu *menu = (wxMenu *)clientData;
+    XtRemoveWorkProc(WorkProcMenuId);
+    wxMenu *menu = (wxMenu *)clientData;

 
 

-  if (menu->GetMainWidget()) {
-    wxList& list = menu->GetParent()->GetItems();
-    list.DeleteObject(menu);
-    menu->DestroyMenu(TRUE);
-  }
-  /* Mark as no longer popped up */
-  menu->m_menuId = -1;
-  return TRUE;
+    if (menu->GetMainWidget()) {
+        if (menu->GetParent())
+        {
+            wxList& list = menu->GetParent()->GetItems();
+            list.DeleteObject(menu);
+        }
+        menu->DestroyMenu(TRUE);
+    }
+    /* Mark as no longer popped up */
+    menu->m_menuId = -1;
+    return TRUE;

 }
 
 }
 

-void 
+void

 wxMenuPopdownCallback(Widget w, XtPointer clientData,
 wxMenuPopdownCallback(Widget w, XtPointer clientData,

-                     XtPointer ptr)
+                      XtPointer ptr)

 {
 {

-  wxMenu *menu = (wxMenu *)clientData;
-
-  // Added by JOREL Jean-Charles <jjorel@silr.ireste.fr>
-  /* 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(), 
-               (XtWorkProc) PostDeletionOfMenu,
-               (XtPointer) menu );
-  // Apparently not found in Motif headers
-  //  XtVaSetValues( w, XmNpopupEnabled, XmPOPUP_DISABLED, NULL );
+    wxMenu *menu = (wxMenu *)clientData;
+
+    // Added by JOREL Jean-Charles <jjorel@silr.ireste.fr>
+    /* 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(),
+        (XtWorkProc) PostDeletionOfMenu,
+        (XtPointer) menu );
+    // Apparently not found in Motif headers
+    //  XtVaSetValues( w, XmNpopupEnabled, XmPOPUP_DISABLED, NULL );

 }
 
 /*
 }
 
 /*

- * Create a popup or pulldown menu.
- * Submenus of a popup will be pulldown.
- *
- */
+* Create a popup or pulldown menu.
+* Submenus of a popup will be pulldown.
+*
+*/

 
 WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topMenu, const wxString& title, bool pullDown)
 {
 
 WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topMenu, const wxString& title, bool pullDown)
 {

-  Widget menu = (Widget) 0;
-  Widget buttonWidget = (Widget) 0;
-  Arg args[5];
-  XtSetArg (args[0], XmNnumColumns, m_numColumns);
-  XtSetArg (args[1], XmNpacking, XmPACK_COLUMN);
+    Widget menu = (Widget) 0;
+    Widget buttonWidget = (Widget) 0;
+    Arg args[5];
+    XtSetArg (args[0], XmNnumColumns, m_numColumns);
+    XtSetArg (args[1], XmNpacking, XmPACK_COLUMN);

 
 

-  if (!pullDown)
+    if (!pullDown)

     {
     {

-      menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2);
-      XtAddCallback(menu,
-                   XmNunmapCallback, 
-                   (XtCallbackProc)wxMenuPopdownCallback,
-                   (XtPointer)this);
+        menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2);
+        XtAddCallback(menu,
+            XmNunmapCallback,
+            (XtCallbackProc)wxMenuPopdownCallback,
+            (XtPointer)this);

     }
     }

-  else
+    else

     {
     {

-      char mnem = wxFindMnemonic (title);
-      wxStripMenuCodes ((char*) (const char*) title, wxBuffer);
+        char mnem = wxFindMnemonic (title);
+        wxStripMenuCodes ((char*) (const char*) title, wxBuffer);

 
 

-      menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2);
+        menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2);

 
 

-      XmString label_str = XmStringCreateSimple (wxBuffer);
-      buttonWidget = XtVaCreateManagedWidget (wxBuffer,
-#if USE_GADGETS
-                                        xmCascadeButtonGadgetClass, (Widget) parent,
+        wxString title2(wxStripMenuCodes(title));
+        wxXmString label_str(title2);
+        buttonWidget = XtVaCreateManagedWidget(title2,
+#if wxUSE_GADGETS
+            xmCascadeButtonGadgetClass, (Widget) parent,

 #else
 #else

-                                        xmCascadeButtonWidgetClass, (Widget) parent,
+            xmCascadeButtonWidgetClass, (Widget) parent,

 #endif
 #endif

-                                             XmNlabelString, label_str,
-                                             XmNsubMenuId, menu,
-                                             NULL);
-
-      if (mnem != 0)
-       XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL);
+            XmNlabelString, label_str(),
+            XmNsubMenuId, menu,
+            NULL);

 
 

-      XmStringFree (label_str);
+        if (mnem != 0)
+            XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL);

     }
 
     }
 

-  m_menuWidget = (WXWidget) menu;
+    m_menuWidget = (WXWidget) menu;

 
 

-  m_menuBar = menuBar;
-  m_topLevelMenu = topMenu;
+    m_menuBar = menuBar;
+    m_topLevelMenu = topMenu;

 
 

-  for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+    for (wxNode * node = m_menuItems.First (); node; node = node->Next ())

     {
     {

-      wxMenuItem *item = (wxMenuItem *) node->Data ();
-      item->CreateItem (menu, menuBar, topMenu);
+        wxMenuItem *item = (wxMenuItem *) node->Data ();
+        item->CreateItem (menu, menuBar, topMenu);

     }
 
     }
 

-  return buttonWidget;
+    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
 }
 
 // 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)
 {
 void wxMenu::DestroyMenu (bool full)
 {

-  for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+    for (wxNode * node = m_menuItems.First (); node; node = node->Next ())

     {
     {

-      wxMenuItem *item = (wxMenuItem *) node->Data ();
-      item->SetMenuBar((wxMenuBar*) NULL);
+        wxMenuItem *item = (wxMenuItem *) node->Data ();
+        item->SetMenuBar((wxMenuBar*) NULL);

 
 

-      item->DestroyItem(full);
-    }                          // for()
+        item->DestroyItem(full);
+    }// for()

 
 

-  if (m_buttonWidget)
+    if (m_buttonWidget)

     {
     {

-      if (full)
-      {
-        XtVaSetValues((Widget) m_buttonWidget, XmNsubMenuId, NULL, NULL);
-        XtDestroyWidget ((Widget) m_buttonWidget);
-        m_buttonWidget = (WXWidget) 0;
-      }
+        if (full)
+        {
+            XtVaSetValues((Widget) m_buttonWidget, XmNsubMenuId, NULL, NULL);
+            XtDestroyWidget ((Widget) m_buttonWidget);
+            m_buttonWidget = (WXWidget) 0;
+        }

     }
     }

-  if (m_menuWidget && full)
+    if (m_menuWidget && full)

     {
     {

-      XtDestroyWidget((Widget) m_menuWidget);
-      m_menuWidget = (WXWidget) NULL;
+        XtDestroyWidget((Widget) m_menuWidget);
+        m_menuWidget = (WXWidget) NULL;

     }
 }
 
 WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
 {
     }
 }
 
 WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
 {

-  if (id == m_menuId)
+    if (id == m_menuId)

     {
     {

-      if (it)
-       *it = (wxMenuItem*) NULL;
-      return m_buttonWidget;
+        if (it)
+            *it = (wxMenuItem*) NULL;
+        return m_buttonWidget;

     }
 
     }
 

-  for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+    for (wxNode * node = m_menuItems.First (); node; node = node->Next ())

     {
     {

-      wxMenuItem *item = (wxMenuItem *) node->Data ();
-      if (item->GetId() == id)
-       {
-         if (it)
-           *it = item;
-         return item->GetButtonWidget();
-       }
+        wxMenuItem *item = (wxMenuItem *) node->Data ();
+        if (item->GetId() == id)
+        {
+            if (it)
+                *it = item;
+            return item->GetButtonWidget();
+        }

 
 

-      if (item->GetSubMenu())
-       {
-         WXWidget w = item->GetSubMenu()->FindMenuItem (id, it);
-         if (w)
-           {
-             return w;
-           }
-       }
-    }                          // for()
-
-  if (it)
-    *it = (wxMenuItem*) NULL;
-  return (WXWidget) NULL;
+        if (item->GetSubMenu())
+        {
+            WXWidget w = item->GetSubMenu()->FindMenuItem (id, it);
+            if (w)
+            {
+                return w;
+            }
+        }
+    }// for()
+
+    if (it)
+        *it = (wxMenuItem*) NULL;
+    return (WXWidget) NULL;
+}
+
+void wxMenu::SetBackgroundColour(const wxColour& col)
+{
+    m_backgroundColour = col;
+    if (m_menuWidget)
+        wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
+    if (m_buttonWidget)
+        wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE);
+
+    wxNode* node = m_menuItems.First();
+    while (node)
+    {
+        wxMenuItem* item = (wxMenuItem*) node->Data();
+        if (item->GetButtonWidget())
+        {
+            // This crashes because it uses gadgets
+            //            wxDoChangeBackgroundColour(item->GetButtonWidget(), (wxColour&) col, TRUE);
+        }
+        if (item->GetSubMenu())
+            item->GetSubMenu()->SetBackgroundColour((wxColour&) col);
+        node = node->Next();
+    }

 }
 }

+
+void wxMenu::SetForegroundColour(const wxColour& col)
+{
+    m_foregroundColour = col;
+    if (m_menuWidget)
+        wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);
+    if (m_buttonWidget)
+        wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col);
+
+    wxNode* node = m_menuItems.First();
+    while (node)
+    {
+        wxMenuItem* item = (wxMenuItem*) node->Data();
+        if (item->GetButtonWidget())
+        {
+            // This crashes because it uses gadgets
+            //            wxDoChangeForegroundColour(item->GetButtonWidget(), (wxColour&) col);
+        }
+        if (item->GetSubMenu())
+            item->GetSubMenu()->SetForegroundColour((wxColour&) col);
+        node = node->Next();
+    }
+}
+
+void wxMenu::ChangeFont(bool keepOriginalSize)
+{
+    // lesstif 0.87 hangs when setting XmNfontList
+#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);
+    if (m_buttonWidget)
+    {
+        XtVaSetValues ((Widget) m_buttonWidget,
+            XmNfontList, fontList,
+            NULL);
+    }
+    wxNode* node = m_menuItems.First();
+    while (node)
+    {
+        wxMenuItem* item = (wxMenuItem*) node->Data();
+        if (m_menuWidget && item->GetButtonWidget() && m_font.Ok())
+        {
+            XtVaSetValues ((Widget) item->GetButtonWidget(),
+                XmNfontList, fontList,
+                NULL);
+        }
+        if (item->GetSubMenu())
+            item->GetSubMenu()->ChangeFont(keepOriginalSize);
+        node = node->Next();
+    }
+#endif
+}
+
+void wxMenu::SetFont(const wxFont& font)
+{
+    m_font = font;
+    ChangeFont();
+}
+
+void wxMenuBar::SetBackgroundColour(const wxColour& col)
+{
+
+    m_backgroundColour = col;
+    if (m_mainWidget)
+        wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col);
+    int i;
+    for (i = 0; i < m_menuCount; i++)
+        m_menus[i]->SetBackgroundColour((wxColour&) col);
+}
+
+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);
+}
+
+void wxMenuBar::ChangeFont(bool keepOriginalSize)
+{
+    // Nothing to do for menubar, fonts are kept in wxMenus
+}
+
+void wxMenuBar::SetFont(const wxFont& font)
+{
+    m_font = font;
+    ChangeFont();
+
+    int i;
+    for (i = 0; i < m_menuCount; i++)
+        m_menus[i]->SetFont(font);
+}
+