don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index 1e9d1d89b8bbc1fe2ecb1a8317ad5fb59cc24583..3c726a92266c02eeda20324020f6af2d042108e2 100644 (file)
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -17,6 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"

+#include "wx/os2/private.h"     // for MENUITEM

 
 // 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
 
 // 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


@@ -32,7 +33,7 @@
 // ----------------------------------------------------------------------------
 // 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 WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase

 #if wxUSE_OWNER_DRAWN
                             , public wxOwnerDrawn
 #endif
 #if wxUSE_OWNER_DRAWN
                             , public wxOwnerDrawn
 #endif


@@ -57,14 +58,14 @@ public:
                ,const wxString& rsText
                ,const wxString& rsHelp
                ,bool            bIsCheckable
                ,const wxString& rsText
                ,const wxString& rsHelp
                ,bool            bIsCheckable

-               ,wxMenu*         pSubMenu = (wxMenu *)NULL
+               ,wxMenu*         pSubMenu = NULL

               );
     virtual ~wxMenuItem();
 
     //
     // Override base class virtuals
     //
               );
     virtual ~wxMenuItem();
 
     //
     // Override base class virtuals
     //

-    virtual void SetText(const wxString& rStrName);
+    virtual void SetItemLabel(const wxString& rStrName);

     virtual void SetCheckable(bool bCheckable);
 
     virtual void Enable(bool bDoEnable = true);
     virtual void SetCheckable(bool bCheckable);
 
     virtual void Enable(bool bDoEnable = true);