Test wxTE_PROCESS_ENTER in the combobox page of the widgets sample.

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

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index 9d096e847f31ccc2bfdc3cbbf608495ff41931fb..76b337eb4c87dc318046ff749a88bc677418db64 100644 (file)
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -63,8 +63,6 @@ static void wxMenuItemDisarmCallback(Widget w, XtPointer clientData, XtPointer p
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-
 // ----------------------------------------------------------------------------
 // wxMenuItem
 // ----------------------------------------------------------------------------
@@ -136,12 +134,6 @@ void wxMenuItem::Check(bool bDoCheck)
     }
 }
 
-/* static */
-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
-{
-    return wxStripMenuCodes(text);
-}
-
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 // ----------------------------------------------------------------------------
@@ -179,7 +171,7 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar,
 
         if (m_text.IsEmpty())
         {
-            wxASSERT_MSG(wxIsStockId(GetId()), wxT("A non-stock menu item with an empty label?"));
+            wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
             txt = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
         }
 
@@ -284,7 +276,7 @@ void wxMenuItem::DestroyItem(bool full)
                 wxMenuItemDisarmCallback, (XtPointer) this);
         }
     }
-    else if (GetId() == wxID_SEPARATOR)
+    else if (IsSeparator())
     {
         ;      // Nothing
 
@@ -308,7 +300,7 @@ void wxMenuItem::DestroyItem(bool full)
     }
 }
 
-void wxMenuItem::SetText(const wxString& label)
+void wxMenuItem::SetItemLabel(const wxString& label)
 {
     char mnem = wxFindMnemonic (label);
     wxString label2 = wxStripMenuCodes(label);
@@ -346,7 +338,7 @@ void wxMenuItemCallback (Widget WXUNUSED(w), XtPointer clientData,
     wxMenuItem *item = (wxMenuItem *) clientData;
     if (item)
     {
-        wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, item->GetId());
+        wxCommandEvent event(wxEVT_MENU, item->GetId());
         event.SetInt( item->GetId() );
 
         if (item->IsCheckable())
@@ -366,7 +358,7 @@ void wxMenuItemCallback (Widget WXUNUSED(w), XtPointer clientData,
             event.SetEventObject(item->GetMenuBar()->GetMenuBarFrame());
 
             item->GetMenuBar()->GetMenuBarFrame()
-                ->GetEventHandler()->ProcessEvent(event);
+                ->HandleWindowEvent(event);
         }
         // this is the child of a popup menu
         else if (item->GetTopMenu())
@@ -398,7 +390,7 @@ void wxMenuItemArmCallback (Widget WXUNUSED(w), XtPointer clientData,
             menuEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame());
 
             item->GetMenuBar()->GetMenuBarFrame()
-                ->GetEventHandler()->ProcessEvent(menuEvent);
+                ->HandleWindowEvent(menuEvent);
         }
     }
 }
@@ -418,7 +410,7 @@ wxMenuItemDisarmCallback (Widget WXUNUSED(w), XtPointer clientData,
             menuEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame());
 
             item->GetMenuBar()->GetMenuBarFrame()
-                ->GetEventHandler()->ProcessEvent(menuEvent);
+                ->HandleWindowEvent(menuEvent);
         }
     }
 }