X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3103e8a97e834e9793f0eb149aa82a99fd64ef9a..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/menuitem.h diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h index b4d27e5b3b..2a619da623 100644 --- a/include/wx/menuitem.h +++ b/include/wx/menuitem.h @@ -64,7 +64,7 @@ public: // any), i.e. it may contain '&' or '_' or "\t..." and thus is // different from the item's label which only contains the text shown // in the menu - virtual void SetText(const wxString& str) { m_text = str; } + virtual void SetText(const wxString& str); wxString GetLabel() const { return GetLabelFromText(m_text); } const wxString& GetText() const { return m_text; } @@ -92,7 +92,7 @@ public: void Toggle() { Check(!m_isChecked); } // help string (displayed in the status bar by default) - void SetHelp(const wxString& str) { m_help = str; } + void SetHelp(const wxString& str); const wxString& GetHelp() const { return m_help; } #if wxUSE_ACCEL @@ -163,8 +163,10 @@ private: #include "wx/msw/menuitem.h" #elif defined(__WXMOTIF__) #include "wx/motif/menuitem.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/menuitem.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/menuitem.h" #elif defined(__WXMAC__) #include "wx/mac/menuitem.h" #elif defined(__WXCOCOA__)