From 99d625fc6a8357c5b708f38ff0a412bd0a6f7582 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 3 Nov 2006 19:26:15 +0000 Subject: [PATCH] don't use native GTK implementation in wxUniv builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/collpane.h | 2 +- src/gtk/collpane.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/collpane.h b/include/wx/collpane.h index ca8f6881bb..3148f8ba7e 100644 --- a/include/wx/collpane.h +++ b/include/wx/collpane.h @@ -90,7 +90,7 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv wx__DECLARE_EVT1(wxEVT_COMMAND_COLLPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn)) -#if defined(__WXGTK24__) +#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/collpane.h" #else #include "wx/generic/collpaneg.h" diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp index 72e58cf528..2ad79ed21d 100644 --- a/src/gtk/collpane.cpp +++ b/src/gtk/collpane.cpp @@ -17,7 +17,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_COLLPANE && defined( __WXGTK24__ ) +#if wxUSE_COLLPANE && defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) #include "wx/collpane.h" #include "wx/gtk/private.h" @@ -324,5 +324,5 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev) m_pPane->Layout(); } -#endif // wxUSE_COLLPANE && defined( __WXGTK24__ ) +#endif // wxUSE_COLLPANE && defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) -- 2.50.0