don't overwrite the existing local file if we failed to open it but it does exist

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 79c03953b8145b094c1907683fb0b9c7096331e3..2398a129a55c4251a7cd43c79f4629a01cc43444 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -207,7 +207,7 @@ bool wxMenuItem::IsChecked() const
 }
 
 /* static */
 }
 
 /* static */

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

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


@@ -337,7 +337,7 @@ void wxMenuItem::Check(bool check)
     wxMenuItemBase::Check(check);
 }
 
     wxMenuItemBase::Check(check);
 }
 

-void wxMenuItem::SetText(const wxString& txt)
+void wxMenuItem::SetItemLabel(const wxString& txt)

 {
     wxString text = txt;
 
 {
     wxString text = txt;
 


@@ -346,7 +346,7 @@ void wxMenuItem::SetText(const wxString& txt)
         return;
 
     // wxMenuItemBase will do stock ID checks
         return;
 
     // wxMenuItemBase will do stock ID checks

-    wxMenuItemBase::SetText(text);
+    wxMenuItemBase::SetItemLabel(text);

 
     // m_text could now be different from 'text' if we are a stock menu item,
     // so use only m_text below
 
     // m_text could now be different from 'text' if we are a stock menu item,
     // so use only m_text below


@@ -392,7 +392,7 @@ void wxMenuItem::SetText(const wxString& txt)
 #endif  //owner drawn
         {
             flagsOld |= MF_STRING;
 #endif  //owner drawn
         {
             flagsOld |= MF_STRING;

-            data = (wxChar*) m_text.c_str();
+            data = (wxChar*) m_text.wx_str();

         }
 
 #ifdef __WXWINCE__
         }
 
 #ifdef __WXWINCE__