Context menu event from keyboard records the mouse position, not -1, -1,

[wxWidgets.git] / src / gtk / dirdlg.cpp

diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp
index 29dba78b056da2cce86f351980ac4c59e8e4493a..7874ff5773f8dc06960c9c81d687509d06d24f13 100644 (file)
--- a/src/gtk/dirdlg.cpp
+++ b/src/gtk/dirdlg.cpp
@@ -26,71 +26,30 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/filedlg.h"

 #endif
 
 #endif
 

-#ifdef __WXGTK24__
-
-#include <gtk/gtk.h>

 #include "wx/gtk/private.h"
 
 #include <unistd.h> // chdir
 
 #include "wx/gtk/private.h"
 
 #include <unistd.h> // chdir
 

-#include "wx/filename.h" // wxFilename
-#include "wx/tokenzr.h" // wxStringTokenizer
-#include "wx/filefn.h" // ::wxGetCwd
-#include "wx/msgdlg.h" // wxMessageDialog
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-

 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_filedialog_ok_callback(GtkWidget *widget, wxDirDialog *dialog)
+static void gtk_dirdialog_ok_callback(GtkWidget *widget, wxDirDialog *dialog)

 {
 {

-    int style = dialog->GetStyle();
-    gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
-
-    // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation)
-#if GTK_CHECK_VERSION(2,7,3)
-    if(gtk_check_version(2,7,3) != NULL)
-#endif
-    if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT))
-    {
-        if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
-        {
-            wxString msg;
-
-            msg.Printf(
-                _("File '%s' already exists, do you really want to overwrite it?"),
-                wxString(wxConvFileName->cMB2WX(filename)).c_str());
-
-            wxMessageDialog dlg(dialog, msg, _("Confirm"),
-                               wxYES_NO | wxICON_QUESTION);
-            if (dlg.ShowModal() != wxID_YES)
-                return;
-        }
-    }
-

     // change to the directory where the user went if asked
     // change to the directory where the user went if asked

-    if (style & wxCHANGE_DIR)
+    if (dialog->HasFlag(wxDD_CHANGE_DIR))

     {
     {

-        // Use chdir to not care about filename encodings
-        gchar* folder = g_path_get_dirname(filename);
-        chdir(folder);
-        g_free(folder);
+        wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
+        chdir(filename);

     }
 
     }
 

-    g_free(filename);
-

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);

-    dialog->GetEventHandler()->ProcessEvent(event);
+    dialog->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -99,174 +58,120 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxDirDialog *dialog)
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
+static void gtk_dirdialog_cancel_callback(GtkWidget *WXUNUSED(w),

                                            wxDirDialog *dialog)
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject(dialog);
                                            wxDirDialog *dialog)
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject(dialog);

-    dialog->GetEventHandler()->ProcessEvent(event);
+    dialog->HandleWindowEvent(event);

 }
 }
 
 extern "C" {
 }
 }
 
 extern "C" {

-static void gtk_filedialog_response_callback(GtkWidget *w,
+static void gtk_dirdialog_response_callback(GtkWidget *w,

                                              gint response,
                                              wxDirDialog *dialog)
 {
                                              gint response,
                                              wxDirDialog *dialog)
 {

-    wxapp_install_idle_handler();
-

     if (response == GTK_RESPONSE_ACCEPT)
     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;
-    }
+        gtk_dirdialog_ok_callback(w, dialog);
+    else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
+        gtk_dirdialog_cancel_callback(w, dialog);

 }
 }
 
 }
 }
 

-#endif // __WXGTK24__
-

 //-----------------------------------------------------------------------------
 // wxDirDialog
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxDirDialog
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxDirDialog,wxGenericDirDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog)

 
 

-BEGIN_EVENT_TABLE(wxDirDialog,wxGenericDirDialog)
+BEGIN_EVENT_TABLE(wxDirDialog, wxDirDialogBase)

     EVT_BUTTON(wxID_OK, wxDirDialog::OnFakeOk)
 END_EVENT_TABLE()
 
     EVT_BUTTON(wxID_OK, wxDirDialog::OnFakeOk)
 END_EVENT_TABLE()
 

-wxDirDialog::wxDirDialog(wxWindow* parent, const wxString& title,
-                        const wxString& defaultPath, long style,
-                        const wxPoint& pos, const wxSize& sz,
-                        const wxString& name)
+wxDirDialog::wxDirDialog(wxWindow* parent,
+                         const wxString& title,
+                         const wxString& defaultPath,
+                         long style,
+                         const wxPoint& pos,
+                         const wxSize& WXUNUSED(sz),
+                         const wxString& WXUNUSED(name))

 {
 {

-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
-    {
-        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("wxDirDialog 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);
-
-        // 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(G_OBJECT(m_widget), "response",
-            GTK_SIGNAL_FUNC(gtk_filedialog_response_callback), (gpointer)this);
-
-        if ( !defaultPath.empty() )
-            gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
-                    wxConvFileName->cWX2MB(defaultPath) );
-    }
-    else
-#endif
-        wxGenericDirDialog::Create(parent, title, defaultPath, style, pos, sz, name);
-}
+    m_message = title;

 
 

-wxDirDialog::~wxDirDialog()
-{
-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
+    parent = GetParentForModalDialog(parent);
+
+    if (!PreCreation(parent, pos, wxDefaultSize) ||
+        !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+                wxDefaultValidator, wxT("dirdialog")))

     {
     {

-        if (m_destroyed_by_delete)
-            m_widget = NULL;
+        wxFAIL_MSG( wxT("wxDirDialog creation failed") );
+        return;

     }
     }

-#endif
-}

 
 

-void wxDirDialog::OnFakeOk( wxCommandEvent &event )
-{
-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
-        wxDialog::OnOK( event );
-    else
-#endif
-        wxGenericDirDialog::OnOK( event );
+    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);
+
+    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 (G_OBJECT(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() )
+        gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
+                defaultPath.fn_str() );

 }
 
 }
 

-int wxDirDialog::ShowModal()
+void wxDirDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))

 {
 {

-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
-        return wxDialog::ShowModal();
-    else
-#endif
-        return wxGenericDirDialog::ShowModal();
-}
-
-bool wxDirDialog::Show( bool show )
-{
-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
-        return wxDialog::Show( show );
-    else
-#endif
-        return wxGenericDirDialog::Show( show );
+    EndDialog(wxID_OK);

 }
 
 }
 

-void wxDirDialog::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;
 {
     if (!m_wxwindow)
         return;

-    else
-        wxGenericDirDialog::DoSetSize( x, y, width, height, sizeFlags );
+
+    wxDirDialogBase::DoSetSize( x, y, width, height, sizeFlags );

 }
 
 void wxDirDialog::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),
+                                            dir.fn_str());

     }
     }

-    else
-#endif
-        wxGenericDirDialog::SetPath( dir );

 }
 
 wxString wxDirDialog::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();
+    wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
+    return wxString(str, *wxConvFileName);

 }
 
 #endif // wxUSE_DIRDLG
 }
 
 #endif // wxUSE_DIRDLG