]> git.saurik.com Git - wxWidgets.git/commitdiff
Fixed linking errors related to wxAnyButton in wxUniv.
authorDimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Tue, 23 Aug 2011 04:41:00 +0000 (04:41 +0000)
committerDimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Tue, 23 Aug 2011 04:41:00 +0000 (04:41 +0000)
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

index bc5519bcfbc32ffa64419137fa01c90506b4a34c..f5a6cb7c3a3a8030b117db01cf85c1b7eefa4a53 100644 (file)
@@ -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"