Small changes after Robert's edits

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

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 34178c67d11a08da0664666cf85ce6f271e98533..5d32a5f426cfdc58c607c678f146ac9e39f8bfe5 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -12,6 +12,10 @@
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 

+#ifdef __GNUG__
+#pragma interface "menuitem.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -45,7 +49,7 @@ DECLARE_DYNAMIC_CLASS(wxMenuItem)
 public:
   // ctor & dtor
   wxMenuItem(wxMenu *pParentMenu = NULL, int id = ID_SEPARATOR,
 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();
 
              bool bCheckable = FALSE, wxMenu *pSubMenu = NULL);
   virtual ~wxMenuItem();