Use an enum for the colour/string conversion flags

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

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index 788c7c22486fdaf0fe44c58aaa85f88d8ac32e29..a48c219af04a68b37b6e250f6ae108bde42ba8d3 100644 (file)
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -16,7 +16,7 @@
 #include "wx/font.h"
 #include "wx/arrstr.h"
 
 #include "wx/font.h"
 #include "wx/arrstr.h"
 

-class WXDLLIMPEXP_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;

 
 // ----------------------------------------------------------------------------
 // Menu
 
 // ----------------------------------------------------------------------------
 // Menu


@@ -130,8 +130,8 @@ public:
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     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 only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------