non-pch build fix

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

diff --git a/src/palmos/menuitem.cpp b/src/palmos/menuitem.cpp
index 681d1678758ffe4de3d1ad81769499a74100577c..a491c36a86a0c9b63345714142255c8098d56a9c 100644 (file)
--- a/src/palmos/menuitem.cpp
+++ b/src/palmos/menuitem.cpp
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.cpp
+// Name:        src/palmos/menuitem.cpp
 // Purpose:     wxMenuItem implementation
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,10 +17,6 @@
 // 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"
 
@@ -30,20 +26,19 @@
 
 #if wxUSE_MENUS
 
+#include "wx/menuitem.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/menu.h"
     #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/menu.h"
 #endif
 
-#include "wx/menuitem.h"
-#include "wx/log.h"
-
 #if wxUSE_ACCEL
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL
@@ -72,7 +67,7 @@
 bool wxMenuItemStreamingCallback( const wxObject *object, wxWriter * , wxPersister * , wxxVariantArray & )
 {
     const wxMenuItem * mitem = dynamic_cast<const wxMenuItem*>(object) ;
-    if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().IsEmpty() )
+    if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().empty() )
     {
         // we don't stream out the first two items for menus with a title, they will be reconstructed
         if ( mitem->GetMenu()->FindItemByPosition(0) == mitem || mitem->GetMenu()->FindItemByPosition(1) == mitem )
@@ -82,10 +77,10 @@ bool wxMenuItemStreamingCallback( const wxObject *object, wxWriter * , wxPersist
 }
 
 wxBEGIN_ENUM( wxItemKind )
-    wxENUM_MEMBER( wxITEM_SEPARATOR ) 
-    wxENUM_MEMBER( wxITEM_NORMAL ) 
-    wxENUM_MEMBER( wxITEM_CHECK ) 
-    wxENUM_MEMBER( wxITEM_RADIO ) 
+    wxENUM_MEMBER( wxITEM_SEPARATOR )
+    wxENUM_MEMBER( wxITEM_NORMAL )
+    wxENUM_MEMBER( wxITEM_CHECK )
+    wxENUM_MEMBER( wxITEM_RADIO )
 wxEND_ENUM( wxItemKind )
 
 IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuItem, wxObject,"wx/menuitem.h",wxMenuItemStreamingCallback)
@@ -155,12 +150,6 @@ wxMenuItem::~wxMenuItem()
 // misc
 // ----
 
-// return the id for calling Win32 API functions
-int wxMenuItem::GetRealId() const
-{
-    return 0;
-}
-
 // get item state
 // --------------
 
@@ -170,7 +159,7 @@ bool wxMenuItem::IsChecked() const
 }
 
 /* static */
-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+wxString wxMenuItemBase::GetLabelText(const wxString& text)
 {
     return wxStripMenuCodes(text);
 }
@@ -201,7 +190,7 @@ void wxMenuItem::Check(bool check)
 {
 }
 
-void wxMenuItem::SetText(const wxString& text)
+void wxMenuItem::SetItemLabel(const wxString& text)
 {
 }