Added variant.h/cpp; changed variable names in object.h; added some

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

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 5de85d5e241760de74064c1f4363e197037d3194..5d32a5f426cfdc58c607c678f146ac9e39f8bfe5 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -12,10 +12,16 @@
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 
+#ifdef __GNUG__
+#pragma interface "menuitem.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/setup.h"
+
 // an exception to the general rule that a normal header doesn't include other
 // headers - only because ownerdrw.h is not always included and I don't want
 // to write #ifdef's everywhere...
@@ -43,7 +49,7 @@ DECLARE_DYNAMIC_CLASS(wxMenuItem)
 public:
   // ctor & dtor
   wxMenuItem(wxMenu *pParentMenu = NULL, int id = ID_SEPARATOR,
-             const wxTString& strName = "", const wxTString& wxHelp = "",
+             const wxString& strName = "", const wxString& wxHelp = "",
              bool bCheckable = FALSE, wxMenu *pSubMenu = NULL);
   virtual ~wxMenuItem();