From 32d50c82ec5438acc20816217f5016ef14d2a68c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 2 Jul 2001 09:51:19 +0000 Subject: [PATCH 1/1] fix for compilation with wxUSE_MENU_CALLBACK=0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/menu.h | 3 +++ include/wx/gtk1/menu.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index caa919c05d..f36c816d2a 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -80,6 +80,8 @@ public: // TODO: virtual void SetTitle(const wxString& title); + // compatibility only +#if wxUSE_MENU_CALLBACK wxMenu(const wxString& title, const wxFunction func) : wxMenuBase(title) { @@ -87,6 +89,7 @@ public: Callback(func); } +#endif // WXWIN_COMPATIBILITY_2 // implementation int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index caa919c05d..f36c816d2a 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -80,6 +80,8 @@ public: // TODO: virtual void SetTitle(const wxString& title); + // compatibility only +#if wxUSE_MENU_CALLBACK wxMenu(const wxString& title, const wxFunction func) : wxMenuBase(title) { @@ -87,6 +89,7 @@ public: Callback(func); } +#endif // WXWIN_COMPATIBILITY_2 // implementation int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; -- 2.45.2