setting the hacked cocoa font panel as default

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

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index ce936fa4ac3f7fac2550f7519d5c97592ad8b630..19a3a045a5c89b6d3137ae588f20404c92463a9a 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -1,26 +1,22 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        menuitem.h
+// Name:        wx/gtk1/menuitem.h

 // Purpose:     wxMenuItem class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:     wxMenuItem class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMENUITEMH__
 #define __GTKMENUITEMH__
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMENUITEMH__
 #define __GTKMENUITEMH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
 #include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------
 

-class wxMenuItem : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase

 {
 public:
     wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
 {
 public:
     wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,


@@ -62,7 +58,7 @@ public:
 
 private:
     // common part of all ctors
 
 private:
     // common part of all ctors

-    void Init();
+    void Init(const wxString& text);

 
     // DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
     // style to GTK+ and is called from ctor and SetText()
 
     // DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
     // style to GTK+ and is called from ctor and SetText()