wxSocekt now uses wxPostEvent.

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 47ac10d93f9ab58fc6276b86de624b85eac0d87f..daff7c92be69433d65cd5e75d86d55112f25b8f9 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -625,11 +625,12 @@ wxMenuItem::~wxMenuItem()
 }
 
 // return the menu item text without any menu accels
 }
 
 // return the menu item text without any menu accels

-wxString wxMenuItem::GetLabel() const
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)

 {
     wxString label;
 #if (GTK_MINOR_VERSION > 0)
 {
     wxString label;
 #if (GTK_MINOR_VERSION > 0)

-    for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
+    for ( const wxChar *pc = text.c_str(); *pc; pc++ )

     {
         if ( *pc == wxT('_') )
         {
     {
         if ( *pc == wxT('_') )
         {


@@ -640,7 +641,7 @@ wxString wxMenuItem::GetLabel() const
         label += *pc;
     }
 #else // GTK+ 1.0
         label += *pc;
     }
 #else // GTK+ 1.0

-    label = m_text;
+    label = text;

 #endif // GTK+ 1.2/1.0
 
     return label;
 #endif // GTK+ 1.2/1.0
 
     return label;