added an error message if a bitmap can't be addedto the image list

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index dae464b19f4b246289f3fc4dc24fd40504be1465..0af0f8a0e0511a4528bcf876d605e2788efe331a 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -2,7 +2,7 @@
 // Name:        filedlg.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        filedlg.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,151 +16,156 @@
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 

+#include "gtk/gtk.h"
+

 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
 
 void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
 
 void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {

-  wxFileDialog *dialog = (wxFileDialog*)data;
-  wxCommandEvent event(wxEVT_NULL);
-  int style;
+    wxFileDialog *dialog = (wxFileDialog*)data;
+    wxCommandEvent event(wxEVT_NULL);
+    int style;

 
 

-  style=dialog->GetStyle();
+    style = dialog->GetStyle();

 
 

-  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)
                return;
        }
          if(wxMessageBox(_("File exists. Overwrite?"),
                          _("Confirm"), wxYES_NO) != wxYES)
                return;
        }

+    }

 
 

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

 }
 
 void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
 }
 
 void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {

-  wxFileDialog *dialog = (wxFileDialog*)data;
-  wxCommandEvent event(wxEVT_NULL);
-  dialog->OnCancel( event );
+    wxFileDialog *dialog = (wxFileDialog*)data;
+    wxCommandEvent event(wxEVT_NULL);
+    dialog->OnCancel( event );

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

-wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
-        const wxString& defaultDir, const wxString& defaultFileName,
-  const wxString& wildCard,
-        long style, const wxPoint& pos )
+wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
+                            const wxString& defaultDir, const wxString& defaultFileName,
+                            const wxString& wildCard,
+                            long style, const wxPoint& pos )

 {
 {

-  m_needParent = FALSE;
-
-  PreCreation( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, "filedialog" );
-  m_message = message;
-  m_path = "";
-  m_fileName = defaultFileName;
-  m_dir = defaultDir;
-  m_wildCard = wildCard;
-  m_dialogStyle = style;
-  m_filterIndex = 1;
-
-  m_widget = gtk_file_selection_new( m_message );
+    m_needParent = FALSE;
+
+    PreCreation( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, "filedialog" );
+    m_message = message;
+    m_path = "";
+    m_fileName = defaultFileName;
+    m_dir = defaultDir;
+    m_wildCard = wildCard;
+    m_dialogStyle = style;
+    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);

 
 

-  m_path.Append(m_dir);
-  if(! m_path.IsEmpty() && m_path.Last()!='/') m_path.Append('/');
-  m_path.Append(m_fileName);
+    m_path.Append(m_dir);
+    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);
+    if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path);

 
 

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

 
 

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

-  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;
+    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,
-                     const char *defaultDir, const char *defaultFileName,
-                     const char *defaultExtension, const char *filter, int flags,
-                     wxWindow *parent, int x, int y)
+char *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("");
-  if ( defaultExtension && !filter )
-    filter2 = wxString("*.") + wxString(defaultExtension) ;
-  else if ( filter )
-    filter2 = filter;
-
-  wxString defaultDirString;
-  if (defaultDir)
-    defaultDirString = defaultDir;
-  else
-    defaultDirString = "";
-
-  wxString defaultFilenameString;
-  if (defaultFileName)
-    defaultFilenameString = defaultFileName;
-  else
-    defaultFilenameString = "";
-
-  wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString,
-    filter2, flags, wxPoint(x, y));
-
-  if ( fileDialog.ShowModal() == wxID_OK )
-  {
-    strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-    return wxBuffer;
-  }
-  else
-    return (char *) NULL;
+    wxString filter2("");
+    if ( defaultExtension && !filter )
+        filter2 = wxString("*.") + wxString(defaultExtension) ;
+    else if ( filter )
+        filter2 = filter;
+
+    wxString defaultDirString;
+    if (defaultDir)
+        defaultDirString = defaultDir;
+    else
+        defaultDirString = "";
+
+    wxString defaultFilenameString;
+    if (defaultFileName)
+        defaultFilenameString = defaultFileName;
+    else
+        defaultFilenameString = "";
+ 
+    wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
+
+    if ( fileDialog.ShowModal() == wxID_OK )
+    {
+        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
+        return wxBuffer;
+    }
+    else
+    {
+        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 )

 {
 {

-  char *ext = (char *)extension;
+    char *ext = (char *)extension;

 
 

-  char prompt[50];
-  wxString str = _("Load %s file");
-  sprintf(prompt, str, what);
+    char prompt[50];
+    wxString str = _("Load %s file");
+    sprintf(prompt, str, what);

 
 

-  if (*ext == '.') ext++;
-  char wild[60];
-  sprintf(wild, "*.%s", ext);
+    if (*ext == '.') ext++;
+    char wild[60];
+    sprintf(wild, "*.%s", ext);

 
 

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

-  char *ext = (char *)extension;
+    char *ext = (char *)extension;

 
 

-  char prompt[50];
-  wxString str = _("Save %s file");
-  sprintf(prompt, str, what);
+    char prompt[50];
+    wxString str = _("Save %s file");
+    sprintf(prompt, str, what);

 
 

-  if (*ext == '.') ext++;
-  char wild[60];
-  sprintf(wild, "*.%s", ext);
+    if (*ext == '.') ext++;
+    char wild[60];
+    sprintf(wild, "*.%s", ext);

 
 

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

 }
 
 }