use generic file picker in wxFLP_SAVE case as the native one doesn't allow to select...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index e1bd484781c3f8421aaf624c1948b460d4c01fd7..7b5a7da72eb7bbdf6a1c31bae5d7eb70a2fdd4d7 100644 (file)
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -99,15 +99,6 @@ public:     // overrides
     // event handler for the click
     void OnDialogOK(wxCommandEvent &);
 
-    // GtkFileChooserButton does not support GTK_FILE_CHOOSER_ACTION_SAVE
-    // so we replace it with GTK_FILE_CHOOSER_ACTION_OPEN; since wxFD_SAVE
-    // is not supported, wxFD_OVERWRITE_PROMPT isn't too...
-    virtual long GetDialogStyle() const
-    {
-         return (wxGenericFileButton::GetDialogStyle() &
-                     ~(wxFD_SAVE | wxFD_OVERWRITE_PROMPT)) | wxFD_OPEN;
-    }
-
     virtual void SetPath(const wxString &str);
 
     // see macro defined above

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index d1f18c726f59c957765e45c860da1f8304273aba..fffa3b0da9bce15c2c73c2ecef80011fbfad6e6a 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -41,7 +41,9 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
                         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) && !gtk_check_version(2,6,0) )
     {
         // VERY IMPORTANT: this code is identic to relative code in wxDirButton;
         //                 if you find a problem here, fix it also in wxDirButton !