adding explicit log.h include

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

diff --git a/src/palmos/menuitem.cpp b/src/palmos/menuitem.cpp
index 829cb94c1dd2100a0831e132c1ae9f1bf2b6239a..bf3d419497754ee94df51678565b554633f36620 100644 (file)
--- a/src/palmos/menuitem.cpp
+++ b/src/palmos/menuitem.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "menuitem.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,20 +26,19 @@
 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 

+#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/window.h"
     #include "wx/accel.h"

-    #include "wx/menu.h"

     #include "wx/string.h"
     #include "wx/string.h"

+    #include "wx/log.h"
+    #include "wx/menu.h"

 #endif
 
 #endif
 

-#include "wx/menuitem.h"
-#include "wx/log.h"
-

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


@@ -163,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
 // -----------------
 


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

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

 {
 }
 
 {
 }