Updates to memcheck

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 42278d6605501ed8e62e296fbe8d94261bf35e76..021946bb57d21bf0eb135e77cd255b765fd856e3 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -37,14 +37,14 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
        }
 
   dialog->OnOK( 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)
 
@@ -64,7 +64,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
   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;
@@ -83,7 +83,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 );
-};
+}
 
 int wxFileDialog::ShowModal(void)
 {
@@ -93,9 +93,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) );
-  };
+  }
   return ret;
-};
+}
 
 
 char *wxFileSelector(const char *title,
@@ -130,8 +130,8 @@ char *wxFileSelector(const char *title,
     return wxBuffer;
   }
   else
-    return NULL;
-};
+    return (char *) NULL;
+}
 
 char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name,
          wxWindow *parent )
@@ -146,8 +146,8 @@ char* wxLoadFileSelector(const char *what, const char *extension, const char *de
   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 )
@@ -162,6 +162,6 @@ char* wxSaveFileSelector(const char *what, const char *extension, const char *de
   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);
+}