Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index b1a370e37606f43a4b9901064d5bf9eb54dc9770..28f087c24626f1d3a39fc894d5fa63ace9cd12ce 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -29,6 +29,7 @@
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd

+#include "wx/testing.h"

 
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
 
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button


@@ -41,6 +42,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


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

+#endif

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


@@ -135,22 +138,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);
 }


@@ -288,7 +281,7 @@ bool wxFileDialog::Create(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();


@@ -296,12 +289,18 @@ bool wxFileDialog::Create(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


@@ -309,7 +308,7 @@ bool wxFileDialog::Create(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()));

         }
     }
 
         }
     }
 


@@ -344,6 +343,8 @@ void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
 
 int wxFileDialog::ShowModal()
 {
 
 int wxFileDialog::ShowModal()
 {

+    WX_TESTING_SHOW_MODAL_HOOK();
+

     CreateExtraControl();
 
     return wxDialog::ShowModal();
     CreateExtraControl();
 
     return wxDialog::ShowModal();


@@ -384,6 +385,8 @@ void wxFileDialog::SetMessage(const wxString& message)
 
 void wxFileDialog::SetPath(const wxString& path)
 {
 
 void wxFileDialog::SetPath(const wxString& path)
 {

+    wxFileDialogBase::SetPath(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.
     // 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.


@@ -400,12 +403,9 @@ void wxFileDialog::SetPath(const wxString& path)
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {

-    if (m_fc.SetDirectory( dir ))
-    {
-        // Cache the dir, as gtk_file_chooser_get_current_folder()
-        // doesn't return anything until the dialog has been shown
-        m_dir = dir;
-    }
+    wxFileDialogBase::SetDirectory(dir);
+
+    m_fc.SetDirectory(dir);

 }
 
 wxString wxFileDialog::GetDirectory() const
 }
 
 wxString wxFileDialog::GetDirectory() const


@@ -422,10 +422,11 @@ wxString wxFileDialog::GetDirectory() const
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
 
 void wxFileDialog::SetFilename(const wxString& name)
 {

+    wxFileDialogBase::SetFilename(name);
+

     if (HasFdFlag(wxFD_SAVE))
     {
         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
     if (HasFdFlag(wxFD_SAVE))
     {
         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));

-        m_fileName = name;

     }
 
     else
     }
 
     else


@@ -437,7 +438,6 @@ void wxFileDialog::SetFilename(const wxString& name)
             return;
         }
         SetPath(wxFileName(path, name).GetFullPath());
             return;
         }
         SetPath(wxFileName(path, name).GetFullPath());

-        m_fileName = name;

     }
 }
 
     }
 }