Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/palmos/menu.h b/include/wx/palmos/menu.h
index ff4bbb5bd3a170f07bd3382695405141f078b338..2ae654f7ad52cf02e710ed61e72d9e8e02eff6b9 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_
 
 #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"
 #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
 
     WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
 #endif // wxUSE_ACCEL
 

-class WXDLLEXPORT wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;

 
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR
 
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR

-class WXDLLEXPORT wxToolBar;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;

 #endif
 
 #include "wx/arrstr.h"
 #endif
 
 #include "wx/arrstr.h"


@@ -35,7 +31,7 @@ class WXDLLEXPORT wxToolBar;
 // Menu
 // ----------------------------------------------------------------------------
 
 // Menu
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMenu : public wxMenuBase
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase

 {
 public:
     // ctors & dtor
 {
 public:
     // ctors & dtor


@@ -107,26 +103,7 @@ private:
 // Menu Bar (a la Windows)
 // ----------------------------------------------------------------------------
 
 // Menu Bar (a la Windows)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMenuInfo : public wxObject
-{
-public :
-    wxMenuInfo() { m_menu = NULL ; }
-    virtual ~wxMenuInfo() { }
-
-    void Create( wxMenu *menu , const wxString &title )
-    { m_menu = menu ; m_title = title ; }
-    wxMenu* GetMenu() const { return m_menu ; }
-    wxString GetTitle() const { return m_title ; }
-private :
-    wxMenu *m_menu ;
-    wxString m_title ;
-
-    DECLARE_DYNAMIC_CLASS(wxMenuInfo) ;
-} ;
-
-WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
-
-class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase

 {
 public:
     // ctors & dtor
 {
 public:
     // ctors & dtor


@@ -138,18 +115,14 @@ public:
     wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
     virtual ~wxMenuBar();
 
     wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
     virtual ~wxMenuBar();
 

-    // menubar construction
-    bool Append( wxMenuInfo *info ) { return Append( info->GetMenu() , info->GetTitle() ) ; }
-    const wxMenuInfoList& GetMenuInfos() const ;
-

     virtual bool Append( wxMenu *menu, const wxString &title );
     virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Remove(size_t pos);
 
     virtual void EnableTop( size_t pos, bool flag );
     virtual bool Append( wxMenu *menu, const wxString &title );
     virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
     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();
 
     // implementation from now on
     WXHMENU Create();