Added GSocket motif (it compiles but I didn't tested it)

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 2ee35df7c290228a7316c86f98b1645fc5a05194..c02f30d72a123d588a60d7510acb77f975a2c2dc 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

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


@@ -58,14 +58,21 @@ 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;
     m_menuWidget = (WXWidget) NULL;
     //// Motif-specific members
     m_numColumns = 1;
     m_menuWidget = (WXWidget) NULL;


@@ -76,7 +83,7 @@ wxMenu::wxMenu(const wxString& title, const wxFunction func)
     m_ownedByMenuBar = FALSE;
     m_menuParent = (wxMenu*) NULL;
     m_clientData = (void*) NULL;
     m_ownedByMenuBar = FALSE;
     m_menuParent = (wxMenu*) NULL;
     m_clientData = (void*) NULL;

-    
+

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


@@ -85,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);
     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.


@@ -99,24 +108,24 @@ wxMenu::~wxMenu()
         else
             DestroyMenu(FALSE);
     }
         else
             DestroyMenu(FALSE);
     }

-    
+

     // Not sure if this is right
     if (m_menuParent && m_menuBar)
     {
         m_menuParent = NULL;
         //      m_menuBar = NULL;
     }
     // 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();
     wxNode *node = m_menuItems.First();
     while (node)
     {
         wxMenuItem *item = (wxMenuItem *)node->Data();

-        
+

         /*
         if (item->GetSubMenu())
         item->DeleteSubMenu();
         */
         /*
         if (item->GetSubMenu())
         item->DeleteSubMenu();
         */

-        
+

         wxNode *next = node->Next();
         delete item;
         delete node;
         wxNode *next = node->Next();
         delete item;
         delete node;


@@ -133,12 +142,12 @@ void wxMenu::Break()
 void wxMenu::Append(wxMenuItem *pItem)
 {
     wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" );
 void wxMenu::Append(wxMenuItem *pItem)
 {
     wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" );

-    
+

     m_menuItems.Append(pItem);
     m_menuItems.Append(pItem);

-    
+

     if (m_menuWidget)
     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++;
 }
 


@@ -153,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?
 
 // 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));

-    
+

     subMenu->m_topLevelMenu = m_topLevelMenu;
 }
 
 // Ordinary menu item
     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.
                     const wxString& helpString, bool checkable)
 {
     // 'checkable' parameter is useless for Windows.


@@ -174,19 +183,19 @@ void wxMenu::Delete(int id)
     wxNode *node;
     wxMenuItem *item;
     int pos;
     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;
     }
     {
         item = (wxMenuItem *)node->Data();
         if (item->GetId() == id)
             break;
     }

-    
+

     if (!node)
         return;
     if (!node)
         return;

-    
+

     item->DestroyItem(TRUE);
     item->DestroyItem(TRUE);

-    
+

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


@@ -195,7 +204,7 @@ void wxMenu::Delete(int id)
     children->DeleteObject(item->GetSubMenu());
     }
     */
     children->DeleteObject(item->GetSubMenu());
     }
     */

-    
+

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


@@ -204,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" );
 {
     wxMenuItem *item = FindItemForId(id);
     wxCHECK_RET( item != NULL, "can't enable non-existing menu item" );

-    
+

     item->Enable(flag);
 }
 
     item->Enable(flag);
 }
 


@@ -212,7 +221,7 @@ bool wxMenu::Enabled(int Id) const
 {
     wxMenuItem *item = FindItemForId(Id);
     wxCHECK( item != NULL, FALSE );
 {
     wxMenuItem *item = FindItemForId(Id);
     wxCHECK( item != NULL, FALSE );

-    
+

     return item->IsEnabled();
 }
 
     return item->IsEnabled();
 }
 


@@ -220,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" );
 {
     wxMenuItem *item = FindItemForId(Id);
     wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" );

-    
+

     item->Check(Flag);
 }
 
     item->Check(Flag);
 }
 


@@ -228,23 +237,23 @@ bool wxMenu::Checked(int id) const
 {
     wxMenuItem *item = FindItemForId(id);
     wxCHECK( item != NULL, FALSE );
 {
     wxMenuItem *item = FindItemForId(id);
     wxCHECK( item != NULL, FALSE );

-    
+

     return item->IsChecked();
 }
 
 void wxMenu::SetTitle(const wxString& label)
 {
     m_title = label ;
     return item->IsChecked();
 }
 
 void wxMenu::SetTitle(const wxString& label)
 {
     m_title = label ;

-    
+

     wxNode *node = m_menuItems.First ();
     if (!node)
         return;
     wxNode *node = m_menuItems.First ();
     if (!node)
         return;

-    
+

     wxMenuItem *item = (wxMenuItem *) node->Data ();
     Widget widget = (Widget) item->GetButtonWidget();
     if (!widget)
         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,
     XmString title_str = XmStringCreateSimple ((char*) (const char*) label);
     XtVaSetValues (widget,
         XmNlabelString, title_str,


@@ -262,7 +271,7 @@ void wxMenu::SetLabel(int id, const wxString& label)
     wxMenuItem *item = FindItemForId(id);
     if (item == (wxMenuItem*) NULL)
         return;
     wxMenuItem *item = FindItemForId(id);
     if (item == (wxMenuItem*) NULL)
         return;

-    
+

     item->SetLabel(label);
 }
 
     item->SetLabel(label);
 }
 


@@ -277,7 +286,7 @@ wxString wxMenu::GetLabel(int id) const
         XtVaGetValues ((Widget) w,
             XmNlabelString, &text,
             NULL);
         XtVaGetValues ((Widget) w,
             XmNlabelString, &text,
             NULL);

-        
+

         if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
         {
             wxString str(s);
         if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
         {
             wxString str(s);


@@ -300,7 +309,7 @@ int wxMenu::FindItem (const wxString& itemString) const
     char buf1[200];
     char buf2[200];
     wxStripMenuCodes ((char *)(const char *)itemString, buf1);
     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 ();
     for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
     {
         wxMenuItem *item = (wxMenuItem *) node->Data ();


@@ -317,7 +326,7 @@ int wxMenu::FindItem (const wxString& itemString) const
                 return item->GetId();
         }
     }
                 return item->GetId();
         }
     }

-    
+

     return -1;
 }
 
     return -1;
 }
 


@@ -328,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 ();
     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->GetId() == itemId)
         {
             if (itemMenu)
                 *itemMenu = (wxMenu *) this;
             return item;
         }

-        
+

         if (item->GetSubMenu())
         {
             wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu);
         if (item->GetSubMenu())
         {
             wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu);


@@ -343,7 +352,7 @@ wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
                 return ans;
         }
     }
                 return ans;
         }
     }

-    
+

     if (itemMenu)
         *itemMenu = NULL;
     return NULL;
     if (itemMenu)
         *itemMenu = NULL;
     return NULL;


@@ -366,89 +375,63 @@ wxString wxMenu::GetHelpString (int itemId) const
 void wxMenu::ProcessCommand(wxCommandEvent & event)
 {
     bool processed = FALSE;
 void wxMenu::ProcessCommand(wxCommandEvent & event)
 {
     bool processed = FALSE;

-    
+

     // Try a callback
     if (m_callback)
     {
         (void) (*(m_callback)) (*this, event);
         processed = TRUE;
     }
     // Try a callback
     if (m_callback)
     {
         (void) (*(m_callback)) (*this, event);
         processed = TRUE;
     }

-    
+

     // Try the menu's event handler
     if ( !processed && GetEventHandler())
     {
         processed = GetEventHandler()->ProcessEvent(event);
     }
     // Try the menu's event handler
     if ( !processed && GetEventHandler())
     {
         processed = GetEventHandler()->ProcessEvent(event);
     }

-    /* TODO

     // Try the window the menu was popped up from (and up
     // through the hierarchy)
     if ( !processed && GetInvokingWindow())
     processed = GetInvokingWindow()->ProcessEvent(event);
     // Try the window the menu was popped up from (and up
     // through the hierarchy)
     if ( !processed && GetInvokingWindow())
     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)
+  {
+    wxMenuItem* item = (wxMenuItem*) node->Data();
+    if ( !item->IsSeparator() )

     {
     {

-    wxCanvas *canvas = (wxCanvas *) this;
-    deviceX = canvas->GetDC ()->LogicalToDeviceX (x);
-    deviceY = canvas->GetDC ()->LogicalToDeviceY (y);
+      wxWindowID id = item->GetId();
+      wxUpdateUIEvent event(id);
+      event.SetEventObject( source );
+
+      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());
+      }
+
+      if (item->GetSubMenu())
+        item->GetSubMenu()->UpdateUI(source);

     }
     }

-    */
-    
-    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;
+    node = node->Next();
+  }

 }
 
 // Menu Bar
 }
 
 // Menu Bar


@@ -465,6 +448,19 @@ wxMenuBar::wxMenuBar()
     m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 }
 
     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[])
 {
     m_eventHandler = this;
 wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
 {
     m_eventHandler = this;


@@ -515,10 +511,10 @@ void wxMenuBar::Check(int id, bool flag)
     wxMenuItem *item = FindItemForId(id, &itemMenu) ;
     if (!item)
         return;
     wxMenuItem *item = FindItemForId(id, &itemMenu) ;
     if (!item)
         return;

-    
+

     if (!item->IsCheckable())
         return ;
     if (!item->IsCheckable())
         return ;

-    
+

     item->Check(flag);
 }
 
     item->Check(flag);
 }
 


@@ -528,7 +524,7 @@ bool wxMenuBar::Checked(int id) const
     wxMenuItem *item = FindItemForId(id, &itemMenu) ;
     if (!item)
         return FALSE;
     wxMenuItem *item = FindItemForId(id, &itemMenu) ;
     if (!item)
         return FALSE;

-    
+

     return item->IsChecked();
 }
 
     return item->IsChecked();
 }
 


@@ -538,7 +534,7 @@ bool wxMenuBar::Enabled(int id) const
     wxMenuItem *item = FindItemForId(id, &itemMenu) ;
     if (!item)
         return FALSE;
     wxMenuItem *item = FindItemForId(id, &itemMenu) ;
     if (!item)
         return FALSE;

-    
+

     return item->IsEnabled();
 }
 
     return item->IsEnabled();
 }
 


@@ -546,10 +542,10 @@ void wxMenuBar::SetLabel(int id, const wxString& label)
 {
     wxMenu *itemMenu = NULL;
     wxMenuItem *item = FindItemForId(id, &itemMenu) ;
 {
     wxMenu *itemMenu = NULL;
     wxMenuItem *item = FindItemForId(id, &itemMenu) ;

-    
+

     if (!item)
         return;
     if (!item)
         return;

-    
+

     item->SetLabel(label);
 }
 
     item->SetLabel(label);
 }
 


@@ -557,17 +553,17 @@ wxString wxMenuBar::GetLabel(int id) const
 {
     wxMenu *itemMenu = NULL;
     wxMenuItem *item = FindItemForId(id, &itemMenu) ;
 {
     wxMenu *itemMenu = NULL;
     wxMenuItem *item = FindItemForId(id, &itemMenu) ;

-    
+

     if (!item)
         return wxString("");
     if (!item)
         return wxString("");

-    
+

     return item->GetLabel();
 }
 
 void wxMenuBar::SetLabelTop(int pos, const wxString& label)
 {
     wxASSERT( (pos < m_menuCount) );
     return item->GetLabel();
 }
 
 void wxMenuBar::SetLabelTop(int pos, const wxString& label)
 {
     wxASSERT( (pos < m_menuCount) );

-    
+

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


@@ -582,7 +578,7 @@ void wxMenuBar::SetLabelTop(int pos, const wxString& label)
 wxString wxMenuBar::GetLabelTop(int pos) const
 {
     wxASSERT( (pos < m_menuCount) );
 wxString wxMenuBar::GetLabelTop(int pos) const
 {
     wxASSERT( (pos < m_menuCount) );

-    
+

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


@@ -591,7 +587,7 @@ wxString wxMenuBar::GetLabelTop(int pos) const
         XtVaGetValues (w,
             XmNlabelString, &text,
             NULL);
         XtVaGetValues (w,
             XmNlabelString, &text,
             NULL);

-        
+

         if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
         {
             wxString str(s);
         if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
         {
             wxString str(s);


@@ -605,7 +601,7 @@ wxString wxMenuBar::GetLabelTop(int pos) const
     }
     else
         return wxEmptyString;
     }
     else
         return wxEmptyString;

-    
+

 }
 
 bool wxMenuBar::OnDelete(wxMenu *menu, int pos)
 }
 
 bool wxMenuBar::OnDelete(wxMenu *menu, int pos)


@@ -613,7 +609,7 @@ bool wxMenuBar::OnDelete(wxMenu *menu, int pos)
     // Only applies to dynamic deletion (when set in frame)
     if (!m_menuBarFrame)
         return TRUE;
     // Only applies to dynamic deletion (when set in frame)
     if (!m_menuBarFrame)
         return TRUE;

-    
+

     menu->DestroyMenu(TRUE);
     return TRUE;
 }
     menu->DestroyMenu(TRUE);
     return TRUE;
 }


@@ -623,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;
     // 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;
     // Probably should be an assert here
     if (menu->GetParent())
         return FALSE;

-    
+

     // Has already been appended
     if (menu->GetButtonWidget())
         return FALSE;
     // Has already been appended
     if (menu->GetButtonWidget())
         return FALSE;

-    
+

     WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE);
     menu->SetButtonWidget(w);
     WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE);
     menu->SetButtonWidget(w);

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -642,12 +638,12 @@ void wxMenuBar::Append (wxMenu * menu, const wxString& title)
 {
     if (!OnAppend(menu, title))
         return;
 {
     if (!OnAppend(menu, title))
         return;

-    
+

     m_menuCount ++;
     wxMenu **new_menus = new wxMenu *[m_menuCount];
     wxString *new_titles = new wxString[m_menuCount];
     int i;
     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];
     for (i = 0; i < m_menuCount - 1; i++)
     {
         new_menus[i] = m_menus[i];


@@ -662,10 +658,10 @@ void wxMenuBar::Append (wxMenu * menu, const wxString& title)
     }
     m_menus = new_menus;
     m_titles = new_titles;
     }
     m_menus = new_menus;
     m_titles = new_titles;

-    
+

     m_menus[m_menuCount - 1] = (wxMenu *)menu;
     m_titles[m_menuCount - 1] = title;
     m_menus[m_menuCount - 1] = (wxMenu *)menu;
     m_titles[m_menuCount - 1] = title;

-    
+

     menu->SetMenuBar(this);
     menu->SetParent(this);
 }
     menu->SetMenuBar(this);
     menu->SetParent(this);
 }


@@ -674,7 +670,7 @@ void wxMenuBar::Delete(wxMenu * menu, int i)
 {
     int j;
     int ii = (int) i;
 {
     int j;
     int ii = (int) i;

-    
+

     if (menu != 0)
     {
         for (ii = 0; ii < m_menuCount; ii++)
     if (menu != 0)
     {
         for (ii = 0; ii < m_menuCount; ii++)


@@ -690,12 +686,12 @@ void wxMenuBar::Delete(wxMenu * menu, int i)
             return;
         menu = m_menus[ii];
     }
             return;
         menu = m_menus[ii];
     }

-    
+

     if (!OnDelete(menu, ii))
         return;
     if (!OnDelete(menu, ii))
         return;

-    
+

     menu->SetParent((wxEvtHandler*) NULL);
     menu->SetParent((wxEvtHandler*) NULL);

-    
+

     -- m_menuCount;
     for (j = ii; j < m_menuCount; j++)
     {
     -- m_menuCount;
     for (j = ii; j < m_menuCount; j++)
     {


@@ -725,7 +721,7 @@ wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu ** itemMenu) const
 {
     if (itemMenu)
         *itemMenu = NULL;
 {
     if (itemMenu)
         *itemMenu = NULL;

-    
+

     wxMenuItem *item = NULL;
     int i;
     for (i = 0; i < m_menuCount; i++)
     wxMenuItem *item = NULL;
     int i;
     for (i = 0; i < m_menuCount; i++)


@@ -771,35 +767,42 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
         XtMapWidget((Widget) m_mainWidget);
         return TRUE;
     }
         XtMapWidget((Widget) m_mainWidget);
         return TRUE;
     }

-    
+

     Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWindowWidget(), "MenuBar", NULL, 0);
     m_mainWidget = (WXWidget) menuBarW;
     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));
     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);
         wxStripMenuCodes ((char*) (const char*) title, wxBuffer);

-        
+

         if (strcmp (wxBuffer, "Help") == 0)
             XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
         if (strcmp (wxBuffer, "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);
     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);
     XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
     XtRealizeWidget ((Widget) menuBarW);
     XtManageChild ((Widget) menuBarW);
     SetMenuBarFrame(parent);

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -811,22 +814,22 @@ bool wxMenuBar::DestroyMenuBar()
         SetMenuBarFrame((wxFrame*) NULL);
         return FALSE;
     }
         SetMenuBarFrame((wxFrame*) NULL);
         return FALSE;
     }

-    
+

     XtUnmanageChild ((Widget) m_mainWidget);
     XtUnrealizeWidget ((Widget) m_mainWidget);
     XtUnmanageChild ((Widget) m_mainWidget);
     XtUnrealizeWidget ((Widget) m_mainWidget);

-    
+

     int i;
     for (i = 0; i < GetMenuCount(); i++)
     {
         wxMenu *menu = GetMenu(i);
         menu->DestroyMenu(TRUE);
     int i;
     for (i = 0; i < GetMenuCount(); i++)
     {
         wxMenu *menu = GetMenu(i);
         menu->DestroyMenu(TRUE);

-        
+

     }
     XtDestroyWidget((Widget) m_mainWidget);
     m_mainWidget = (WXWidget) 0;
     }
     XtDestroyWidget((Widget) m_mainWidget);
     m_mainWidget = (WXWidget) 0;

-    
+

     SetMenuBarFrame((wxFrame*) NULL);
     SetMenuBarFrame((wxFrame*) NULL);

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -844,7 +847,7 @@ int PostDeletionOfMenu( XtPointer* clientData )
 {
     XtRemoveWorkProc(WorkProcMenuId);
     wxMenu *menu = (wxMenu *)clientData;
 {
     XtRemoveWorkProc(WorkProcMenuId);
     wxMenu *menu = (wxMenu *)clientData;

-    
+

     if (menu->GetMainWidget()) {
         if (menu->GetParent())
         {
     if (menu->GetMainWidget()) {
         if (menu->GetParent())
         {


@@ -858,20 +861,20 @@ int PostDeletionOfMenu( XtPointer* clientData )
     return TRUE;
 }
 
     return TRUE;
 }
 

-void 
+void

 wxMenuPopdownCallback(Widget w, XtPointer clientData,
                       XtPointer ptr)
 {
     wxMenu *menu = (wxMenu *)clientData;
 wxMenuPopdownCallback(Widget w, XtPointer clientData,
                       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!! :(
     */
     // 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(), 
+
+    WorkProcMenuId = XtAppAddWorkProc(
+        (XtAppContext) wxTheApp->GetAppContext(),

         (XtWorkProc) PostDeletionOfMenu,
         (XtPointer) menu );
     // Apparently not found in Motif headers
         (XtWorkProc) PostDeletionOfMenu,
         (XtPointer) menu );
     // Apparently not found in Motif headers


@@ -891,12 +894,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);
     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,
     if (!pullDown)
     {
         menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2);
         XtAddCallback(menu,

-            XmNunmapCallback, 
+            XmNunmapCallback,

             (XtCallbackProc)wxMenuPopdownCallback,
             (XtPointer)this);
     }
             (XtCallbackProc)wxMenuPopdownCallback,
             (XtPointer)this);
     }


@@ -904,9 +907,9 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
     {
         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 wxUSE_GADGETS
         XmString label_str = XmStringCreateSimple (wxBuffer);
         buttonWidget = XtVaCreateManagedWidget (wxBuffer,
 #if wxUSE_GADGETS


@@ -917,44 +920,44 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
             XmNlabelString, label_str,
             XmNsubMenuId, menu,
             NULL);
             XmNlabelString, label_str,
             XmNsubMenuId, menu,
             NULL);

-        
+

         if (mnem != 0)
             XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL);
         if (mnem != 0)
             XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL);

-        
+

         XmStringFree (label_str);
     }
         XmStringFree (label_str);
     }

-    
+

     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 ())
     {
         wxMenuItem *item = (wxMenuItem *) node->Data ();
         item->CreateItem (menu, menuBar, 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);
     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
     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);
 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);
         item->DestroyItem(full);

-    }                          // for()
-    
+    }// for()
+

     if (m_buttonWidget)
     {
         if (full)
     if (m_buttonWidget)
     {
         if (full)


@@ -979,7 +982,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
             *it = (wxMenuItem*) NULL;
         return m_buttonWidget;
     }
             *it = (wxMenuItem*) NULL;
         return m_buttonWidget;
     }

-    
+

     for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
     {
         wxMenuItem *item = (wxMenuItem *) node->Data ();
     for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
     {
         wxMenuItem *item = (wxMenuItem *) node->Data ();


@@ -989,7 +992,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
                 *it = item;
             return item->GetButtonWidget();
         }
                 *it = item;
             return item->GetButtonWidget();
         }

-        
+

         if (item->GetSubMenu())
         {
             WXWidget w = item->GetSubMenu()->FindMenuItem (id, it);
         if (item->GetSubMenu())
         {
             WXWidget w = item->GetSubMenu()->FindMenuItem (id, it);


@@ -998,8 +1001,8 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
                 return w;
             }
         }
                 return w;
             }
         }

-    }                          // for()
-    
+    }// for()
+

     if (it)
         *it = (wxMenuItem*) NULL;
     return (WXWidget) NULL;
     if (it)
         *it = (wxMenuItem*) NULL;
     return (WXWidget) NULL;


@@ -1012,7 +1015,7 @@ void wxMenu::SetBackgroundColour(const wxColour& col)
         wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
     if (m_buttonWidget)
         wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE);
         wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
     if (m_buttonWidget)
         wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE);

-    
+

     wxNode* node = m_menuItems.First();
     while (node)
     {
     wxNode* node = m_menuItems.First();
     while (node)
     {


@@ -1035,7 +1038,7 @@ void wxMenu::SetForegroundColour(const wxColour& col)
         wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);
     if (m_buttonWidget)
         wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col);
         wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);
     if (m_buttonWidget)
         wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col);

-    
+

     wxNode* node = m_menuItems.First();
     while (node)
     {
     wxNode* node = m_menuItems.First();
     while (node)
     {


@@ -1054,12 +1057,12 @@ void wxMenu::SetForegroundColour(const wxColour& col)
 void wxMenu::ChangeFont(bool keepOriginalSize)
 {
     // lesstif 0.87 hangs when setting XmNfontList
 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;
     if (!m_font.Ok() || !m_menuWidget)
         return;

-    
+

     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_menuWidget));
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_menuWidget));

-    
+

     XtVaSetValues ((Widget) m_menuWidget,
         XmNfontList, fontList,
         NULL);
     XtVaSetValues ((Widget) m_menuWidget,
         XmNfontList, fontList,
         NULL);


@@ -1094,7 +1097,7 @@ void wxMenu::SetFont(const wxFont& font)
 
 void wxMenuBar::SetBackgroundColour(const wxColour& col)
 {
 
 void wxMenuBar::SetBackgroundColour(const wxColour& col)
 {

-    
+

     m_backgroundColour = col;
     if (m_mainWidget)
         wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col);
     m_backgroundColour = col;
     if (m_mainWidget)
         wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col);


@@ -1108,7 +1111,7 @@ void wxMenuBar::SetForegroundColour(const wxColour& col)
     m_foregroundColour = col;
     if (m_mainWidget)
         wxDoChangeForegroundColour(m_mainWidget, (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);
     int i;
     for (i = 0; i < m_menuCount; i++)
         m_menus[i]->SetForegroundColour((wxColour&) col);


@@ -1123,7 +1126,7 @@ void wxMenuBar::SetFont(const wxFont& font)
 {
     m_font = font;
     ChangeFont();
 {
     m_font = font;
     ChangeFont();

-    
+

     int i;
     for (i = 0; i < m_menuCount; i++)
         m_menus[i]->SetFont(font);
     int i;
     for (i = 0; i < m_menuCount; i++)
         m_menus[i]->SetFont(font);