fixed TestTimeFormat() test: and can use 2 digit years which broke dates comparison...

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 41e7703303b0cbab2eed11bbfac543aa9cfbcc16..26d5463f92c27ce6aae117e55372f1ce49e7929c 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -10,16 +10,15 @@
 // 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_FILEDLG
+#if wxUSE_FILEDLG && defined(__WXGTK24__)

 
 #include "wx/filedlg.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #include "wx/filedlg.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/msgdlg.h"

 #endif
 
 #endif
 

-#ifdef __WXGTK24__
-

 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 


@@ -28,7 +27,6 @@
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd

-#include "wx/msgdlg.h" // wxMessageDialog

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -43,14 +41,14 @@ extern void wxapp_install_idle_handler();
 extern "C" {
 static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 {
 extern "C" {
 static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 {

-    int style = dialog->GetStyle();
+    int style = dialog->GetWindowStyle();

     gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
 
     // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation)
 #if GTK_CHECK_VERSION(2,7,3)
     if(gtk_check_version(2,7,3) != NULL)
 #endif
     gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
 
     // gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation)
 #if GTK_CHECK_VERSION(2,7,3)
     if(gtk_check_version(2,7,3) != NULL)
 #endif

-    if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT))
+    if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))

     {
         if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
         {
     {
         if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
         {


@@ -68,7 +66,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
     }
 
     // change to the directory where the user went if asked
     }
 
     // change to the directory where the user went if asked

-    if (style & wxCHANGE_DIR)
+    if (style & wxFD_CHANGE_DIR)

     {
         // Use chdir to not care about filename encodings
         gchar* folder = g_path_get_dirname(filename);
     {
         // Use chdir to not care about filename encodings
         gchar* folder = g_path_get_dirname(filename);


@@ -89,8 +87,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
-                                           wxFileDialog *dialog)
+static void gtk_filedialog_cancel_callback(GtkWidget *w, wxFileDialog *dialog)

 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject(dialog);
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject(dialog);


@@ -107,17 +104,11 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
 
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);
 
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);

-    else if (response == GTK_RESPONSE_CANCEL)
-        gtk_filedialog_cancel_callback(w, dialog);
-    else // "delete"
-    {
+    else    // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE

         gtk_filedialog_cancel_callback(w, dialog);
         gtk_filedialog_cancel_callback(w, dialog);

-        dialog->m_destroyed_by_delete = true;
-    }

 }
 }
 
 }
 }
 

-#endif // __WXGTK24__

 
 //-----------------------------------------------------------------------------
 // wxFileDialog
 
 //-----------------------------------------------------------------------------
 // wxFileDialog


@@ -133,16 +124,15 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& defaultDir,
                            const wxString& defaultFileName,
                            const wxString& wildCard,
                            const wxString& defaultDir,
                            const wxString& defaultFileName,
                            const wxString& wildCard,

-                           long style, const wxPoint& pos)
+                           long style, const wxPoint& pos,
+                           const wxSize& sz,
+                           const wxString& name)

     : wxGenericFileDialog(parent, message, defaultDir, defaultFileName,
     : wxGenericFileDialog(parent, message, defaultDir, defaultFileName,

-                       wildCard, style, pos, true )
+                          wildCard, style, pos, sz, name, true )

 {
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
     if (!gtk_check_version(2,4,0))
     {

-        wxASSERT_MSG( !( (style & wxSAVE) && (style & wxMULTIPLE) ), wxT("wxFileDialog - wxMULTIPLE used on a save dialog" ) );

         m_needParent = false;
         m_needParent = false;

-        m_destroyed_by_delete = false;

 
         if (!PreCreation(parent, pos, wxDefaultSize) ||
             !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
 
         if (!PreCreation(parent, pos, wxDefaultSize) ||
             !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,


@@ -158,7 +148,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
             gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
 
         const gchar* ok_btn_stock;
             gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
 
         const gchar* ok_btn_stock;

-        if ( style & wxSAVE )
+        if ( style & wxFD_SAVE )

         {
             gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
             ok_btn_stock = GTK_STOCK_SAVE;
         {
             gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
             ok_btn_stock = GTK_STOCK_SAVE;


@@ -179,9 +169,17 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 
         gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
 
 
         gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
 

-        if ( style & wxMULTIPLE )
+        if ( style & wxFD_MULTIPLE )

             gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
 
             gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
 

+        // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically destroys
+        // the dialog when the user press ESC on the dialog: in that case a second call to
+        // ShowModal() would result in a bunch of Gtk-CRITICAL errors...
+        g_signal_connect (G_OBJECT(m_widget),
+                        "delete_event",
+                        G_CALLBACK (gtk_widget_hide_on_delete),
+                        (gpointer)this);
+

         // local-only property could be set to false to allow non-local files to be loaded.
         // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere
         // and the GtkFileChooserDialog should probably also be created with a backend,
         // local-only property could be set to false to allow non-local files to be loaded.
         // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere
         // and the GtkFileChooserDialog should probably also be created with a backend,


@@ -194,7 +192,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 
         SetWildcard(wildCard);
 
 
         SetWildcard(wildCard);
 

-        if ( style & wxSAVE )
+        if ( style & wxFD_SAVE )

         {
             if ( !defaultDir.empty() )
                 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
         {
             if ( !defaultDir.empty() )
                 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),


@@ -204,7 +202,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                 wxConvFileName->cWX2MB(defaultFileName));
 
 #if GTK_CHECK_VERSION(2,7,3)
                 wxConvFileName->cWX2MB(defaultFileName));
 
 #if GTK_CHECK_VERSION(2,7,3)

-            if ((style & wxOVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
+            if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))

                 gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE);
 #endif
         }
                 gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE);
 #endif
         }


@@ -228,48 +226,30 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         }
     }
     else
         }
     }
     else

-#endif

         wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );
 }
 
         wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );
 }
 

-wxFileDialog::~wxFileDialog()
-{
-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
-    {
-        if (m_destroyed_by_delete)
-            m_widget = NULL;
-    }
-#endif
-}
-

 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {
 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
         wxDialog::OnOK( event );
     else
     if (!gtk_check_version(2,4,0))
         wxDialog::OnOK( event );
     else

-#endif

         wxGenericFileDialog::OnListOk( event );
 }
 
 int wxFileDialog::ShowModal()
 {
         wxGenericFileDialog::OnListOk( event );
 }
 
 int wxFileDialog::ShowModal()
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
         return wxDialog::ShowModal();
     else
     if (!gtk_check_version(2,4,0))
         return wxDialog::ShowModal();
     else

-#endif

         return wxGenericFileDialog::ShowModal();
 }
 
 bool wxFileDialog::Show( bool show )
 {
         return wxGenericFileDialog::ShowModal();
 }
 
 bool wxFileDialog::Show( bool show )
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
         return wxDialog::Show( show );
     else
     if (!gtk_check_version(2,4,0))
         return wxDialog::Show( show );
     else

-#endif

         return wxGenericFileDialog::Show( show );
 }
 
         return wxGenericFileDialog::Show( show );
 }
 


@@ -283,17 +263,14 @@ void wxFileDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags
 
 wxString wxFileDialog::GetPath() const
 {
 
 wxString wxFileDialog::GetPath() const
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
         return wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
     else
     if (!gtk_check_version(2,4,0))
         return wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
     else

-#endif

         return wxGenericFileDialog::GetPath();
 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 {
         return wxGenericFileDialog::GetPath();
 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
         GetPaths(files);
     if (!gtk_check_version(2,4,0))
     {
         GetPaths(files);


@@ -304,13 +281,11 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
         }
     }
     else
         }
     }
     else

-#endif

         wxGenericFileDialog::GetFilenames( files );
 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {
         wxGenericFileDialog::GetFilenames( files );
 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
         paths.Empty();
     if (!gtk_check_version(2,4,0))
     {
         paths.Empty();


@@ -332,26 +307,22 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
             paths.Add(GetPath());
     }
     else
             paths.Add(GetPath());
     }
     else

-#endif

         wxGenericFileDialog::GetPaths( paths );
 }
 
 void wxFileDialog::SetMessage(const wxString& message)
 {
         wxGenericFileDialog::GetPaths( paths );
 }
 
 void wxFileDialog::SetMessage(const wxString& message)
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
         m_message = message;
         SetTitle(message);
     }
     else
     if (!gtk_check_version(2,4,0))
     {
         m_message = message;
         SetTitle(message);
     }
     else

-#endif

         wxGenericFileDialog::SetMessage( message );
 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {
         wxGenericFileDialog::SetMessage( message );
 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
         if (path.empty()) return;
     if (!gtk_check_version(2,4,0))
     {
         if (path.empty()) return;


@@ -359,13 +330,11 @@ void wxFileDialog::SetPath(const wxString& path)
         gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path));
     }
     else
         gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path));
     }
     else

-#endif

         wxGenericFileDialog::SetPath( path );
 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
         wxGenericFileDialog::SetPath( path );
 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
         if (wxDirExists(dir))
     if (!gtk_check_version(2,4,0))
     {
         if (wxDirExists(dir))


@@ -374,50 +343,42 @@ void wxFileDialog::SetDirectory(const wxString& dir)
         }
     }
     else
         }
     }
     else

-#endif

         wxGenericFileDialog::SetDirectory( dir );
 }
 
 wxString wxFileDialog::GetDirectory() const
 {
         wxGenericFileDialog::SetDirectory( dir );
 }
 
 wxString wxFileDialog::GetDirectory() const
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
         return wxConvFileName->cMB2WX(
             gtk_file_chooser_get_current_folder( GTK_FILE_CHOOSER(m_widget) ) );
     else
     if (!gtk_check_version(2,4,0))
         return wxConvFileName->cMB2WX(
             gtk_file_chooser_get_current_folder( GTK_FILE_CHOOSER(m_widget) ) );
     else

-#endif

         return wxGenericFileDialog::GetDirectory();
 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
         return wxGenericFileDialog::GetDirectory();
 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
     if (!gtk_check_version(2,4,0))
     {

-        if (GetStyle() & wxSAVE)
+        if (HasFlag(wxFD_SAVE))

             gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(name));
         else
             SetPath(wxFileName(GetDirectory(), name).GetFullPath());
     }
     else
             gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(name));
         else
             SetPath(wxFileName(GetDirectory(), name).GetFullPath());
     }
     else

-#endif

         wxGenericFileDialog::SetFilename( name );
 }
 
 wxString wxFileDialog::GetFilename() const
 {
         wxGenericFileDialog::SetFilename( name );
 }
 
 wxString wxFileDialog::GetFilename() const
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
         return wxFileName(
             wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))) ).GetFullName();
     else
     if (!gtk_check_version(2,4,0))
         return wxFileName(
             wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))) ).GetFullName();
     else

-#endif

         return wxGenericFileDialog::GetFilename();
 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
         return wxGenericFileDialog::GetFilename();
 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
         // parse filters
     if (!gtk_check_version(2,4,0))
     {
         // parse filters


@@ -465,13 +426,12 @@ void wxFileDialog::SetWildcard(const wxString& wildCard)
         }
     }
     else
         }
     }
     else

-#endif

         wxGenericFileDialog::SetWildcard( wildCard );
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
         wxGenericFileDialog::SetWildcard( wildCard );
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {

-#ifdef __WXGTK24__
+

     if (!gtk_check_version(2,4,0))
     {
         gpointer filter;
     if (!gtk_check_version(2,4,0))
     {
         gpointer filter;


@@ -492,13 +452,11 @@ void wxFileDialog::SetFilterIndex(int filterIndex)
         g_slist_free(filters);
     }
     else
         g_slist_free(filters);
     }
     else

-#endif

         wxGenericFileDialog::SetFilterIndex( filterIndex );
 }
 
 int wxFileDialog::GetFilterIndex() const
 {
         wxGenericFileDialog::SetFilterIndex( filterIndex );
 }
 
 int wxFileDialog::GetFilterIndex() const
 {

-#ifdef __WXGTK24__

     if (!gtk_check_version(2,4,0))
     {
         GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
     if (!gtk_check_version(2,4,0))
     {
         GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);


@@ -516,8 +474,7 @@ int wxFileDialog::GetFilterIndex() const
             return index;
     }
     else
             return index;
     }
     else

-#endif

                 return wxGenericFileDialog::GetFilterIndex();
 }
 
                 return wxGenericFileDialog::GetFilterIndex();
 }
 

-#endif // wxUSE_FILEDLG
+#endif // wxUSE_FILEDLG &&  __WXGTK24__