added wxTo/FromString(wxColour) (part of patch 1753875)

[wxWidgets.git] / include / wx / menuitem.h

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 903a78c25a9045bfad33ca83191e1f3add49e47b..bc9d0bee0f254ef2d85b2394dce8cbf72a17aca2 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -26,9 +26,9 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAcceleratorEntry;
-class WXDLLEXPORT wxMenuItem;
-class WXDLLEXPORT wxMenu;
+class WXDLLIMPEXP_FWD_CORE wxAcceleratorEntry;
+class WXDLLIMPEXP_FWD_CORE wxMenuItem;
+class WXDLLIMPEXP_FWD_CORE wxMenu;
 
 // ----------------------------------------------------------------------------
 // wxMenuItem is an item in the menu which may be either a normal item, a sub
@@ -151,9 +151,9 @@ private:
 };
 
 #if WXWIN_COMPATIBILITY_2_8
-void wxMenuItemBase::SetName(const wxString &str)
+inline void wxMenuItemBase::SetName(const wxString &str)
     { SetText(str); }
-const wxString& wxMenuItemBase::GetName() const
+inline const wxString& wxMenuItemBase::GetName() const
     { return GetText(); }
 #endif // WXWIN_COMPATIBILITY_2_8