Avoid setting attributes in GTK wxDataViewRenderer if not supported.

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

diff --git a/include/wx/menu.h b/include/wx/menu.h
index c222caa135b45c37576453cb1fd4068773bb699d..876a72e1622568fa47dcd0538b11bb2b48c9d803 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -40,7 +40,7 @@ WX_DECLARE_EXPORTED_LIST(wxMenuItem, wxMenuItemList);
 // wxMenu
 // ----------------------------------------------------------------------------
 
 // wxMenu
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMenuBase : public wxEvtHandler
+class WXDLLIMPEXP_CORE wxMenuBase : public wxEvtHandler

 {
 public:
     // create a menu
 {
 public:
     // create a menu


@@ -68,7 +68,7 @@ public:
     }
 
     // append a separator to the menu
     }
 
     // append a separator to the menu

-    wxMenuItem* AppendSeparator() { return Append(wxID_SEPARATOR, wxEmptyString); }
+    wxMenuItem* AppendSeparator() { return Append(wxID_SEPARATOR); }

 
     // append a check item
     wxMenuItem* AppendCheckItem(int itemid,
 
     // append a check item
     wxMenuItem* AppendCheckItem(int itemid,


@@ -248,7 +248,7 @@ public:
 
     // the title
     virtual void SetTitle(const wxString& title) { m_title = title; }
 
     // the title
     virtual void SetTitle(const wxString& title) { m_title = title; }

-    const wxString GetTitle() const { return m_title; }
+    const wxString& GetTitle() const { return m_title; }

 
     // event handler
     void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
 
     // event handler
     void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }


@@ -267,7 +267,7 @@ public:
     // Updates the UI for a menu and all submenus recursively. source is the
     // object that has the update event handlers defined for it. If NULL, the
     // menu or associated window will be used.
     // Updates the UI for a menu and all submenus recursively. source is the
     // object that has the update event handlers defined for it. If NULL, the
     // menu or associated window will be used.

-    void UpdateUI(wxEvtHandler* source = (wxEvtHandler*)NULL);
+    void UpdateUI(wxEvtHandler* source = NULL);

 
     // get the menu bar this menu is attached to (may be NULL, always NULL for
     // popup menus).  Traverse up the menu hierarchy to find it.
 
     // get the menu bar this menu is attached to (may be NULL, always NULL for
     // popup menus).  Traverse up the menu hierarchy to find it.


@@ -377,14 +377,14 @@ protected:
 
     static bool      ms_locked;
 
 
     static bool      ms_locked;
 

-    DECLARE_NO_COPY_CLASS(wxMenuBase)
+    wxDECLARE_NO_COPY_CLASS(wxMenuBase);

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

-class WXDLLEXPORT wxMenuBarBase : public wxWindow
+class WXDLLIMPEXP_CORE wxMenuBarBase : public wxWindow

 {
 public:
     // default ctor
 {
 public:
     // default ctor


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

+    // Deprecated in favour of SetMenuLabel

     wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) );
     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);

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


@@ -532,7 +534,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/menu.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/menu.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/menu.h"
+    #include "wx/osx/menu.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menu.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menu.h"
 #elif defined(__WXPM__)