Fix deprecating warning introduced in r72446.

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

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index 6779e751117164ef3de7ba3cc8aa2b5e703d253a..f93d3428f29658c09f992daa7543b077aea3d813 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -17,14 +17,13 @@
 // 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_FILEPICKERCTRL && defined(__WXGTK26__)
+#if wxUSE_FILEPICKERCTRL

 
 #include "wx/filepicker.h"
 #include "wx/tooltip.h"
 
 #include <gtk/gtk.h>
 
 #include "wx/filepicker.h"
 #include "wx/tooltip.h"
 
 #include <gtk/gtk.h>

-
-
+#include "wx/gtk/private.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -43,14 +42,13 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
                         long style, const wxValidator& validator,
                         const wxString &name )
 {

-    if (!gtk_check_version(2,6,0))
+    // 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))

     {
     {

-        // VERY IMPORTANT: this code is identic to relative code in wxDirButton;
+        // VERY IMPORTANT: this code is identical to relative code in wxDirButton;

         //                 if you find a problem here, fix it also in wxDirButton !
 
         //                 if you find a problem here, fix it also in wxDirButton !
 

-        m_needParent = true;
-        m_acceptsFocus = true;
-

         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))


@@ -81,10 +79,9 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         g_signal_connect(m_dialog->m_widget, "show", G_CALLBACK(gtk_grab_add), NULL);
         g_signal_connect(m_dialog->m_widget, "hide", G_CALLBACK(gtk_grab_remove), NULL);
 
         g_signal_connect(m_dialog->m_widget, "show", G_CALLBACK(gtk_grab_add), NULL);
         g_signal_connect(m_dialog->m_widget, "hide", G_CALLBACK(gtk_grab_remove), NULL);
 

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


@@ -96,7 +93,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
         m_parent->DoAddChild( this );
 
         PostCreation(size);

-        SetBestSize(size);
+        SetInitialSize(size);

     }
     else
         return wxGenericFileButton::Create(parent, id, label, path, message, wildcard,
     }
     else
         return wxGenericFileButton::Create(parent, id, label, path, message, wildcard,


@@ -106,11 +103,6 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
 
 wxFileButton::~wxFileButton()
 {
 
 wxFileButton::~wxFileButton()
 {

-    // GtkFileChooserButton will automatically destroy the
-    // GtkFileChooserDialog associated with m_dialog.
-    // Thus we have to set its m_widget to NULL to avoid
-    // double destruction on same widget
-    m_dialog->m_widget = NULL;

 }
 
 void wxFileButton::OnDialogOK(wxCommandEvent& ev)
 }
 
 void wxFileButton::OnDialogOK(wxCommandEvent& ev)


@@ -124,24 +116,41 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
 
         // ...and fire an event
         wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path);
 
         // ...and fire an event
         wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path);

-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);

     }
 }
 
 void wxFileButton::SetPath(const wxString &str)
 {
     m_path = str;
     }
 }
 
 void wxFileButton::SetPath(const wxString &str)
 {
     m_path = str;

-    UpdateDialogPath(m_dialog);
-}
-
-#endif      // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)

 
 

+    if (m_dialog)
+        UpdateDialogPath(m_dialog);
+}

 
 

+void wxFileButton::SetInitialDirectory(const wxString& dir)
+{
+    if (m_dialog)
+    {
+        // Only change the directory if the default file name doesn't have any
+        // directory in it, otherwise it takes precedence.
+        if ( m_path.find_first_of(wxFileName::GetPathSeparators()) ==
+                wxString::npos )
+        {
+            static_cast<wxFileDialog*>(m_dialog)->SetDirectory(dir);
+        }
+    }
+    else
+        wxGenericFileButton::SetInitialDirectory(dir);
+}

 
 

+#endif // wxUSE_FILEPICKERCTRL

 
 

-#if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
+#if wxUSE_DIRPICKERCTRL

 
 

+#ifdef __UNIX__

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

+#endif

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


@@ -162,8 +171,8 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
 
     // NB: it's important to use gtk_file_chooser_get_filename instead of
     //     gtk_file_chooser_get_current_folder (see GTK docs) !
 
     // 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));
-    p->UpdatePath(filename);
+    wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
+    p->GTKUpdatePath(filename);

 
     // since GtkFileChooserButton when used to pick directories also uses a combobox,
     // maybe that the current folder has been changed but not through the GtkFileChooserDialog
 
     // since GtkFileChooserButton when used to pick directories also uses a combobox,
     // maybe that the current folder has been changed but not through the GtkFileChooserDialog


@@ -172,11 +181,10 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
     // style was given.
     if (p->HasFlag(wxDIRP_CHANGE_DIR))
         chdir(filename);
     // 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());
 
     // ...and fire an event
     wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());

-    p->GetEventHandler()->ProcessEvent(event);
+    p->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -194,14 +202,11 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
                         long style, const wxValidator& validator,
                         const wxString &name )
 {

-    if (!gtk_check_version(2,6,0))
+    if (!(style & wxDIRP_USE_TEXTCTRL))

     {
         // VERY IMPORTANT: this code is identic to relative code in wxFileButton;
         //                 if you find a problem here, fix it also in wxFileButton !
 
     {
         // 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;
-        m_acceptsFocus = true;
-

         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))


@@ -234,8 +239,7 @@ bool wxDirButton::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 );
         // 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) );
+        g_object_ref(m_widget);

 
         // GtkFileChooserButton signals
         g_signal_connect(m_widget, "current-folder-changed",
 
         // GtkFileChooserButton signals
         g_signal_connect(m_widget, "current-folder-changed",


@@ -244,7 +248,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
         m_parent->DoAddChild( this );
 
         PostCreation(size);

-        SetBestSize(size);
+        SetInitialSize(size);

     }
     else
         return wxGenericDirButton::Create(parent, id, label, path, message, wildcard,
     }
     else
         return wxGenericDirButton::Create(parent, id, label, path, message, wildcard,


@@ -254,15 +258,20 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
 
 wxDirButton::~wxDirButton()
 {
 
 wxDirButton::~wxDirButton()
 {

-    // GtkFileChooserButton will automatically destroy the
-    // GtkFileChooserDialog associated with m_dialog.
-    // Thus we have to set its m_widget to NULL to avoid
-    // double destruction on same widget
-    m_dialog->m_widget = NULL;

 }
 
 }
 

-void wxDirButton::SetPath(const wxString &str)
+void wxDirButton::GTKUpdatePath(const char *gtkpath)
+{
+    m_path = wxString::FromUTF8(gtkpath);
+}
+void wxDirButton::SetPath(const wxString& str)

 {
 {

+    if ( m_path == str )
+    {
+        // don't do anything and especially don't set m_bIgnoreNextChange
+        return;
+    }
+

     m_path = str;
 
     // wxDirButton uses the "current-folder-changed" signal which is triggered also
     m_path = str;
 
     // wxDirButton uses the "current-folder-changed" signal which is triggered also


@@ -272,7 +281,19 @@ void wxDirButton::SetPath(const wxString &str)
     // general with all wxWidgets control-manipulation functions which do not send events).
     m_bIgnoreNextChange = true;
 
     // general with all wxWidgets control-manipulation functions which do not send events).
     m_bIgnoreNextChange = true;
 

-    UpdateDialogPath(m_dialog);
+    if (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