// 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 "wx/gtk/private.h"
-
-#if wxUSE_TOOLTIPS
- #include "wx/tooltip.h"
-#endif
-
-#include <gdk/gdk.h>
#include <gtk/gtk.h>
-
-#include <unistd.h> // chdir
-
+#include "wx/gtk/private.h"
// ============================================================================
// implementation
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 wxFileButton;
- // if you find a problem here, fix it also in wxFileButton !
-
- m_needParent = true;
+ // 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 ) ||
!wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
}
// create the dialog associated with this button
+ // NB: unlike generic implementation, native GTK implementation needs to create
+ // the filedialog here as it needs to use gtk_file_chooser_button_new_with_dialog()
SetWindowStyle(style);
m_path = path;
- if (!CreateDialog(message, wildcard))
+ m_message = message;
+ m_wildcard = wildcard;
+ if ((m_dialog = CreateDialog()) == NULL)
return false;
// little trick used to avoid problems when there are other GTK windows 'grabbed':
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( GTK_WIDGET(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);
m_parent->DoAddChild( this );
PostCreation(size);
- SetBestSize(size);
+ SetInitialSize(size);
}
else
return wxGenericFileButton::Create(parent, id, label, path, message, wildcard,
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
- m_dialog->m_widget = NULL;
+ 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)
if (ev.GetId() == wxID_OK)
{
// ...update our path
- UpdatePathFromDialog();
+ UpdatePathFromDialog(m_dialog);
// ...and fire an event
- wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path);
- GetEventHandler()->ProcessEvent(event);
+ wxFileDirPickerEvent event(wxEVT_FILEPICKER_CHANGED, this, GetId(), m_path);
+ HandleWindowEvent(event);
}
}
-#endif // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
+void wxFileButton::SetPath(const wxString &str)
+{
+ m_path = str;
+ if (m_dialog)
+ UpdateDialogPath(m_dialog);
+}
+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"
wxDirButton *p)
{
// update the m_path member of the wxDirButtonGTK
+ // unless the path was changed by wxDirButton::SetPath()
+ if (p->m_bIgnoreNextChange)
+ {
+ p->m_bIgnoreNextChange=false;
+ return;
+ }
wxASSERT(p);
// NB: it's important to use gtk_file_chooser_get_filename instead of
// gtk_file_chooser_get_current_folder (see GTK docs) !
- gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
- p->UpdatePath(filename);
+ wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
+ 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
// style was given.
if (p->HasFlag(wxDIRP_CHANGE_DIR))
chdir(filename);
- g_free(filename);
// ...and fire an event
- wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());
- p->GetEventHandler()->ProcessEvent(event);
+ 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 !
- m_needParent = true;
-
if (!PreCreation( parent, pos, size ) ||
!wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
validator, name))
// create the dialog associated with this button
SetWindowStyle(style);
- m_path = path;
- if (!CreateDialog(message, wildcard))
+ m_message = message;
+ m_wildcard = wildcard;
+ if ((m_dialog = CreateDialog()) == NULL)
return false;
+ SetPath(path);
// little trick used to avoid problems when there are other GTK windows 'grabbed':
// GtkFileChooserDialog won't be responsive to user events if there is another
// 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( GTK_WIDGET(m_widget) );
+ g_object_ref(m_widget);
// GtkFileChooserButton signals
g_signal_connect(m_widget, "current-folder-changed",
m_parent->DoAddChild( this );
PostCreation(size);
- SetBestSize(size);
+ SetInitialSize(size);
}
else
return wxGenericDirButton::Create(parent, id, label, path, message, wildcard,
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
- m_dialog->m_widget = NULL;
+ delete m_dialog;
+}
+
+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
+ // when we set the path on the dialog associated with this button; thus we need
+ // to set the following flag to avoid sending a wxFileDirPickerEvent from this
+ // function (which would be inconsistent with wxFileButton's behaviour and in
+ // general with all wxWidgets control-manipulation functions which do not send events).
+ m_bIgnoreNextChange = true;
+
+ if (m_dialog)
+ UpdateDialogPath(m_dialog);
+}
+
+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 && defined(__WXGTK26__)
+#endif // wxUSE_DIRPICKERCTRL
projects / wxWidgets.git / blobdiff