X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fe39b0ce3c0f47faea34ef99c3d0260957cc4e0..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk/dirdlg.cpp diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp index b7c817993b..7372b32300 100644 --- a/src/gtk/dirdlg.cpp +++ b/src/gtk/dirdlg.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/gtk/dirdlg.cpp -// Purpose: native implementation of wxDirDialogGTK +// Purpose: native implementation of wxDirDialog // Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp, Francesco Montorsi // Id: $Id$ // Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp @@ -13,7 +13,7 @@ /* - NOTE: the GtkFileChooser interface can be used both for wxFileDialog and for wxDirDialogGTK. + NOTE: the GtkFileChooser interface can be used both for wxFileDialog and for wxDirDialog. Thus following code is very similar (even if not identic) to src/gtk/filedlg.cpp If you find a problem in this code, remember to check also that file ! */ @@ -29,216 +29,135 @@ #include "wx/filedlg.h" #endif -#ifdef __WXGTK24__ // only for GTK+ > 2.4 there is GtkFileChooserDialog - -#include #include "wx/gtk/private.h" -#include // chdir - - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); - -//----------------------------------------------------------------------------- -// "clicked" for OK-button -//----------------------------------------------------------------------------- - extern "C" { -static void gtk_filedialog_ok_callback(GtkWidget *widget, wxDirDialogGTK *dialog) +static void gtk_dirdialog_response_callback(GtkWidget * WXUNUSED(w), + gint response, + wxDirDialog *dialog) { - gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); - - // change to the directory where the user went if asked - if (dialog->HasFlag(wxDD_CHANGE_DIR)) - chdir(filename); - - g_free(filename); - - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); - event.SetEventObject(dialog); - dialog->GetEventHandler()->ProcessEvent(event); + if (response == GTK_RESPONSE_ACCEPT) + dialog->GTKOnAccept(); + else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE + dialog->GTKOnCancel(); } } //----------------------------------------------------------------------------- -// "clicked" for Cancel-button +// wxDirDialog //----------------------------------------------------------------------------- -extern "C" { -static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w), - wxDirDialogGTK *dialog) -{ - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - event.SetEventObject(dialog); - dialog->GetEventHandler()->ProcessEvent(event); -} -} +IMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog) -extern "C" { -static void gtk_filedialog_response_callback(GtkWidget *w, - gint response, - wxDirDialogGTK *dialog) +wxDirDialog::wxDirDialog(wxWindow* parent, + const wxString& title, + const wxString& defaultPath, + long style, + const wxPoint& pos, + const wxSize& WXUNUSED(sz), + const wxString& WXUNUSED(name)) { - wxapp_install_idle_handler(); - - if (response == GTK_RESPONSE_ACCEPT) - gtk_filedialog_ok_callback(w, dialog); - else if (response == GTK_RESPONSE_CANCEL) - gtk_filedialog_cancel_callback(w, dialog); - else // "delete" - { - gtk_filedialog_cancel_callback(w, dialog); - dialog->m_destroyed_by_delete = true; - } -} + Create(parent, title, defaultPath, style, pos); } -#endif // __WXGTK24__ - -//----------------------------------------------------------------------------- -// wxDirDialogGTK -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxDirDialogGTK,wxGenericDirDialog) +bool wxDirDialog::Create(wxWindow* parent, + const wxString& title, + const wxString& defaultPath, + long style, + const wxPoint& pos, + const wxSize& WXUNUSED(sz), + const wxString& WXUNUSED(name)) +{ + m_message = title; -BEGIN_EVENT_TABLE(wxDirDialogGTK,wxGenericDirDialog) - EVT_BUTTON(wxID_OK, wxDirDialogGTK::OnFakeOk) -END_EVENT_TABLE() + parent = GetParentForModalDialog(parent, style); -wxDirDialogGTK::wxDirDialogGTK(wxWindow* parent, const wxString& title, - const wxString& defaultPath, long style, - const wxPoint& pos, const wxSize& sz, - const wxString& name) -{ -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + if (!PreCreation(parent, pos, wxDefaultSize) || + !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, + wxDefaultValidator, wxT("dirdialog"))) { - m_message = title; - m_needParent = false; - m_destroyed_by_delete = false; - - if (!PreCreation(parent, pos, wxDefaultSize) || - !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, - wxDefaultValidator, wxT("filedialog"))) - { - wxFAIL_MSG( wxT("wxDirDialogGTK creation failed") ); - return; - } - - GtkFileChooserAction gtk_action; - GtkWindow* gtk_parent = NULL; - if (parent) - gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) ); - - gtk_action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; - if (style & wxDD_NEW_DIR_BUTTON) - gtk_action = GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER; - - m_widget = gtk_file_chooser_dialog_new( - wxGTK_CONV(m_message), - gtk_parent, - gtk_action, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL); - - gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT); - - // local-only property could be set to false to allow non-local files to be loaded. - // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere - // and the GtkFileChooserDialog should probably also be created with a backend, - // e.g "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend). - // Currently local-only is kept as the default - true: - // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); - - g_signal_connect (m_widget, "response", - G_CALLBACK (gtk_filedialog_response_callback), this); - - if ( !defaultPath.empty() ) - gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget), - wxConvFileName->cWX2MB(defaultPath) ); + wxFAIL_MSG( wxT("wxDirDialog creation failed") ); + return false; } - else -#endif - wxGenericDirDialog::Create(parent, title, defaultPath, style, pos, sz, name); + + GtkWindow* gtk_parent = NULL; + if (parent) + gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) ); + + m_widget = gtk_file_chooser_dialog_new( + wxGTK_CONV(m_message), + gtk_parent, + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + g_object_ref(m_widget); + + gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT); + + // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically destroys + // the dialog when the user press ESC on the dialog: in that case a second call to + // ShowModal() would result in a bunch of Gtk-CRITICAL errors... + g_signal_connect (m_widget, + "delete_event", + G_CALLBACK (gtk_widget_hide_on_delete), + (gpointer)this); + + // local-only property could be set to false to allow non-local files to be loaded. + // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere + // and the GtkFileChooserDialog should probably also be created with a backend, + // e.g. "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend). + // Currently local-only is kept as the default - true: + // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); + + g_signal_connect (m_widget, "response", + G_CALLBACK (gtk_dirdialog_response_callback), this); + + if ( !defaultPath.empty() ) + SetPath(defaultPath); + + return true; } -wxDirDialogGTK::~wxDirDialogGTK() +void wxDirDialog::GTKOnAccept() { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))); + m_selectedDirectory = wxString::FromUTF8(str); + + // change to the directory where the user went if asked + if (HasFlag(wxDD_CHANGE_DIR)) { - if (m_destroyed_by_delete) - m_widget = NULL; + wxSetWorkingDirectory(m_selectedDirectory); } -#endif -} - -void wxDirDialogGTK::OnFakeOk( wxCommandEvent &event ) -{ -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - wxDialog::OnOK( event ); - else -#endif - wxGenericDirDialog::OnOK( event ); -} -int wxDirDialogGTK::ShowModal() -{ -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return wxDialog::ShowModal(); - else -#endif - return wxGenericDirDialog::ShowModal(); + EndDialog(wxID_OK); } -bool wxDirDialogGTK::Show( bool show ) +void wxDirDialog::GTKOnCancel() { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return wxDialog::Show( show ); - else -#endif - return wxGenericDirDialog::Show( show ); + EndDialog(wxID_CANCEL); } -void wxDirDialogGTK::DoSetSize(int x, int y, int width, int height, int sizeFlags ) +void wxDirDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags) { if (!m_wxwindow) return; - else - wxGenericDirDialog::DoSetSize( x, y, width, height, sizeFlags ); + + wxDirDialogBase::DoSetSize( x, y, width, height, sizeFlags ); } -void wxDirDialogGTK::SetPath(const wxString& dir) +void wxDirDialog::SetPath(const wxString& dir) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + if (wxDirExists(dir)) { - if (wxDirExists(dir)) - { - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir)); - } + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), + wxGTK_CONV_FN(dir)); } - else -#endif - wxGenericDirDialog::SetPath( dir ); } -wxString wxDirDialogGTK::GetPath() const +wxString wxDirDialog::GetPath() const { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return wxConvFileName->cMB2WX( gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(m_widget) ) ); - else -#endif - return wxGenericDirDialog::GetPath(); + return m_selectedDirectory; } #endif // wxUSE_DIRDLG