remove unnecessary gtk_widget_show(m_widget) calls, PostCreation() takes care of...

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

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index ec160d82226e9880cec21f2794241b1cbd44a892..62ee1f45117abbcc8544ce4972aae41666f4da9e 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -65,7 +65,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         m_wildcard = wildcard;
         if ((m_dialog = CreateDialog()) == NULL)
             return false;
         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
         // 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 +80,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 );
 
         //       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);
         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
 
         // we need to know when the dialog has been dismissed clicking OK...
         // NOTE: the "clicked" signal is not available for a GtkFileChooserButton


@@ -124,11 +122,19 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
 void wxFileButton::SetPath(const wxString &str)
 {
     m_path = str;
 void wxFileButton::SetPath(const wxString &str)
 {
     m_path = str;

-    
+

     if (m_dialog)
         UpdateDialogPath(m_dialog);
 }
 
     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__)
 
 
 #endif      // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
 
 


@@ -136,7 +142,9 @@ void wxFileButton::SetPath(const wxString &str)
 
 #if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
 
 
 #if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
 

+#ifdef __UNIX__

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

+#endif

 
 //-----------------------------------------------------------------------------
 // "current-folder-changed"
 
 //-----------------------------------------------------------------------------
 // "current-folder-changed"


@@ -227,9 +235,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);
 
         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);
         // GtkFileChooserButton signals
         g_signal_connect(m_widget, "current-folder-changed",
                          G_CALLBACK(gtk_dirbutton_currentfolderchanged_callback), this);


@@ -250,7 +255,7 @@ wxDirButton::~wxDirButton()
 }
 
 void wxDirButton::GTKUpdatePath(const char *gtkpath)
 }
 
 void wxDirButton::GTKUpdatePath(const char *gtkpath)

-{ 
+{

     m_path = wxString::FromUTF8(gtkpath);
 }
 void wxDirButton::SetPath(const wxString& str)
     m_path = wxString::FromUTF8(gtkpath);
 }
 void wxDirButton::SetPath(const wxString& str)


@@ -274,4 +279,15 @@ void wxDirButton::SetPath(const wxString& str)
         UpdateDialogPath(m_dialog);
 }
 
         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__)
 #endif      // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)