Fix compilation errors in wxGTK wxDataViewCtrl in ANSI mode.

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 09f353fb7fb60a791af814e5110556fa46c8a6ad..cff12d8f6fb3ea14e8bc8abb5500b5a9331d2266 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -10,7 +10,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_FILEDLG 
+#if wxUSE_FILEDLG

 
 #include "wx/filedlg.h"
 
 
 #include "wx/filedlg.h"
 


@@ -40,22 +40,24 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 
     // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation)
 #if GTK_CHECK_VERSION(2,7,3)
 
     // 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)
+    if (gtk_check_version(2, 7, 3) != NULL)

 #endif
 #endif

-    if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))

     {
     {

-        if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
+        if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))

         {
         {

-            wxString msg;
-
-            msg.Printf(
-                _("File '%s' already exists, do you really want to overwrite it?"),
-                wxString(filename, *wxConvFileName));
-
-            wxMessageDialog dlg(dialog, msg, _("Confirm"),
-                               wxYES_NO | wxICON_QUESTION);
-            if (dlg.ShowModal() != wxID_YES)
-                return;
+            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::FromUTF8(filename));
+
+                wxMessageDialog dlg(dialog, msg, _("Confirm"),
+                                   wxYES_NO | wxICON_QUESTION);
+                if (dlg.ShowModal() != wxID_YES)
+                    return;
+            }

         }
     }
 
         }
     }
 


@@ -136,19 +138,21 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, void*)
+static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow* win)

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

-    req->width = 1;
+    req->width = win->GetMinWidth();

 }
 }
 
 }
 }
 

-static void wxInsertChildInFileDialog(wxWindow* WXUNUSED(parent),
-                                      wxWindow* WXUNUSED(child))
+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);

 }
 
 }
 

-

 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------


@@ -169,9 +173,8 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& name)
     : wxFileDialogBase()
 {
                            const wxString& name)
     : wxFileDialogBase()
 {

-    m_insertCallback = wxInsertChildInFileDialog;
-    parent = GetParentForModalDialog(parent);
-    
+    parent = GetParentForModalDialog(parent, style);
+

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


@@ -210,22 +213,24 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                    ok_btn_stock, GTK_RESPONSE_ACCEPT,
                    NULL);
                    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                    ok_btn_stock, GTK_RESPONSE_ACCEPT,
                    NULL);

+    g_object_ref(m_widget);
+    GtkFileChooser* file_chooser = GTK_FILE_CHOOSER(m_widget);

 
 

-    m_fc.SetWidget( GTK_FILE_CHOOSER(m_widget) );
+    m_fc.SetWidget(file_chooser);

 
     gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
 
     if ( style & wxFD_MULTIPLE )
 
     gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
 
     if ( style & wxFD_MULTIPLE )

-        gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
+        gtk_file_chooser_set_select_multiple(file_chooser, true);

 
     // 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...
 
     // 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),
+    g_signal_connect(m_widget,

                     "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete),
                     "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete),

-                    (gpointer)this);
+                    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
 
     // 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


@@ -238,16 +243,30 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     g_signal_connect (m_widget, "response",
         G_CALLBACK (gtk_filedialog_response_callback), this);
 
     g_signal_connect (m_widget, "response",
         G_CALLBACK (gtk_filedialog_response_callback), this);
 

+
+    // deal with extensions/filters

     SetWildcard(wildCard);
 
     SetWildcard(wildCard);
 

+    wxString defaultFileNameWithExt = defaultFileName;
+    if ( !wildCard.empty() && !defaultFileName.empty() &&
+            !wxFileName(defaultFileName).HasExt() )
+    {
+        // append the default extension to the initial file name: GTK won't do
+        // it for us by default (unlike e.g. MSW)
+        const wxString defaultExt = m_fc.GetCurrentWildCard().AfterFirst('.');
+        if ( defaultExt.find_first_of("?*") == wxString::npos )
+            defaultFileNameWithExt += "." + defaultExt;
+    }
+
+

     // if defaultDir is specified it should contain the directory and
     // defaultFileName should contain the default name of the file, however if
     // directory is not given, defaultFileName contains both
     wxFileName fn;
     if ( defaultDir.empty() )
     // if defaultDir is specified it should contain the directory and
     // defaultFileName should contain the default name of the file, however if
     // directory is not given, defaultFileName contains both
     wxFileName fn;
     if ( defaultDir.empty() )

-        fn.Assign(defaultFileName);
-    else if ( !defaultFileName.empty() )
-        fn.Assign(defaultDir, defaultFileName);
+        fn.Assign(defaultFileNameWithExt);
+    else if ( !defaultFileNameWithExt.empty() )
+        fn.Assign(defaultDir, defaultFileNameWithExt);

     else
         fn.AssignDir(defaultDir);
 
     else
         fn.AssignDir(defaultDir);
 


@@ -256,8 +275,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(GTK_FILE_CHOOSER(m_widget),
-                                            dir.fn_str());
+        gtk_file_chooser_set_current_folder(file_chooser, dir.fn_str());

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


@@ -265,20 +283,19 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     {
         if ( !fname.empty() )
         {
     {
         if ( !fname.empty() )
         {

-            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
-                                              fname.fn_str());
+            gtk_file_chooser_set_current_name(file_chooser, fname.fn_str());

         }
 
 #if GTK_CHECK_VERSION(2,7,3)
         if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
         }
 
 #if GTK_CHECK_VERSION(2,7,3)
         if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))

-            gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE);
+            gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true);

 #endif
     }
     else // wxFD_OPEN
     {
         if ( !fname.empty() )
         {
 #endif
     }
     else // wxFD_OPEN
     {
         if ( !fname.empty() )
         {

-            gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
+            gtk_file_chooser_set_filename(file_chooser,

                                           fn.GetFullPath().fn_str());
         }
     }
                                           fn.GetFullPath().fn_str());
         }
     }


@@ -287,14 +304,23 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     {
         GtkWidget *previewImage = gtk_image_new();
 
     {
         GtkWidget *previewImage = gtk_image_new();
 

-        gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(m_widget),
-                                            previewImage);
+        gtk_file_chooser_set_preview_widget(file_chooser, previewImage);

         g_signal_connect(m_widget, "update-preview",
                          G_CALLBACK(gtk_filedialog_update_preview_callback),
                          previewImage);
     }
 }
 
         g_signal_connect(m_widget, "update-preview",
                          G_CALLBACK(gtk_filedialog_update_preview_callback),
                          previewImage);
     }
 }
 

+wxFileDialog::~wxFileDialog()
+{
+    if (m_extraControl)
+    {
+        // get chooser to drop its reference right now, allowing wxWindow dtor
+        // to verify that ref count drops to zero
+        gtk_file_chooser_set_extra_widget(
+            GTK_FILE_CHOOSER(m_widget), NULL);
+    }
+}

 
 void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
 {


@@ -303,23 +329,13 @@ void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
 
 int wxFileDialog::ShowModal()
 {
 
 int wxFileDialog::ShowModal()
 {

-    if (CreateExtraControl())
-    {
-        GtkWidget *control = m_extraControl->m_widget;
-
-        wxASSERT(control->parent == NULL);
-
-        gtk_widget_show(control);
-        g_signal_connect_after(control, "size_request",
-            G_CALLBACK(extra_widget_size_request), NULL);
-        gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(m_widget), control);
-    }
+    CreateExtraControl();

 
     return wxDialog::ShowModal();
 }
 
 
     return wxDialog::ShowModal();
 }
 

-void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), 
-                             int WXUNUSED(width), int WXUNUSED(height), 
+void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
+                             int WXUNUSED(width), int WXUNUSED(height),

                              int WXUNUSED(sizeFlags))
 {
 }
                              int WXUNUSED(sizeFlags))
 {
 }


@@ -353,40 +369,76 @@ void wxFileDialog::SetMessage(const wxString& message)
 
 void wxFileDialog::SetPath(const wxString& path)
 {
 
 void wxFileDialog::SetPath(const wxString& path)
 {

-    m_fc.SetPath( path );
+    // we need an absolute path for GTK native chooser so ensure that we have
+    // it
+    wxFileName fn(path);
+    fn.MakeAbsolute();
+    m_fc.SetPath(fn.GetFullPath());

 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {

-    m_fc.SetDirectory( 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;
+    }

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

-    return m_fc.GetDirectory();
+    wxString currentDir( m_fc.GetDirectory() );
+    if (currentDir.empty())
+    {
+        // m_fc.GetDirectory() will return empty until the dialog has been shown
+        // in which case use any previously provided value
+        currentDir = m_dir;
+    }
+    return currentDir;

 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
     if (HasFdFlag(wxFD_SAVE))
 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
     if (HasFdFlag(wxFD_SAVE))

+    {

         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));

+        m_fileName = name;
+    }
+

     else
     else

-        SetPath(wxFileName(GetDirectory(), name).GetFullPath());
+    {
+        wxString path( GetDirectory() );
+        if (path.empty())
+        {
+            // SetPath() fires an assert if fed other than filepaths
+            return;
+        }
+        SetPath(wxFileName(path, name).GetFullPath());
+        m_fileName = name;
+    }

 }
 
 wxString wxFileDialog::GetFilename() const
 {
 }
 
 wxString wxFileDialog::GetFilename() const
 {

-    return m_fc.GetFilename();
+    wxString currentFilename( m_fc.GetFilename() );
+    if (currentFilename.empty())
+    {
+        // m_fc.GetFilename() will return empty until the dialog has been shown
+        // in which case use any previously provided value
+        currentFilename = m_fileName;
+    }
+    return currentFilename;

 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {

-    m_fc.SetWildcard( wildCard );
+    wxFileDialogBase::SetWildcard(wildCard);
+    m_fc.SetWildcard( GetWildcard() );

 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {

-

     m_fc.SetFilterIndex( filterIndex);
 }
 
     m_fc.SetFilterIndex( filterIndex);
 }
 


@@ -395,4 +447,4 @@ int wxFileDialog::GetFilterIndex() const
     return m_fc.GetFilterIndex();
 }
 
     return m_fc.GetFilterIndex();
 }
 

-#endif // wxUSE_FILEDLG 
+#endif // wxUSE_FILEDLG