bug in wxSplitPath() corrected: the returned file name doesn't have the

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 4d314208c57be7c5479a1fff2e7ed4265be846a5..1667ec8e07841c5f514fba8623242c9a38616314 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -42,32 +42,31 @@ bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
 //-----------------------------------------------------------------------------
 
 static
-void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dialog )
 {
-    wxFileDialog *dialog = (wxFileDialog*)data;
-    wxCommandEvent event(wxEVT_NULL);
-    int style;
+    int style = dialog->GetStyle();
 
-    style = dialog->GetStyle();
-
-    if( (style & wxSAVE ) && ( style&wxOVERWRITE_PROMPT ) )
+    if ((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT))
     {
         char *filename = gtk_file_selection_get_filename(
-                            GTK_FILE_SELECTION(dialog->m_widget)
-                         );
+                            GTK_FILE_SELECTION(dialog->m_widget) );
 
-        if(wxFileExists( filename ))
+        if (wxFileExists( filename ))
         {
             wxString msg;
-            msg.Printf(_("File '%s' already exists, do you really want to "
+            msg.Printf( _("File '%s' already exists, do you really want to "
                          "overwrite it?"), filename);
 
-            if( wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
+            if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
                 return;
         }
     }
 
-    dialog->OnOK( event );
+    dialog->SetPath( gtk_file_selection_get_filename( GTK_FILE_SELECTION(dialog->m_widget) ) );
+
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_OK);
+    event.SetEventObject( dialog );
+    dialog->GetEventHandler()->ProcessEvent( event );
 }
 
 //-----------------------------------------------------------------------------
@@ -75,11 +74,11 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 //-----------------------------------------------------------------------------
 
 static
-void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFileDialog *dialog )
 {
-    wxFileDialog *dialog = (wxFileDialog*)data;
-    wxCommandEvent event(wxEVT_NULL);
-    dialog->OnCancel( event );
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
+    event.SetEventObject( dialog );
+    dialog->GetEventHandler()->ProcessEvent( event );
 }
 
 //-----------------------------------------------------------------------------
@@ -126,22 +125,8 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
-
-}
-
-int wxFileDialog::ShowModal(void)
-{
-    int ret = wxDialog::ShowModal();
-
-    if (ret == wxID_OK)
-    {
-        m_fileName = gtk_file_selection_get_filename( GTK_FILE_SELECTION(m_widget) );
-        m_path = gtk_file_selection_get_filename( GTK_FILE_SELECTION(m_widget) );
-    }
-    return ret;
 }
 
-
 wxString wxFileSelector( const char *title,
                       const char *defaultDir, const char *defaultFileName,
                       const char *defaultExtension, const char *filter, int flags,