More for wxPython 2.0b9 (hopefully the last...)

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index a3e60fe420ebcf84c2d433f28ba6d05fa5f66b88..bd7d405395ecd6d1b15850e71d894a0af274ca0e 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -18,20 +18,29 @@
 
 #include "gtk/gtk.h"
 
 
 #include "gtk/gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------
 

-static 
+static

 bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 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())
         printf( win->GetClassInfo()->GetClassName() );
     printf( ".\n" );
 */
 /*
     printf( "OnDelete from " );
     if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
         printf( win->GetClassInfo()->GetClassName() );
     printf( ".\n" );
 */

-  
+

     win->Close();
 
     return TRUE;
     win->Close();
 
     return TRUE;


@@ -41,38 +50,57 @@ bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 

-static 
-void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+static
+void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dialog )

 {
 {

-    wxFileDialog *dialog = (wxFileDialog*)data;
-    wxCommandEvent event(wxEVT_NULL);
-    int style;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    int style = dialog->GetStyle();

 
 

-    style = dialog->GetStyle();
+    GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
+    char *filename = gtk_file_selection_get_filename(filedlg);

 
 

-    if((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT))
+    if ( (style & wxSAVE) && ( style & wxOVERWRITE_PROMPT ) )
+    {
+        if (wxFileExists( filename ))
+        {
+            wxString msg;
+            msg.Printf( _("File '%s' already exists, do you really want to "
+                         "overwrite it?"), filename);
+
+            if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
+                return;
+        }
+    }
+    else if ( (style & wxOPEN) && ( style & wxFILE_MUST_EXIST) )

     {
     {

-       if(wxFileExists(gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog->m_widget) ))) 
-       {
-         if(wxMessageBox(_("File exists. Overwrite?"),
-                         _("Confirm"), wxYES_NO) != wxYES)
-               return;
-       }
+        if ( !wxFileExists( filename ) )
+        {
+            wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK);
+
+            return;
+        }

     }
 
     }
 

-    dialog->OnOK( event );
+    dialog->SetPath( filename );
+
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
+    event.SetEventObject( dialog );
+    dialog->GetEventHandler()->ProcessEvent( event );

 }
 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button
 //-----------------------------------------------------------------------------
 

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

 {
 {

-    wxFileDialog *dialog = (wxFileDialog*)data;
-    wxCommandEvent event(wxEVT_NULL);
-    dialog->OnCancel( event );
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+    event.SetEventObject( dialog );
+    dialog->GetEventHandler()->ProcessEvent( event );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -90,74 +118,80 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
 
     PreCreation( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, "filedialog" );
     m_message = message;
 
     PreCreation( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, "filedialog" );
     m_message = message;

-    m_path = "";
+    m_path = _T("");

     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;
     m_dialogStyle = style;
     m_filterIndex = 1;
 
     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;
     m_dialogStyle = style;
     m_filterIndex = 1;
 

-    m_widget = gtk_file_selection_new( m_message );
-  
+    m_widget = gtk_file_selection_new( m_message.mbc_str() );
+

     int x = (gdk_screen_width () - 400) / 2;
     int y = (gdk_screen_height () - 400) / 2;
     gtk_widget_set_uposition( m_widget, x, y );
     int x = (gdk_screen_width () - 400) / 2;
     int y = (gdk_screen_height () - 400) / 2;
     gtk_widget_set_uposition( m_widget, x, y );

-  
+

     GtkFileSelection *sel = GTK_FILE_SELECTION(m_widget);
     GtkFileSelection *sel = GTK_FILE_SELECTION(m_widget);

+    gtk_file_selection_hide_fileop_buttons( sel ); // they don't work anyway

 
     m_path.Append(m_dir);
 
     m_path.Append(m_dir);

-    if(! m_path.IsEmpty() && m_path.Last()!='/') m_path.Append('/');
+    if( ! m_path.IsEmpty() && m_path.Last()!=_T('/') )
+        m_path.Append('/');

     m_path.Append(m_fileName);
 
     m_path.Append(m_fileName);
 

-    if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path);
+    if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path.mbc_str());

 
     gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_filedialog_ok_callback), (gpointer*)this );
 
 
     gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
       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_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
     gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );

-
-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", 
-        GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
+      
+    // strange way to internationalize
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConv_current->cWX2MB(_("Cancel")) );

     
     

+    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
+        GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );

 }
 
 }
 

-int wxFileDialog::ShowModal(void)
+void wxFileDialog::SetPath(const wxString& path)

 {
 {

-    int ret = wxDialog::ShowModal();
-
-    if (ret == wxID_OK)
+    // not only set the full path but also update filename and dir
+    m_path = path;
+    if ( !!path )

     {
     {

-        m_fileName = gtk_file_selection_get_filename( GTK_FILE_SELECTION(m_widget) );
-        m_path = gtk_file_selection_get_filename( GTK_FILE_SELECTION(m_widget) );
+        wxString ext;
+        wxSplitPath(path, &m_dir, &m_fileName, &ext);
+        m_fileName += ext;

     }
     }

-    return ret;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------

 
 

-wxString wxFileSelector( const char *title,
-                      const char *defaultDir, const char *defaultFileName,
-                      const char *defaultExtension, const char *filter, int flags,
+wxString wxFileSelector( const wxChar *title,
+                      const wxChar *defaultDir, const wxChar *defaultFileName,
+                      const wxChar *defaultExtension, const wxChar *filter, int flags,

                       wxWindow *parent, int x, int y )
 {
                       wxWindow *parent, int x, int y )
 {

-    wxString filter2("");
+    wxString filter2;

     if ( defaultExtension && !filter )
     if ( defaultExtension && !filter )

-        filter2 = wxString("*.") + wxString(defaultExtension) ;
+        filter2 = wxString(_T("*.")) + wxString(defaultExtension) ;

     else if ( filter )
         filter2 = filter;
 
     wxString defaultDirString;
     if (defaultDir)
         defaultDirString = defaultDir;
     else if ( filter )
         filter2 = filter;
 
     wxString defaultDirString;
     if (defaultDir)
         defaultDirString = defaultDir;

-    else
-        defaultDirString = "";

 
     wxString defaultFilenameString;
     if (defaultFileName)
         defaultFilenameString = defaultFileName;
 
     wxString defaultFilenameString;
     if (defaultFileName)
         defaultFilenameString = defaultFileName;

-    else
-        defaultFilenameString = "";
- 
+

     wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
 
     if ( fileDialog.ShowModal() == wxID_OK )
     wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
 
     if ( fileDialog.ShowModal() == wxID_OK )


@@ -170,34 +204,34 @@ wxString wxFileSelector( const char *title,
     }
 }
 
     }
 }
 

-wxString wxLoadFileSelector( const char *what, const char *extension, const char *default_name, wxWindow *parent )
+wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent )

 {
 {

-    char *ext = (char *)extension;
+    wxChar *ext = (wxChar *)extension;

 
 

-    char prompt[50];
+    wxChar prompt[50];

     wxString str = _("Load %s file");
     wxString str = _("Load %s file");

-    sprintf(prompt, str, what);
+    wxSprintf(prompt, str, what);

 
 

-    if (*ext == '.') ext++;
-    char wild[60];
-    sprintf(wild, "*.%s", ext);
+    if (*ext == _T('.')) ext++;
+    wxChar wild[60];
+    wxSprintf(wild, _T("*.%s"), ext);

 
 

-    return wxFileSelector (prompt, (const char *) NULL, default_name, ext, wild, 0, parent);
+    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);

 }
 
 }
 

-wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name,
+wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,

          wxWindow *parent )
 {
          wxWindow *parent )
 {

-    char *ext = (char *)extension;
+    wxChar *ext = (wxChar *)extension;

 
 

-    char prompt[50];
+    wxChar prompt[50];

     wxString str = _("Save %s file");
     wxString str = _("Save %s file");

-    sprintf(prompt, str, what);
+    wxSprintf(prompt, str, what);

 
 

-    if (*ext == '.') ext++;
-    char wild[60];
-    sprintf(wild, "*.%s", ext);
+    if (*ext == _T('.')) ext++;
+    wxChar wild[60];
+    wxSprintf(wild, _T("*.%s"), ext);

 
 

-    return wxFileSelector (prompt, (const char *) NULL, default_name, ext, wild, 0, parent);
+    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);

 }
 
 }