Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

File/font/colour/dir picker fixes for GTK Universal

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-07-17 15:02:35 +00:00
parent 8399f4c6a7
commit 82540105e3
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/clrpicker.h
View File

@@ -69,7 +69,8 @@ protected:
// fact that all classes being mapped as wxColourPickerWidget have the // fact that all classes being mapped as wxColourPickerWidget have the
// same prototype for their contructor (and also explains why we use // same prototype for their contructor (and also explains why we use
// define instead of a typedef) // 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" #include "wx/gtk/clrpicker.h"
#define wxColourPickerWidget wxColourButton #define wxColourPickerWidget wxColourButton
#else #else

3
include/wx/filepicker.h
View File

@@ -78,7 +78,8 @@ protected:
// NOTE: wxFileDirPickerCtrlBase will allocate a wx{File|Dir}PickerWidget and this // NOTE: wxFileDirPickerCtrlBase will allocate a wx{File|Dir}PickerWidget and this
// requires that all classes being mapped as wx{File|Dir}PickerWidget have the // requires that all classes being mapped as wx{File|Dir}PickerWidget have the
// same prototype for the contructor... // 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" #include "wx/gtk/filepicker.h"
#define wxFilePickerWidget wxFileButton #define wxFilePickerWidget wxFileButton
#define wxDirPickerWidget wxDirButton #define wxDirPickerWidget wxDirButton

3
include/wx/fontpicker.h
View File

@@ -66,7 +66,8 @@ protected:
// uses the currently selected font to draw the label of the button // uses the currently selected font to draw the label of the button
#define wxFNTP_USEFONT_FOR_LABEL 0x0010 #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" #include "wx/gtk/fontpicker.h"
#define wxFontPickerWidget wxFontButton #define wxFontPickerWidget wxFontButton
#else #else