don't lose the contents of the combobox if it was set to a value not in a list and...

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 1f16d2d1cdc69a9438b0873acb51347d06226f20..3827fd1b3d2917bc52aedaf80736860bdd647027 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -1,146 +1,129 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Name:        src/gtk1/filedlg.cpp
+// Purpose:     native implementation of wxFileDialog
+// Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "filedlg.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_FILEDLG

 
 #include "wx/filedlg.h"
 
 #include "wx/filedlg.h"

-#include "wx/utils.h"
-#include "wx/intl.h"
+

 
 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
 

-void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxGenericFileDialog)
+
+BEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog)
+    EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk)
+END_EVENT_TABLE()
+
+wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
+                           const wxString& defaultDir,
+                           const wxString& defaultFileName,
+                           const wxString& wildCard,
+                           long style, const wxPoint& pos,
+                           const wxSize& sz,
+                           const wxString& name)
+    : wxGenericFileDialog(parent, message, defaultDir, defaultFileName,
+                       wildCard, style, pos, sz, name, true )

 {
 {

-  wxFileDialog *dialog = (wxFileDialog*)data;
-  wxCommandEvent event(0);
-  dialog->OnOk( event );
-};
+        wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name );
+}

 
 

-void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+wxFileDialog::~wxFileDialog()

 {
 {

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

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
+void wxFileDialog::OnFakeOk( wxCommandEvent &event )
+{
+    wxGenericFileDialog::OnOk( event );
+}

 
 

-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, "filedialog" );
-  m_message = message;
-  m_path = "";
-  m_fileName = defaultFileName;
-  m_dir = defaultDir;
-  m_wildCard = wildCard;
-  m_filterIndex = 1;
-  
-  m_widget = gtk_file_selection_new( "File selection" );
-  
-  GtkFileSelection *sel = GTK_FILE_SELECTION(m_widget);
-  
-  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 );
-};
-
-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,
-                     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 NULL;
-};
-
-char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name, 
-         wxWindow *parent )
-{
-  char *ext = (char *)extension;
-  
-  char prompt[50];
-  wxString str = _("Load %s file");
-  sprintf(prompt, str, what);
-
-  if (*ext == '.') ext++;
-  char wild[60];
-  sprintf(wild, "*.%s", ext);
-
-  return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
-};
-
-char* wxSaveFileSelector(const char *what, const char *extension, const char *default_name, 
-         wxWindow *parent )
-{
-  char *ext = (char *)extension;
-  
-  char prompt[50];
-  wxString str = _("Save %s file");
-  sprintf(prompt, str, what);
-
-  if (*ext == '.') ext++;
-  char wild[60];
-  sprintf(wild, "*.%s", ext);
-
-  return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
-};
+int wxFileDialog::ShowModal()
+{
+    return wxGenericFileDialog::ShowModal();
+}
+
+bool wxFileDialog::Show( bool show )
+{
+    return wxGenericFileDialog::Show( show );
+}
+
+void wxFileDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags )
+{
+    if (!m_wxwindow)
+        return;
+    else
+        wxGenericFileDialog::DoSetSize( x, y, width, height, sizeFlags );
+}
+
+wxString wxFileDialog::GetPath() const
+{
+    return wxGenericFileDialog::GetPath();
+}
+
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+    wxGenericFileDialog::GetFilenames( files );
+}
+
+void wxFileDialog::GetPaths(wxArrayString& paths) const
+{
+    wxGenericFileDialog::GetPaths( paths );
+}

 
 

+void wxFileDialog::SetMessage(const wxString& message)
+{
+    wxGenericFileDialog::SetMessage( message );
+}

 
 

+void wxFileDialog::SetPath(const wxString& path)
+{
+    wxGenericFileDialog::SetPath( path );
+}
+
+void wxFileDialog::SetDirectory(const wxString& dir)
+{
+    wxGenericFileDialog::SetDirectory( dir );
+}
+
+wxString wxFileDialog::GetDirectory() const
+{
+    return wxGenericFileDialog::GetDirectory();
+}
+
+void wxFileDialog::SetFilename(const wxString& name)
+{

 
 

+    wxGenericFileDialog::SetFilename( name );
+}
+
+wxString wxFileDialog::GetFilename() const
+{
+    return wxGenericFileDialog::GetFilename();
+}
+
+void wxFileDialog::SetWildcard(const wxString& wildCard)
+{
+    wxGenericFileDialog::SetWildcard( wildCard );
+}
+
+void wxFileDialog::SetFilterIndex(int filterIndex)
+{
+    wxGenericFileDialog::SetFilterIndex( filterIndex );
+}
+
+int wxFileDialog::GetFilterIndex() const
+{
+    return wxGenericFileDialog::GetFilterIndex();
+}

 
 

+#endif // wxUSE_FILEDLG