// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#if wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
+#if wxUSE_FILEPICKERCTRL
#include "wx/filepicker.h"
#include "wx/tooltip.h"
+#include <gtk/gtk.h>
#include "wx/gtk/private.h"
// ============================================================================
long style, const wxValidator& validator,
const wxString &name )
{
- if (!gtk_check_version(2,6,0))
+ // we can't use the native button for wxFLP_SAVE pickers as it can only
+ // open existing files and there is no way to create a new file using it
+ if (!(style & wxFLP_SAVE) && !(style & wxFLP_USE_TEXTCTRL))
{
- // VERY IMPORTANT: this code is identic to relative code in wxDirButton;
+ // VERY IMPORTANT: this code is identical to relative code in wxDirButton;
// if you find a problem here, fix it also in wxDirButton !
if (!PreCreation( parent, pos, size ) ||
g_signal_connect(m_dialog->m_widget, "show", G_CALLBACK(gtk_grab_add), NULL);
g_signal_connect(m_dialog->m_widget, "hide", G_CALLBACK(gtk_grab_remove), NULL);
- // NOTE: we deliberately ignore the given label as GtkFileChooserButton
// use as label the currently selected file
m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
- gtk_widget_show(m_widget);
+ g_object_ref(m_widget);
// we need to know when the dialog has been dismissed clicking OK...
// NOTE: the "clicked" signal is not available for a GtkFileChooserButton
// thus we are forced to use wxFileDialog's event
- m_dialog->Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+ m_dialog->Connect(wxEVT_BUTTON,
wxCommandEventHandler(wxFileButton::OnDialogOK),
NULL, this);
wxFileButton::~wxFileButton()
{
- // GtkFileChooserButton will automatically destroy the
- // GtkFileChooserDialog associated with m_dialog.
- // Thus we have to set its m_widget to NULL to avoid
- // double destruction on same widget
- if (m_dialog)
+ if ( m_dialog )
+ {
+ // We need to delete the C++ dialog object here but we shouldn't delete
+ // its widget which is used by our GtkFileChooserButton and will be
+ // deleted by it when it is itself destroyed in our base class dtor. So
+ // take the widget ownership away from the dialog to avoid GTK+ errors
+ // that would happen if GtkFileChooserButton tried to access the
+ // already destroyed dialog widget.
+ g_object_unref(m_dialog->m_widget);
m_dialog->m_widget = NULL;
+ delete m_dialog;
+ }
}
void wxFileButton::OnDialogOK(wxCommandEvent& ev)
UpdatePathFromDialog(m_dialog);
// ...and fire an event
- wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path);
+ wxFileDirPickerEvent event(wxEVT_FILEPICKER_CHANGED, this, GetId(), m_path);
HandleWindowEvent(event);
}
}
void wxFileButton::SetPath(const wxString &str)
{
m_path = str;
+
if (m_dialog)
UpdateDialogPath(m_dialog);
}
-#endif // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
-
-
+void wxFileButton::SetInitialDirectory(const wxString& dir)
+{
+ if (m_dialog)
+ {
+ // Only change the directory if the default file name doesn't have any
+ // directory in it, otherwise it takes precedence.
+ if ( m_path.find_first_of(wxFileName::GetPathSeparators()) ==
+ wxString::npos )
+ {
+ static_cast<wxFileDialog*>(m_dialog)->SetDirectory(dir);
+ }
+ }
+ else
+ wxGenericFileButton::SetInitialDirectory(dir);
+}
+#endif // wxUSE_FILEPICKERCTRL
-#if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
+#if wxUSE_DIRPICKERCTRL
+#ifdef __UNIX__
#include <unistd.h> // chdir
+#endif
//-----------------------------------------------------------------------------
// "current-folder-changed"
// NB: it's important to use gtk_file_chooser_get_filename instead of
// gtk_file_chooser_get_current_folder (see GTK docs) !
wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
- p->UpdatePath(filename);
+ p->GTKUpdatePath(filename);
// since GtkFileChooserButton when used to pick directories also uses a combobox,
// maybe that the current folder has been changed but not through the GtkFileChooserDialog
chdir(filename);
// ...and fire an event
- wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());
+ wxFileDirPickerEvent event(wxEVT_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());
p->HandleWindowEvent(event);
}
}
long style, const wxValidator& validator,
const wxString &name )
{
- if (!gtk_check_version(2,6,0))
+ if (!(style & wxDIRP_USE_TEXTCTRL))
{
// VERY IMPORTANT: this code is identic to relative code in wxFileButton;
// if you find a problem here, fix it also in wxFileButton !
// NOTE: we deliberately ignore the given label as GtkFileChooserButton
// use as label the currently selected file
m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
-
- gtk_widget_show(m_widget);
+ g_object_ref(m_widget);
// GtkFileChooserButton signals
g_signal_connect(m_widget, "current-folder-changed",
wxDirButton::~wxDirButton()
{
- // GtkFileChooserButton will automatically destroy the
- // GtkFileChooserDialog associated with m_dialog.
- // Thus we have to set its m_widget to NULL to avoid
- // double destruction on same widget
- if (m_dialog)
- m_dialog->m_widget = NULL;
+ delete m_dialog;
}
-void wxDirButton::SetPath(const wxString &str)
+void wxDirButton::GTKUpdatePath(const char *gtkpath)
+{
+ m_path = wxString::FromUTF8(gtkpath);
+}
+void wxDirButton::SetPath(const wxString& str)
{
+ if ( m_path == str )
+ {
+ // don't do anything and especially don't set m_bIgnoreNextChange
+ return;
+ }
+
m_path = str;
// wxDirButton uses the "current-folder-changed" signal which is triggered also
UpdateDialogPath(m_dialog);
}
-#endif // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
+void wxDirButton::SetInitialDirectory(const wxString& dir)
+{
+ if (m_dialog)
+ {
+ if (m_path.empty())
+ static_cast<wxDirDialog*>(m_dialog)->SetPath(dir);
+ }
+ else
+ wxGenericDirButton::SetInitialDirectory(dir);
+}
+
+#endif // wxUSE_DIRPICKERCTRL
projects / wxWidgets.git / blobdiff