fix warnings about hiding virtual wxGraphicsContext::DrawText() overloads by using...

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

diff --git a/src/palmos/menuitem.cpp b/src/palmos/menuitem.cpp
index f0dc626bdd1eb7852a6f1f3f2e305fdf28814818..bf3d419497754ee94df51678565b554633f36620 100644 (file)
--- a/src/palmos/menuitem.cpp
+++ b/src/palmos/menuitem.cpp
@@ -26,21 +26,19 @@
 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 

-#include "wx/menu.h"
+#include "wx/menuitem.h"

 
 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
 
 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"

-    #include "wx/font.h"

     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/menu.h"

 #endif
 
 #endif
 

-#include "wx/menuitem.h"
-

 #if wxUSE_ACCEL
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL
 #if wxUSE_ACCEL
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL


@@ -160,12 +158,6 @@ bool wxMenuItem::IsChecked() const
     return false;
 }
 
     return false;
 }
 

-/* static */
-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
-{
-    return wxStripMenuCodes(text);
-}
-

 // radio group stuff
 // -----------------
 
 // radio group stuff
 // -----------------
 


@@ -192,7 +184,7 @@ void wxMenuItem::Check(bool check)
 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }