Oh well, I'll just stuff in the rest of the Unicode changes I have made

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 4d314208c57be7c5479a1fff2e7ed4265be846a5..b4d52f4db1f51958b88a180d1a48fee17879de0a 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -42,32 +42,40 @@ bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
 //-----------------------------------------------------------------------------
 
 static
 //-----------------------------------------------------------------------------
 
 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();
+    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 ) )

     {
     {

-        char *filename = gtk_file_selection_get_filename(
-                            GTK_FILE_SELECTION(dialog->m_widget)
-                         );
-
-        if(wxFileExists( filename ))
+        if (wxFileExists( filename ))

         {
             wxString msg;
         {
             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);
 
                          "overwrite it?"), filename);
 

-            if( wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
+            if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)

                 return;
         }
     }
                 return;
         }
     }

+    else if ( (style & wxOPEN) && ( style & wxFILE_MUST_EXIST) )
+    {
+        if ( !wxFileExists( filename ) )
+        {
+            wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK);
+
+            return;
+        }
+    }
+
+    dialog->SetPath( filename );

 
 

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

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


@@ -75,11 +83,11 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 //-----------------------------------------------------------------------------
 
 static
 //-----------------------------------------------------------------------------
 
 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 );

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


@@ -111,9 +119,11 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
     gtk_widget_set_uposition( m_widget, x, y );
 
     GtkFileSelection *sel = GTK_FILE_SELECTION(m_widget);
     gtk_widget_set_uposition( m_widget, x, y );
 
     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);


@@ -121,33 +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 );
     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 )


@@ -156,14 +174,10 @@ 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) );
 
 
     wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );