attempt to fix first click problem

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

diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h
index 75649d9f30bf9ef7faaff49f3e9d15ed374b6526..762ccdd7cebb3adf8bb31cd96147beead13310b5 100644 (file)
--- a/include/wx/motif/menuitem.h
+++ b/include/wx/motif/menuitem.h
@@ -2,25 +2,29 @@
 // Name:        menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Name:        menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_MENUITEM_H
 #define _WX_MOTIF_MENUITEM_H
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_MENUITEM_H
 #define _WX_MOTIF_MENUITEM_H
 

-#ifdef __GNUG__
-    #pragma interface "menuitem.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "menuitem.h"

 #endif
 
 #endif
 

+#include "wx/bitmap.h"
+
+class WXDLLEXPORT wxMenuBar;
+

 // ----------------------------------------------------------------------------
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
+class wxMenuItem : public wxMenuItemBase

 {
 public:
     // ctor & dtor
 {
 public:
     // ctor & dtor


@@ -28,34 +32,41 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,

-               bool isCheckable = FALSE,
+               wxItemKind kind = wxITEM_NORMAL,

                wxMenu *subMenu = (wxMenu *)NULL);
     ~wxMenuItem();
                wxMenu *subMenu = (wxMenu *)NULL);
     ~wxMenuItem();

-
+    

     // accessors (some more are inherited from wxOwnerDrawn or are below)
     virtual void SetText(const wxString& label);
     virtual void Enable(bool enable = TRUE);
     virtual void Check(bool check = TRUE);
     // accessors (some more are inherited from wxOwnerDrawn or are below)
     virtual void SetText(const wxString& label);
     virtual void Enable(bool enable = TRUE);
     virtual void Check(bool check = TRUE);

-
+    // included SetBitmap and GetBitmap as copied from the GTK include file
+    // I'm not sure if this works but it silences the linker in the
+    // menu sample.
+    //     JJ
+    virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
+    virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
+    

     void DeleteSubMenu();
     void DeleteSubMenu();

-
+    

     // implementation from now on
     void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu);
     void DestroyItem(bool full);
     // implementation from now on
     void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu);
     void DestroyItem(bool full);

-
+    

     WXWidget GetButtonWidget() const { return m_buttonWidget; }
     WXWidget GetButtonWidget() const { return m_buttonWidget; }

-
+    

     wxMenuBar* GetMenuBar() const { return m_menuBar; }
     void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; }
     wxMenuBar* GetMenuBar() const { return m_menuBar; }
     void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; }

-
+    

     wxMenu* GetTopMenu() const { return m_topMenu; }
     void SetTopMenu(wxMenu* menu) { m_topMenu = menu; }
     wxMenu* GetTopMenu() const { return m_topMenu; }
     void SetTopMenu(wxMenu* menu) { m_topMenu = menu; }

-
+    

 private:
     WXWidget    m_buttonWidget;
     wxMenuBar*  m_menuBar;
     wxMenu*     m_topMenu;        // Top-level menu e.g. popup-menu
 private:
     WXWidget    m_buttonWidget;
     wxMenuBar*  m_menuBar;
     wxMenu*     m_topMenu;        // Top-level menu e.g. popup-menu

-
+    wxBitmap  m_bitmap; // Bitmap for menuitem, if any
+    

     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };