Fix deprecating warning introduced in r72446.

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index a9359fa3ff092bad20e97cff9828105ce0a56b2c..09508a9f6eba0fb9bc2bd0c81b25a633a4eb3cd0 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -22,7 +22,9 @@
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 

+#ifdef __UNIX__

 #include <unistd.h> // chdir
 #include <unistd.h> // chdir

+#endif

 
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer


@@ -39,6 +41,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
     wxGtkString 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)
     wxGtkString 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)

+#ifndef __WXGTK3__

 #if GTK_CHECK_VERSION(2,7,3)
     if (gtk_check_version(2, 7, 3) != NULL)
 #endif
 #if GTK_CHECK_VERSION(2,7,3)
     if (gtk_check_version(2, 7, 3) != NULL)
 #endif


@@ -60,6 +63,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
             }
         }
     }
             }
         }
     }

+#endif

 
     if (style & wxFD_FILE_MUST_EXIST)
     {
 
     if (style & wxFD_FILE_MUST_EXIST)
     {


@@ -133,22 +137,12 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
 
 } // extern "C"
 
 
 } // extern "C"
 

-//-----------------------------------------------------------------------------
-// "size_request" from m_extraControl
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow* win)
+void wxFileDialog::AddChildGTK(wxWindowGTK* child)

 {
     // allow dialog to be resized smaller horizontally
 {
     // allow dialog to be resized smaller horizontally

-    req->width = win->GetMinWidth();
-}
-}
+    gtk_widget_set_size_request(
+        child->m_widget, child->GetMinWidth(), child->m_height);

 
 

-void wxFileDialog::AddChildGTK(wxWindowGTK* child)
-{
-    g_signal_connect_after(child->m_widget, "size_request",
-        G_CALLBACK(extra_widget_size_request), child);

     gtk_file_chooser_set_extra_widget(
         GTK_FILE_CHOOSER(m_widget), child->m_widget);
 }
     gtk_file_chooser_set_extra_widget(
         GTK_FILE_CHOOSER(m_widget), child->m_widget);
 }


@@ -172,13 +166,24 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxSize& sz,
                            const wxString& name)
     : wxFileDialogBase()
                            const wxSize& sz,
                            const wxString& name)
     : wxFileDialogBase()

+{
+    Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name);
+}
+
+bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
+                           const wxString& defaultDir,
+                           const wxString& defaultFileName,
+                           const wxString& wildCard,
+                           long style, const wxPoint& pos,
+                           const wxSize& sz,
+                           const wxString& name)

 {
     parent = GetParentForModalDialog(parent, style);
 
     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,
                                   wildCard, style, pos, sz, name))
     {
 {
     parent = GetParentForModalDialog(parent, style);
 
     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,
                                   wildCard, style, pos, sz, name))
     {

-        return;
+        return false;

     }
 
     if (!PreCreation(parent, pos, wxDefaultSize) ||
     }
 
     if (!PreCreation(parent, pos, wxDefaultSize) ||


@@ -186,7 +191,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                 wxDefaultValidator, wxT("filedialog")))
     {
         wxFAIL_MSG( wxT("wxFileDialog creation failed") );
                 wxDefaultValidator, wxT("filedialog")))
     {
         wxFAIL_MSG( wxT("wxFileDialog creation failed") );

-        return;
+        return false;

     }
 
     GtkFileChooserAction gtk_action;
     }
 
     GtkFileChooserAction gtk_action;


@@ -275,7 +280,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     const wxString dir = fn.GetPath();
     if ( !dir.empty() )
     {
     const wxString dir = fn.GetPath();
     if ( !dir.empty() )
     {

-        gtk_file_chooser_set_current_folder(file_chooser, dir.fn_str());
+        gtk_file_chooser_set_current_folder(file_chooser, wxGTK_CONV_FN(dir));

     }
 
     const wxString fname = fn.GetFullName();
     }
 
     const wxString fname = fn.GetFullName();


@@ -283,12 +288,18 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     {
         if ( !fname.empty() )
         {
     {
         if ( !fname.empty() )
         {

-            gtk_file_chooser_set_current_name(file_chooser, fname.fn_str());
+            gtk_file_chooser_set_current_name(file_chooser, wxGTK_CONV_FN(fname));

         }
 
 #if GTK_CHECK_VERSION(2,7,3)
         }
 
 #if GTK_CHECK_VERSION(2,7,3)

-        if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
+        if ((style & wxFD_OVERWRITE_PROMPT)
+#ifndef __WXGTK3__
+            && gtk_check_version(2,7,3) == NULL
+#endif
+            )
+        {

             gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true);
             gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true);

+        }

 #endif
     }
     else // wxFD_OPEN
 #endif
     }
     else // wxFD_OPEN


@@ -296,7 +307,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         if ( !fname.empty() )
         {
             gtk_file_chooser_set_filename(file_chooser,
         if ( !fname.empty() )
         {
             gtk_file_chooser_set_filename(file_chooser,

-                                          fn.GetFullPath().fn_str());
+                                          wxGTK_CONV_FN(fn.GetFullPath()));

         }
     }
 
         }
     }
 


@@ -309,6 +320,8 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                          G_CALLBACK(gtk_filedialog_update_preview_callback),
                          previewImage);
     }
                          G_CALLBACK(gtk_filedialog_update_preview_callback),
                          previewImage);
     }

+
+    return true;

 }
 
 wxFileDialog::~wxFileDialog()
 }
 
 wxFileDialog::~wxFileDialog()


@@ -369,10 +382,17 @@ void wxFileDialog::SetMessage(const wxString& message)
 
 void wxFileDialog::SetPath(const wxString& path)
 {
 
 void wxFileDialog::SetPath(const wxString& path)
 {

+    // Don't do anything if no path is specified, in particular don't set the
+    // path to m_dir below as this would result in opening the dialog in the
+    // parent directory of this one instead of m_dir itself.
+    if ( path.empty() )
+        return;
+

     // we need an absolute path for GTK native chooser so ensure that we have
     // we need an absolute path for GTK native chooser so ensure that we have

-    // it
+    // it: use the initial directory if it was set or just CWD otherwise (this
+    // is the default behaviour if m_dir is empty)

     wxFileName fn(path);
     wxFileName fn(path);

-    fn.MakeAbsolute();
+    fn.MakeAbsolute(m_dir);

     m_fc.SetPath(fn.GetFullPath());
 }
 
     m_fc.SetPath(fn.GetFullPath());
 }