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

Compile fixes for GTK 2.4

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-06-01 12:31:56 +00:00
parent 8b7fdb77c2
commit 5b34e14106
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/filepicker.h
View File

@@ -79,7 +79,7 @@ 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(__WXGTK24__) // since GTK > 2.4, there is GtkColorButton #if defined(__WXGTK26__) // since GTK >= 2.6, there is GtkFileButton
#include "wx/gtk/filepicker.h" #include "wx/gtk/filepicker.h"
#define wxFilePickerWidget wxFileButton #define wxFilePickerWidget wxFileButton
#define wxDirPickerWidget wxDirButton #define wxDirPickerWidget wxDirButton

2
src/gtk/window.cpp
View File

@@ -2746,10 +2746,12 @@ void wxWindowGTK::PostCreation()
G_CALLBACK (wxgtk_combo_size_request_callback), G_CALLBACK (wxgtk_combo_size_request_callback),
this); this);
} }
#ifdef GTK_IS_FILE_CHOOSER_BUTTON
else if (GTK_IS_FILE_CHOOSER_BUTTON(m_widget)) else if (GTK_IS_FILE_CHOOSER_BUTTON(m_widget))
{ {
// FIXME: what should be done here ? // FIXME: what should be done here ?
} }
#endif
else else
{ {
// This is needed if we want to add our windows into native // This is needed if we want to add our windows into native