typo fix

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

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index 6784f90430f0fa029727e6aa3ee07b37fcd2a5c7..8ce087ed5cead9871fa2df31158e5539343991f8 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -20,13 +20,9 @@
 #if wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
 
 #include "wx/filepicker.h"
-
 #include "wx/tooltip.h"
 
-#include <gtk/gtk.h>
-
-#include <unistd.h> // chdir
-
+#include "wx/gtk/private.h"
 
 // ============================================================================
 // implementation
@@ -47,10 +43,8 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
 {
     if (!gtk_check_version(2,6,0))
     {
-        // VERY IMPORTANT: this code is identic to relative code in wxFileButton;
-        //                 if you find a problem here, fix it also in wxFileButton !
-
-        m_needParent = true;
+        // VERY IMPORTANT: this code is identic to relative code in wxDirButton;
+        //                 if you find a problem here, fix it also in wxDirButton !
 
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
@@ -85,7 +79,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         // NOTE: we deliberately ignore the given label as GtkFileChooserButton
         //       use as label the currently selected file
         m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
-        gtk_widget_show( GTK_WIDGET(m_widget) );
+        gtk_widget_show(m_widget);
 
         // we need to know when the dialog has been dismissed clicking OK...
         // NOTE: the "clicked" signal is not available for a GtkFileChooserButton
@@ -97,7 +91,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
-        SetBestSize(size);
+        SetInitialSize(size);
     }
     else
         return wxGenericFileButton::Create(parent, id, label, path, message, wildcard,
@@ -129,6 +123,12 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
     }
 }
 
+void wxFileButton::SetPath(const wxString &str)
+{
+    m_path = str;
+    UpdateDialogPath(m_dialog);
+}
+
 #endif      // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
 
 
@@ -136,6 +136,8 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
 
 #if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
 
+#include <unistd.h> // chdir
+
 //-----------------------------------------------------------------------------
 // "current-folder-changed"
 //-----------------------------------------------------------------------------
@@ -145,11 +147,17 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
                                                         wxDirButton *p)
 {
     // update the m_path member of the wxDirButtonGTK
+    // unless the path was changed by wxDirButton::SetPath()
+    if (p->m_bIgnoreNextChange)
+    {
+        p->m_bIgnoreNextChange=false;
+        return;
+    }
     wxASSERT(p);
 
     // NB: it's important to use gtk_file_chooser_get_filename instead of
     //     gtk_file_chooser_get_current_folder (see GTK docs) !
-    gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
+    wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
     p->UpdatePath(filename);
 
     // since GtkFileChooserButton when used to pick directories also uses a combobox,
@@ -159,7 +167,6 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
     // style was given.
     if (p->HasFlag(wxDIRP_CHANGE_DIR))
         chdir(filename);
-    g_free(filename);
 
     // ...and fire an event
     wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());
@@ -186,8 +193,6 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         // VERY IMPORTANT: this code is identic to relative code in wxFileButton;
         //                 if you find a problem here, fix it also in wxFileButton !
 
-        m_needParent = true;
-
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))
@@ -202,6 +207,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         m_wildcard = wildcard;
         if ((m_dialog = CreateDialog()) == NULL)
             return false;
+        SetPath(path);
 
         // little trick used to avoid problems when there are other GTK windows 'grabbed':
         // GtkFileChooserDialog won't be responsive to user events if there is another
@@ -220,7 +226,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         //       use as label the currently selected file
         m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
 
-        gtk_widget_show( GTK_WIDGET(m_widget) );
+        gtk_widget_show(m_widget);
 
         // GtkFileChooserButton signals
         g_signal_connect(m_widget, "current-folder-changed",
@@ -229,7 +235,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
-        SetBestSize(size);
+        SetInitialSize(size);
     }
     else
         return wxGenericDirButton::Create(parent, id, label, path, message, wildcard,
@@ -246,4 +252,18 @@ wxDirButton::~wxDirButton()
     m_dialog->m_widget = NULL;
 }
 
+void wxDirButton::SetPath(const wxString &str)
+{
+    m_path = str;
+
+    // wxDirButton uses the "current-folder-changed" signal which is triggered also
+    // when we set the path on the dialog associated with this button; thus we need
+    // to set the following flag to avoid sending a wxFileDirPickerEvent from this
+    // function (which would be inconsistent with wxFileButton's behaviour and in
+    // general with all wxWidgets control-manipulation functions which do not send events).
+    m_bIgnoreNextChange = true;
+
+    UpdateDialogPath(m_dialog);
+}
+
 #endif      // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)