Here it comes:

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index f33c3423c70cfbe90cf6768fede60f3dc6182982..b4d52f4db1f51958b88a180d1a48fee17879de0a 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -19,37 +19,81 @@
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------

-// wxFileDialog
+// "delete_event"
+//-----------------------------------------------------------------------------
+
+static
+bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
+{
+/*
+    printf( "OnDelete from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        printf( win->GetClassInfo()->GetClassName() );
+    printf( ".\n" );
+*/
+
+    win->Close();
+
+    return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// "clicked" for OK-button

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

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

 
 

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

 }
 
 }
 

-void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+//-----------------------------------------------------------------------------
+// "clicked" for Cancel-button
+//-----------------------------------------------------------------------------
+
+static
+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 );

 }
 
 }
 

+//-----------------------------------------------------------------------------
+// wxFileDialog
+//-----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
 
 wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
 
 wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,


@@ -69,15 +113,17 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
     m_filterIndex = 1;
 
     m_widget = gtk_file_selection_new( m_message );
     m_filterIndex = 1;
 
     m_widget = gtk_file_selection_new( m_message );

-  
+

     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()!='/' )
+        m_path.Append('/');

     m_path.Append(m_fileName);
 
     if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path);
     m_path.Append(m_fileName);
 
     if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path);


@@ -85,29 +131,41 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
     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 ), _("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 );

+      
+    // strange way to internationalize
+    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), _("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,
                       wxWindow *parent, int x, int y )
 {
 
 wxString wxFileSelector( const char *title,
                       const char *defaultDir, const char *defaultFileName,
                       const char *defaultExtension, const char *filter, int flags,
                       wxWindow *parent, int x, int y )
 {

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

     if ( defaultExtension && !filter )
         filter2 = wxString("*.") + wxString(defaultExtension) ;
     else if ( filter )
     if ( defaultExtension && !filter )
         filter2 = wxString("*.") + wxString(defaultExtension) ;
     else if ( filter )


@@ -116,15 +174,11 @@ wxString wxFileSelector( const char *title,
     wxString defaultDirString;
     if (defaultDir)
         defaultDirString = defaultDir;
     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 )