use wxTextEntry in wxTextValidator (modified patch 1821743)

[wxWidgets.git] / include / wx / palmos / menu.h

diff --git a/include/wx/palmos/menu.h b/include/wx/palmos/menu.h
index ff4bbb5bd3a170f07bd3382695405141f078b338..6859d70bbb7bc3ea7504f8fd769ce8ee39846d31 100644 (file)
--- a/include/wx/palmos/menu.h
+++ b/include/wx/palmos/menu.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "menu.h"
-#endif
-
 #if wxUSE_ACCEL
     #include "wx/accel.h"
     #include "wx/dynarray.h"
@@ -23,10 +19,10 @@
     WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
 #endif // wxUSE_ACCEL
 
-class WXDLLEXPORT wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
 
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR
-class WXDLLEXPORT wxToolBar;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;
 #endif
 
 #include "wx/arrstr.h"
@@ -148,8 +144,8 @@ public:
     virtual wxMenu *Remove(size_t pos);
 
     virtual void EnableTop( size_t pos, bool flag );
-    virtual void SetLabelTop( size_t pos, const wxString& label );
-    virtual wxString GetLabelTop( size_t pos ) const;
+    virtual void SetMenuLabel( size_t pos, const wxString& label );
+    virtual wxString GetMenuLabel( size_t pos ) const;
 
     // implementation from now on
     WXHMENU Create();