initialize bitmap to avoid assertion

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

diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp
index c75c1ceb9eaf60612215cfe85409d5db8ab3d5c9..846948571b754752aca96672a2348c1c63224af7 100644 (file)
--- a/src/gtk/dirdlg.cpp
+++ b/src/gtk/dirdlg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/gtk/dirdlg.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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
 // Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp, Francesco Montorsi
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp


@@ -13,14 +13,14 @@
 
 
 /*
 
 
 /*

-  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 !
 */
 
 
 
         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 !
 */
 
 
 

-#if wxUSE_DIRDLG
+#if wxUSE_DIRDLG && defined( __WXGTK24__ )

 
 #include "wx/dirdlg.h"
 
 
 #include "wx/dirdlg.h"
 


@@ -29,34 +29,23 @@
     #include "wx/filedlg.h"
 #endif
 
     #include "wx/filedlg.h"
 #endif
 

-#ifdef __WXGTK24__      // only for GTK+ > 2.4 there is GtkFileChooserDialog
-
-#include <gtk/gtk.h>

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

-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-

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

-static void gtk_dirdialog_ok_callback(GtkWidget *widget, wxDirDialogGTK *dialog)
+static void gtk_dirdialog_ok_callback(GtkWidget *widget, 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))
     // change to the directory where the user went if asked
     if (dialog->HasFlag(wxDD_CHANGE_DIR))

+    {
+        wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));

         chdir(filename);
         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);


@@ -70,7 +59,7 @@ static void gtk_dirdialog_ok_callback(GtkWidget *widget, wxDirDialogGTK *dialog)
 
 extern "C" {
 static void gtk_dirdialog_cancel_callback(GtkWidget *WXUNUSED(w),
 
 extern "C" {
 static void gtk_dirdialog_cancel_callback(GtkWidget *WXUNUSED(w),

-                                           wxDirDialogGTK *dialog)
+                                           wxDirDialog *dialog)

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


@@ -81,73 +70,66 @@ static void gtk_dirdialog_cancel_callback(GtkWidget *WXUNUSED(w),
 extern "C" {
 static void gtk_dirdialog_response_callback(GtkWidget *w,
                                              gint response,
 extern "C" {
 static void gtk_dirdialog_response_callback(GtkWidget *w,
                                              gint response,

-                                             wxDirDialogGTK *dialog)
+                                             wxDirDialog *dialog)

 {
 {

-    wxapp_install_idle_handler();
-

     if (response == GTK_RESPONSE_ACCEPT)
         gtk_dirdialog_ok_callback(w, dialog);
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_dirdialog_ok_callback(w, dialog);

-    else if (response == GTK_RESPONSE_CANCEL)
+    else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE

         gtk_dirdialog_cancel_callback(w, dialog);
         gtk_dirdialog_cancel_callback(w, dialog);

-    else // "delete"
-    {
-        gtk_dirdialog_cancel_callback(w, dialog);
-        dialog->m_destroyed_by_delete = true;
-    }

 }
 }
 
 }
 }
 

-#endif // __WXGTK24__
-

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// wxDirDialogGTK
+// wxDirDialog

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

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

 
 

-BEGIN_EVENT_TABLE(wxDirDialogGTK,wxGenericDirDialog)
-    EVT_BUTTON(wxID_OK, wxDirDialogGTK::OnFakeOk)
+BEGIN_EVENT_TABLE(wxDirDialog,wxGenericDirDialog)
+    EVT_BUTTON(wxID_OK, wxDirDialog::OnFakeOk)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxDirDialogGTK::wxDirDialogGTK(wxWindow* parent, const wxString& title,
+wxDirDialog::wxDirDialog(wxWindow* parent, const wxString& title,

                         const wxString& defaultPath, long style,
                         const wxPoint& pos, const wxSize& sz,
                         const wxString& name)
 {
                         const wxString& defaultPath, long style,
                         const wxPoint& pos, const wxSize& sz,
                         const wxString& name)
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
         m_message = title;
     if (!gtk_check_version(2,4,0))
     {
         m_message = title;

-        m_needParent = false;
-        m_destroyed_by_delete = false;
+
+        parent = GetParentForModalDialog(parent);

 
         if (!PreCreation(parent, pos, wxDefaultSize) ||
             !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
                     wxDefaultValidator, wxT("dirdialog")))
         {
 
         if (!PreCreation(parent, pos, wxDefaultSize) ||
             !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
                     wxDefaultValidator, wxT("dirdialog")))
         {

-            wxFAIL_MSG( wxT("wxDirDialogGTK creation failed") );
+            wxFAIL_MSG( wxT("wxDirDialog creation failed") );

             return;
         }
 
             return;
         }
 

-        GtkFileChooserAction gtk_action;

         GtkWindow* gtk_parent = NULL;
         if (parent)
             gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
 
         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,
         m_widget = gtk_file_chooser_dialog_new(
                        wxGTK_CONV(m_message),
                        gtk_parent,

-                       gtk_action,
+                       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_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,
         // 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,


@@ -160,55 +142,37 @@ wxDirDialogGTK::wxDirDialogGTK(wxWindow* parent, const wxString& title,
 
         if ( !defaultPath.empty() )
             gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
 
         if ( !defaultPath.empty() )
             gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),

-                    wxConvFileName->cWX2MB(defaultPath) );
+                    defaultPath.fn_str() );

     }
     else
     }
     else

-#endif

         wxGenericDirDialog::Create(parent, title, defaultPath, style, pos, sz, name);
 }
 
         wxGenericDirDialog::Create(parent, title, defaultPath, style, pos, sz, name);
 }
 

-wxDirDialogGTK::~wxDirDialogGTK()
+void wxDirDialog::OnFakeOk( wxCommandEvent &event )

 {
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     if (!gtk_check_version(2,4,0))

-    {
-        if (m_destroyed_by_delete)
-            m_widget = NULL;
-    }
-#endif
-}
-
-void wxDirDialogGTK::OnFakeOk( wxCommandEvent &event )
-{
-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
-        wxDialog::OnOK( event );
+        EndDialog(wxID_OK);

     else
     else

-#endif

         wxGenericDirDialog::OnOK( event );
 }
 
         wxGenericDirDialog::OnOK( event );
 }
 

-int wxDirDialogGTK::ShowModal()
+int wxDirDialog::ShowModal()

 {
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
         return wxDialog::ShowModal();
     else
     if (!gtk_check_version(2,4,0))
         return wxDialog::ShowModal();
     else

-#endif

         return wxGenericDirDialog::ShowModal();
 }
 
         return wxGenericDirDialog::ShowModal();
 }
 

-bool wxDirDialogGTK::Show( bool show )
+bool wxDirDialog::Show( bool show )

 {
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
         return wxDialog::Show( show );
     else
     if (!gtk_check_version(2,4,0))
         return wxDialog::Show( show );
     else

-#endif

         return wxGenericDirDialog::Show( show );
 }
 
         return wxGenericDirDialog::Show( show );
 }
 

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


@@ -216,29 +180,29 @@ void wxDirDialogGTK::DoSetSize(int x, int y, int width, int height, int sizeFlag
         wxGenericDirDialog::DoSetSize( x, y, width, height, sizeFlags );
 }
 
         wxGenericDirDialog::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 (!gtk_check_version(2,4,0))
     {
         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
         }
     }
     else

-#endif

         wxGenericDirDialog::SetPath( dir );
 }
 
         wxGenericDirDialog::SetPath( dir );
 }
 

-wxString wxDirDialogGTK::GetPath() const
+wxString wxDirDialog::GetPath() const

 {
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     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);
+    }
+
+    return wxGenericDirDialog::GetPath();

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