remove the line for image.h, restore a line commented out by mistake

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index a555c487be690e69fb588ad69ab7e1d5674199a8..df42cb90a1aa00d98aaeb662e16017b9d41c9880 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -2,9 +2,8 @@
 // Name:        filedlg.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        filedlg.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -31,19 +30,20 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 
   if((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT))
        if(wxFileExists(gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog->m_widget) ))) {
 
   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)
+         if(wxMessageBox(_("File exists. Overwrite?"),
+                         _("Confirm"), wxYES_NO) != wxYES)

                return;
        }
 
                return;
        }
 

-  dialog->OnOk( event );
-};
+  dialog->OnOK( event );
+}

 
 void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
   wxFileDialog *dialog = (wxFileDialog*)data;
   wxCommandEvent event(wxEVT_NULL);
   dialog->OnCancel( event );
 
 void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
   wxFileDialog *dialog = (wxFileDialog*)data;
   wxCommandEvent event(wxEVT_NULL);
   dialog->OnCancel( event );

-};
+}

 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
 


@@ -63,7 +63,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
   m_dialogStyle = style;
   m_filterIndex = 1;
 
   m_dialogStyle = style;
   m_filterIndex = 1;
 

-  m_widget = gtk_file_selection_new( "File selection" );
+  m_widget = gtk_file_selection_new( m_message );

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


@@ -82,7 +82,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 
   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 );

-};
+}

 
 int wxFileDialog::ShowModal(void)
 {
 
 int wxFileDialog::ShowModal(void)
 {


@@ -92,9 +92,9 @@ int wxFileDialog::ShowModal(void)
   {
     m_fileName = gtk_file_selection_get_filename( GTK_FILE_SELECTION(m_widget) );
     m_path = gtk_file_selection_get_filename( GTK_FILE_SELECTION(m_widget) );
   {
     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;
   return ret;

-};
+}

 
 
 char *wxFileSelector(const char *title,
 
 
 char *wxFileSelector(const char *title,


@@ -129,8 +129,8 @@ char *wxFileSelector(const char *title,
     return wxBuffer;
   }
   else
     return wxBuffer;
   }
   else

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

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


@@ -145,8 +145,8 @@ char* wxLoadFileSelector(const char *what, const char *extension, const char *de
   char wild[60];
   sprintf(wild, "*.%s", ext);
 
   char wild[60];
   sprintf(wild, "*.%s", ext);
 

-  return wxFileSelector (prompt, 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,
          wxWindow *parent )
 
 char* wxSaveFileSelector(const char *what, const char *extension, const char *default_name,
          wxWindow *parent )


@@ -161,9 +161,6 @@ char* wxSaveFileSelector(const char *what, const char *extension, const char *de
   char wild[60];
   sprintf(wild, "*.%s", ext);
 
   char wild[60];
   sprintf(wild, "*.%s", ext);
 

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