X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77d827708dfba2238e2461358265f05ac0e2cd4d..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/filepicker.cpp?ds=inline

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index ec160d8222..803815982e 100644
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -22,6 +22,7 @@
 #include "wx/filepicker.h"
 #include "wx/tooltip.h"
 
+#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 // ============================================================================
@@ -43,7 +44,11 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
 {
     // we can't use the native button for wxFLP_SAVE pickers as it can only
     // open existing files and there is no way to create a new file using it
-    if ( !(style & wxFLP_SAVE) && !(style & wxFLP_USE_TEXTCTRL) && !gtk_check_version(2,6,0) )
+    if (!(style & wxFLP_SAVE) && !(style & wxFLP_USE_TEXTCTRL)
+#ifndef __WXGTK3__
+        && gtk_check_version(2,6,0) == NULL
+#endif
+        )
     {
         // VERY IMPORTANT: this code is identical to relative code in wxDirButton;
         //                 if you find a problem here, fix it also in wxDirButton !
@@ -65,7 +70,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         m_wildcard = wildcard;
         if ((m_dialog = CreateDialog()) == NULL)
             return false;
-            
+
         // 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
         // window which called gtk_grab_add (and this happens if e.g. a wxDialog is running
@@ -80,9 +85,7 @@ bool wxFileButton::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 );
-        
         g_object_ref(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
@@ -124,11 +127,19 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
 void wxFileButton::SetPath(const wxString &str)
 {
     m_path = str;
-    
+
     if (m_dialog)
         UpdateDialogPath(m_dialog);
 }
 
+void wxFileButton::SetInitialDirectory(const wxString& dir)
+{
+    if (m_dialog)
+        DoSetInitialDirectory(static_cast<wxFileDialog*>(m_dialog), dir);
+    else
+        wxGenericFileButton::SetInitialDirectory(dir);
+}
+
 #endif      // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
 
 
@@ -136,7 +147,9 @@ void wxFileButton::SetPath(const wxString &str)
 
 #if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
 
+#ifdef __UNIX__
 #include <unistd.h> // chdir
+#endif
 
 //-----------------------------------------------------------------------------
 // "current-folder-changed"
@@ -188,7 +201,11 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
-    if ( !(style & wxDIRP_USE_TEXTCTRL) && !gtk_check_version(2,6,0) )
+    if (!(style & wxDIRP_USE_TEXTCTRL)
+#ifndef __WXGTK3__
+        && gtk_check_version(2,6,0) == NULL
+#endif
+        )
     {
         // VERY IMPORTANT: this code is identic to relative code in wxFileButton;
         //                 if you find a problem here, fix it also in wxFileButton !
@@ -227,9 +244,6 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
         g_object_ref(m_widget);
 
-        
-        gtk_widget_show(m_widget);
-
         // GtkFileChooserButton signals
         g_signal_connect(m_widget, "current-folder-changed",
                          G_CALLBACK(gtk_dirbutton_currentfolderchanged_callback), this);
@@ -250,7 +264,7 @@ wxDirButton::~wxDirButton()
 }
 
 void wxDirButton::GTKUpdatePath(const char *gtkpath)
-{ 
+{
     m_path = wxString::FromUTF8(gtkpath);
 }
 void wxDirButton::SetPath(const wxString& str)
@@ -274,4 +288,15 @@ void wxDirButton::SetPath(const wxString& str)
         UpdateDialogPath(m_dialog);
 }
 
+void wxDirButton::SetInitialDirectory(const wxString& dir)
+{
+    if (m_dialog)
+    {
+        if (m_path.empty())
+            static_cast<wxDirDialog*>(m_dialog)->SetPath(dir);
+    }
+    else
+        wxGenericDirButton::SetInitialDirectory(dir);
+}
+
 #endif      // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)