From 07371fcd5699d49a6fa5b341269d8200c879067f Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Wed, 3 Dec 2014 17:01:35 +0000 Subject: [PATCH] Define wxPG toolbar event handler only if library is compiled with toolbar classes. Include wxPropertyGridManager::OnToolbarClick() code only if wxUSE_TOOLBAR is set to 1. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/propgrid/manager.h | 2 ++ src/propgrid/manager.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h index d33384a262..8b933cbe8d 100644 --- a/include/wx/propgrid/manager.h +++ b/include/wx/propgrid/manager.h @@ -656,7 +656,9 @@ protected: void OnPaint( wxPaintEvent &event ); +#if wxUSE_TOOLBAR void OnToolbarClick( wxCommandEvent &event ); +#endif void OnResize( wxSizeEvent& event ); void OnPropertyGridSelect( wxPropertyGridEvent& event ); void OnPGColDrag( wxPropertyGridEvent& event ); diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp index e72dac0a0c..696a200ba8 100644 --- a/src/propgrid/manager.cpp +++ b/src/propgrid/manager.cpp @@ -1719,6 +1719,7 @@ bool wxPropertyGridManager::EnsureVisible( wxPGPropArg id ) // ----------------------------------------------------------------------- +#if wxUSE_TOOLBAR void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event ) { int id = event.GetId(); @@ -1788,6 +1789,7 @@ void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event ) } } } +#endif // -----------------------------------------------------------------------