don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 1280ea647eb6d7c65325716e8db97b208aa14e2f..466d50675a656c0682d13791183416ec065fc745 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -377,7 +377,7 @@ protected:
 
     static bool      ms_locked;
 
 
     static bool      ms_locked;
 

-    DECLARE_NO_COPY_CLASS(wxMenuBase)
+    wxDECLARE_NO_COPY_CLASS(wxMenuBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -498,7 +498,9 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_8
     // get or change the label of the menu at given position
 
 #if WXWIN_COMPATIBILITY_2_8
     // get or change the label of the menu at given position

-    wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) );
+    // Deprecated in favour of SetMenuLabel
+    wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) );    
+    // Deprecated in favour of GetMenuLabelText

     wxDEPRECATED( wxString GetLabelTop(size_t pos) const );
 #endif
 
     wxDEPRECATED( wxString GetLabelTop(size_t pos) const );
 #endif
 


@@ -509,7 +511,7 @@ protected:
     // the frame we are attached to (may be NULL)
     wxFrame *m_menuBarFrame;
 
     // the frame we are attached to (may be NULL)
     wxFrame *m_menuBarFrame;
 

-    DECLARE_NO_COPY_CLASS(wxMenuBarBase)
+    wxDECLARE_NO_COPY_CLASS(wxMenuBarBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------