deprecate wxDC::SetClippingRegion(wxRegion) overload and replace it with SetDeviceCli...

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

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index 9d096e847f31ccc2bfdc3cbbf608495ff41931fb..e830c00c13a42eb6efba3d70743fb75b68cc3667 100644 (file)
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -137,7 +137,7 @@ void wxMenuItem::Check(bool bDoCheck)
 }
 
 /* static */
 }
 
 /* static */

-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+wxString wxMenuItemBase::GetLabelText(const wxString& text)

 {
     return wxStripMenuCodes(text);
 }
 {
     return wxStripMenuCodes(text);
 }


@@ -179,7 +179,7 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar,
 
         if (m_text.IsEmpty())
         {
 
         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);
         }
 
             txt = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
         }
 


@@ -284,7 +284,7 @@ void wxMenuItem::DestroyItem(bool full)
                 wxMenuItemDisarmCallback, (XtPointer) this);
         }
     }
                 wxMenuItemDisarmCallback, (XtPointer) this);
         }
     }

-    else if (GetId() == wxID_SEPARATOR)
+    else if (IsSeparator())

     {
         ;      // Nothing
 
     {
         ;      // Nothing
 


@@ -308,7 +308,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);
 {
     char mnem = wxFindMnemonic (label);
     wxString label2 = wxStripMenuCodes(label);


@@ -366,7 +366,7 @@ void wxMenuItemCallback (Widget WXUNUSED(w), XtPointer clientData,
             event.SetEventObject(item->GetMenuBar()->GetMenuBarFrame());
 
             item->GetMenuBar()->GetMenuBarFrame()
             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())
         }
         // this is the child of a popup menu
         else if (item->GetTopMenu())


@@ -398,7 +398,7 @@ void wxMenuItemArmCallback (Widget WXUNUSED(w), XtPointer clientData,
             menuEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame());
 
             item->GetMenuBar()->GetMenuBarFrame()
             menuEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame());
 
             item->GetMenuBar()->GetMenuBarFrame()

-                ->GetEventHandler()->ProcessEvent(menuEvent);
+                ->HandleWindowEvent(menuEvent);

         }
     }
 }
         }
     }
 }


@@ -418,7 +418,7 @@ wxMenuItemDisarmCallback (Widget WXUNUSED(w), XtPointer clientData,
             menuEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame());
 
             item->GetMenuBar()->GetMenuBarFrame()
             menuEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame());
 
             item->GetMenuBar()->GetMenuBarFrame()

-                ->GetEventHandler()->ProcessEvent(menuEvent);
+                ->HandleWindowEvent(menuEvent);

         }
     }
 }
         }
     }
 }