Solaris compilation patches

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 0af0f8a0e0511a4528bcf876d605e2788efe331a..fce41fad7e20fe7fdb5e89e69b04122b18cfbe23 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -19,37 +19,72 @@
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------

-// wxFileDialog
+// "delete_event"

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

-void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+static
+bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )

 {
 {

-    wxFileDialog *dialog = (wxFileDialog*)data;
-    wxCommandEvent event(wxEVT_NULL);
-    int style;
+/*
+    printf( "OnDelete from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        printf( win->GetClassInfo()->GetClassName() );
+    printf( ".\n" );
+*/
+
+    win->Close();
+
+    return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// "clicked" for OK-button
+//-----------------------------------------------------------------------------

 
 

-    style = dialog->GetStyle();
+static
+void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dialog )
+{
+    int style = dialog->GetStyle();

 
 

-    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;
-       }
+        char *filename = gtk_file_selection_get_filename(
+                            GTK_FILE_SELECTION(dialog->m_widget) );
+
+        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;
+        }

     }
 
     }
 

-    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 );

 }
 
 }
 

-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,12 +104,13 @@ 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);
     if(! m_path.IsEmpty() && m_path.Last()!='/') m_path.Append('/');
 
     m_path.Append(m_dir);
     if(! m_path.IsEmpty() && m_path.Last()!='/') m_path.Append('/');


@@ -85,24 +121,20 @@ 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)
-{
-    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;
-}
-
-
-char *wxFileSelector( const char *title,
+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 )
                       const char *defaultDir, const char *defaultFileName,
                       const char *defaultExtension, const char *filter, int flags,
                       wxWindow *parent, int x, int y )


@@ -124,21 +156,20 @@ char *wxFileSelector( const char *title,
         defaultFilenameString = defaultFileName;
     else
         defaultFilenameString = "";
         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 )
     {

-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
+        return fileDialog.GetPath();

     }
     else
     {
     }
     else
     {

-        return (char *) NULL;
+        return wxEmptyString;

     }
 }
 
     }
 }
 

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

 {
     char *ext = (char *)extension;
 
 {
     char *ext = (char *)extension;
 


@@ -153,7 +184,7 @@ char* wxLoadFileSelector( const char *what, const char *extension, const char *d
     return wxFileSelector (prompt, (const char *) NULL, default_name, ext, wild, 0, parent);
 }
 
     return wxFileSelector (prompt, (const char *) NULL, default_name, ext, wild, 0, parent);
 }
 

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

          wxWindow *parent )
 {
     char *ext = (char *)extension;
          wxWindow *parent )
 {
     char *ext = (char *)extension;