fixed the menu bug introduced by the previous commit

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

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index ce936fa4ac3f7fac2550f7519d5c97592ad8b630..0fb1eed49dc453e4a7fd74b422d9d3a6fab04b05 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -62,7 +62,7 @@ public:
 
 private:
     // common part of all ctors
 
 private:
     // common part of all ctors

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

 
     // 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/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index ce936fa4ac3f7fac2550f7519d5c97592ad8b630..0fb1eed49dc453e4a7fd74b422d9d3a6fab04b05 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -62,7 +62,7 @@ public:
 
 private:
     // common part of all ctors
 
 private:
     // common part of all ctors

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

 
     // 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/gtk/menu.cpp b/src/gtk/menu.cpp
index b2098039c68e09bf1f5f1c8acecc1c5fdfbb54b9..e6789d180b90f95a260ada12558bf1f6c0a35bec 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -713,7 +713,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
 {
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
 {

-    Init();
+    Init(text);

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


@@ -725,15 +725,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();
+    Init(text);

 }
 
 }
 

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

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

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

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

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

-    Init();
+    Init(text);

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


@@ -725,15 +725,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();
+    Init(text);

 }
 
 }
 

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

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

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

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