X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed9b9841b32afa2e97353263e3563b4387e2fe0e..196cc38b26fb577274d307ba664dbc5a3196f301:/src/gtk1/filedlg.cpp

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index fa6d087c99..946ae917c4 100644
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filedlg.cpp
+// Name:        gtk/filedlg.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -16,7 +16,15 @@
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 
-#include "gtk/gtk.h"
+
+#include <gtk/gtk.h>
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
 // "delete_event"
@@ -25,6 +33,8 @@
 static
 bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
 /*
     printf( "OnDelete from " );
     if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
@@ -44,6 +54,8 @@ bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
 static
 void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dialog )
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     int style = dialog->GetStyle();
 
     GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
@@ -71,6 +83,18 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dial
         }
     }
 
+    // change to the directory where the user went if asked
+    if ( style & wxCHANGE_DIR )
+    {
+        wxString cwd;
+        wxSplitPath(filename, &cwd, NULL, NULL);
+
+        if ( cwd != wxGetWorkingDirectory() )
+        {
+            wxSetWorkingDirectory(cwd);
+        }
+    }
+
     dialog->SetPath( filename );
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
@@ -85,6 +109,8 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dial
 static
 void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFileDialog *dialog )
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject( dialog );
     dialog->GetEventHandler()->ProcessEvent( event );
@@ -103,9 +129,15 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
 {
     m_needParent = FALSE;
 
-    PreCreation( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, "filedialog" );
+    if (!PreCreation( parent, pos, wxDefaultSize ) ||
+        !CreateBase( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, wxDefaultValidator, wxT("filedialog") ))
+    {
+        wxFAIL_MSG( wxT("wxXX creation failed") );
+        return;
+    }
+
     m_message = message;
-    m_path = _T("");
+    m_path = wxT("");
     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;
@@ -122,7 +154,7 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
     gtk_file_selection_hide_fileop_buttons( sel ); // they don't work anyway
 
     m_path.Append(m_dir);
-    if( ! m_path.IsEmpty() && m_path.Last()!=_T('/') )
+    if( ! m_path.IsEmpty() && m_path.Last()!=wxT('/') )
         m_path.Append('/');
     m_path.Append(m_fileName);
 
@@ -132,14 +164,14 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
       GTK_SIGNAL_FUNC(gtk_filedialog_ok_callback), (gpointer*)this );
 
     // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConv_current->cWX2MB(_("OK")) );
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConvCurrent->cWX2MB(_("OK")) );
 
     gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
-      
+
     // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConv_current->cWX2MB(_("Cancel")) );
-    
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) );
+
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
 }
@@ -152,7 +184,11 @@ void wxFileDialog::SetPath(const wxString& path)
     {
         wxString ext;
         wxSplitPath(path, &m_dir, &m_fileName, &ext);
-        m_fileName += ext;
+        if (!ext.IsEmpty())
+        {
+            m_fileName += wxT(".");
+            m_fileName += ext;
+        }
     }
 }
 
@@ -160,6 +196,21 @@ void wxFileDialog::SetPath(const wxString& path)
 // global functions
 // ----------------------------------------------------------------------------
 
+wxString
+wxFileSelectorEx(const wxChar *message,
+                 const wxChar *default_path,
+                 const wxChar *default_filename,
+                 int *indexDefaultExtension,
+                 const wxChar *wildcard,
+                 int flags,
+                 wxWindow *parent,
+                 int x, int y)
+{
+    // TODO: implement this somehow
+    return wxFileSelector(message, default_path, default_filename, wxT(""),
+                          wildcard, flags, parent, x, y);
+}
+
 wxString wxFileSelector( const wxChar *title,
                       const wxChar *defaultDir, const wxChar *defaultFileName,
                       const wxChar *defaultExtension, const wxChar *filter, int flags,
@@ -167,7 +218,7 @@ wxString wxFileSelector( const wxChar *title,
 {
     wxString filter2;
     if ( defaultExtension && !filter )
-        filter2 = wxString(_T("*.")) + wxString(defaultExtension) ;
+        filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;
     else if ( filter )
         filter2 = filter;
 
@@ -195,15 +246,15 @@ wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const
 {
     wxChar *ext = (wxChar *)extension;
 
-    wxChar prompt[50];
-    wxString str = _("Load %s file");
-    wxSprintf(prompt, str, what);
+    wxString prompt = wxString::Format(_("Load %s file"), what);
+
+    if (*ext == wxT('.'))
+        ext++;
 
-    if (*ext == _T('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, _T("*.%s"), ext);
+    wxString wild = wxString::Format(_T("*.%s"), ext);
 
-    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+    return wxFileSelector(prompt, (const wxChar *) NULL, default_name,
+                          ext, wild, 0, parent);
 }
 
 wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,
@@ -211,14 +262,14 @@ wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const w
 {
     wxChar *ext = (wxChar *)extension;
 
-    wxChar prompt[50];
-    wxString str = _("Save %s file");
-    wxSprintf(prompt, str, what);
+    wxString prompt = wxString::Format(_("Save %s file"), what);
+
+    if (*ext == wxT('.'))
+        ext++;
 
-    if (*ext == _T('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, _T("*.%s"), ext);
+    wxString wild = wxString::Format(_T("*.%s"), ext);
 
-    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+    return wxFileSelector(prompt, (const wxChar *) NULL, default_name,
+                          ext, wild, 0, parent);
 }