fix handling of stock menu items (creating a stock item without label left its label...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index 95312d428c3651a6d2b62fe2c39e8a0a6a800eef..565cb5620d55f2fbd192b4643b5988461ee96245 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -58,7 +58,7 @@ public:
 
 private:
     // common part of all ctors
 
 private:
     // common part of all ctors

-    void Init(const wxString& text);
+    void Init();

 
     // DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
     // style to GTK+ and is called from ctor and SetText()
 
     // DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
     // style to GTK+ and is called from ctor and SetText()

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index f18d924fdb2918d4f7a7985921ff0e812e5226b7..ea47b894ec325784450d37b418945ff0d288c126 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -704,7 +704,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
 {
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
 {

-    Init(text);
+    Init();

 }
 
 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
 }
 
 wxMenuItem::wxMenuItem(wxMenu *parentMenu,


@@ -716,15 +716,15 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
           : wxMenuItemBase(parentMenu, id, text, help,
                            isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
 {
           : wxMenuItemBase(parentMenu, id, text, help,
                            isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
 {

-    Init(text);
+    Init();

 }
 
 }
 

-void wxMenuItem::Init(const wxString& text)
+void wxMenuItem::Init()

 {
     m_labelWidget = (GtkWidget *) NULL;
     m_menuItem = (GtkWidget *) NULL;
 
 {
     m_labelWidget = (GtkWidget *) NULL;
     m_menuItem = (GtkWidget *) NULL;
 

-    DoSetText(text);
+    DoSetText(m_text);

 }
 
 wxMenuItem::~wxMenuItem()
 }
 
 wxMenuItem::~wxMenuItem()


@@ -834,7 +834,9 @@ void wxMenuItem::SetText( const wxString& string )
 void wxMenuItem::DoSetText( const wxString& str )
 {
     // '\t' is the deliminator indicating a hot key
 void wxMenuItem::DoSetText( const wxString& str )
 {
     // '\t' is the deliminator indicating a hot key

-    m_text.Empty();
+    wxString text;
+    text.reserve(str.length());
+

     const wxChar *pc = str;
     while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) )
     {
     const wxChar *pc = str;
     while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) )
     {


@@ -842,30 +844,32 @@ void wxMenuItem::DoSetText( const wxString& str )
         {
             // "&" is doubled to indicate "&" instead of accelerator
             ++pc;
         {
             // "&" is doubled to indicate "&" instead of accelerator
             ++pc;

-            m_text << wxT('&');
+            text << wxT('&');

         }
         else if (*pc == wxT('&'))
         {
         }
         else if (*pc == wxT('&'))
         {

-            m_text << wxT('_');
+            text << wxT('_');

         }
         else if ( *pc == wxT('_') )    // escape underscores
         {
         }
         else if ( *pc == wxT('_') )    // escape underscores
         {

-            m_text << wxT("__");
+            text << wxT("__");

         }
         else
         {
         }
         else
         {

-            m_text << *pc;
+            text << *pc;

         }
         ++pc;
     }
 
     m_hotKey = wxEmptyString;
 
         }
         ++pc;
     }
 
     m_hotKey = wxEmptyString;
 

-    if(*pc == wxT('\t'))
+    if ( *pc == wxT('\t') )

     {
        pc++;
        m_hotKey = pc;
     }
     {
        pc++;
        m_hotKey = pc;
     }

+
+    m_text = text;

 }
 
 #if wxUSE_ACCEL
 }
 
 #if wxUSE_ACCEL