From 82540105e3a6fe20d8d65d3badbd1389bef20e92 Mon Sep 17 00:00:00 2001
From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Mon, 17 Jul 2006 15:02:35 +0000
Subject: [PATCH] File/font/colour/dir picker fixes for GTK Universal

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/clrpicker.h  | 3 ++-
 include/wx/filepicker.h | 3 ++-
 include/wx/fontpicker.h | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h
index d3a2b509d3..13dfd4b846 100644
--- a/include/wx/clrpicker.h
+++ b/include/wx/clrpicker.h
@@ -69,7 +69,8 @@ protected:
 //       fact that all classes being mapped as wxColourPickerWidget have the
 //       same prototype for their contructor (and also explains why we use
 //       define instead of a typedef)
-#if defined(__WXGTK24__)        // since GTK > 2.4, there is GtkColorButton
+// since GTK > 2.4, there is GtkColorButton
+#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/clrpicker.h"
     #define wxColourPickerWidget      wxColourButton
 #else
diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h
index 5aebbe6f6f..360f12c75e 100644
--- a/include/wx/filepicker.h
+++ b/include/wx/filepicker.h
@@ -78,7 +78,8 @@ protected:
 // NOTE: wxFileDirPickerCtrlBase will allocate a wx{File|Dir}PickerWidget and this
 //       requires that all classes being mapped as wx{File|Dir}PickerWidget have the
 //       same prototype for the contructor...
-#if defined(__WXGTK26__)        // since GTK >= 2.6, there is GtkFileButton
+// since GTK >= 2.6, there is GtkFileButton
+#if defined(__WXGTK26__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/filepicker.h"
     #define wxFilePickerWidget      wxFileButton
     #define wxDirPickerWidget       wxDirButton
diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h
index 1137228e00..b6f776e2e1 100644
--- a/include/wx/fontpicker.h
+++ b/include/wx/fontpicker.h
@@ -66,7 +66,8 @@ protected:
 // uses the currently selected font to draw the label of the button
 #define wxFNTP_USEFONT_FOR_LABEL      0x0010
 
-#if defined(__WXGTK24__)        // since GTK > 2.4, there is GtkFontButton
+// since GTK > 2.4, there is GtkFontButton
+#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/fontpicker.h"
     #define wxFontPickerWidget      wxFontButton
 #else
-- 
2.45.2