From ca21c76b2a55252b483a3fe7e426211c229b50dc Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Tue, 23 Aug 2011 04:41:00 +0000 Subject: [PATCH] Fixed linking errors related to wxAnyButton in wxUniv. Native wxAnyButton headers were being included but the sources aren't used in wxUniv. Fixed this by not including any native header in wxUniv and instead made wxAnyButton a typedef of wxAnyButtonBase. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/anybutton.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/anybutton.h b/include/wx/anybutton.h index bc5519b..f5a6cb7 100644 --- a/include/wx/anybutton.h +++ b/include/wx/anybutton.h @@ -3,7 +3,7 @@ // Purpose: wxAnyButtonBase class // Author: Vadim Zetlin // Created: 2000-08-15 (extracted from button.h) -// RCS-ID: $Id: anybutton.h 65680 2010-09-30 11:44:45Z VZ $ +// RCS-ID: $Id$ // Copyright: (c) Vadim Zetlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -175,9 +175,9 @@ protected: wxDECLARE_NO_COPY_CLASS(wxAnyButtonBase); }; -//#if defined(__WXUNIVERSAL__) -// #include "wx/univ/anybutton.h" -#if defined(__WXMSW__) +#if defined(__WXUNIVERSAL__) + typedef wxAnyButtonBase wxAnyButton; +#elif defined(__WXMSW__) #include "wx/msw/anybutton.h" //#elif defined(__WXMOTIF__) // #include "wx/motif/anybutton.h" -- 2.7.4