missing commit

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index b28750152af75c763e54c2b2c75fef3d8b1e5708..efebaebf2a3dd693737a82b6c6a535560f45495b 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -1,186 +1,132 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/filedlg.cpp
-// Purpose:
-// Author:      Robert Roebling
+// Name:        src/gtk1/filedlg.cpp
+// Purpose:     native implementation of wxFileDialog
+// Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp

 // Id:          $Id$
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling
+// Copyright:   (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp

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

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

 
 

-#include "wx/filedlg.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/generic/msgdlgg.h"
-
-#include <gtk/gtk.h>
+#if wxUSE_FILEDLG

 
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#include "wx/filedlg.h"
+#include "wx/modalhook.h"

 
 

-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;

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

-// "delete_event"
+// wxFileDialog

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

-static
-bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
+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 )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-    win->Close();
-
-    return TRUE;
+        wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name );

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// "clicked" for OK-button
-//-----------------------------------------------------------------------------
-
-static
-void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dialog )
+wxFileDialog::~wxFileDialog()

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    int style = dialog->GetStyle();
-
-    GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
-    char *filename = gtk_file_selection_get_filename(filedlg);
-
-    if ( (style & wxSAVE) && ( style & wxOVERWRITE_PROMPT ) )
-    {
-        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;
-        }
-    }
-    else if ( (style & wxOPEN) && ( style & wxFILE_MUST_EXIST) )
-    {
-        if ( !wxFileExists( filename ) )
-        {
-            wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK);
-
-            return;
-        }
-    }
-
-    // change to the directory where the user went if asked
-    if ( style & wxCHANGE_DIR )
-    {
-        wxString cwd;
-        wxSplitPath(filename, &cwd, NULL, NULL);
-
-        if ( cwd != wxGetWorkingDirectory() )
-        {
-            wxSetWorkingDirectory(cwd);
-        }
-    }
-
-    dialog->SetPath( filename );
-
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-    event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// "clicked" for Cancel-button
-//-----------------------------------------------------------------------------
+void wxFileDialog::OnFakeOk( wxCommandEvent &event )
+{
+    wxGenericFileDialog::OnOk( event );
+}

 
 

-static
-void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFileDialog *dialog )
+int wxFileDialog::ShowModal()

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    WX_HOOK_MODAL_DIALOG();

 
 

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
+    return wxGenericFileDialog::ShowModal();

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// wxFileDialog
-//-----------------------------------------------------------------------------
+bool wxFileDialog::Show( bool show )
+{
+    return wxGenericFileDialog::Show( show );
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)
+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 );
+}

 
 

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

 {
 {

-    m_needParent = FALSE;
+    return wxGenericFileDialog::GetPath();
+}

 
 

-    if (!PreCreation( parent, pos, wxDefaultSize ) ||
-        !CreateBase( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, wxDefaultValidator, wxT("filedialog") ))
-    {
-        wxFAIL_MSG( wxT("wxXX creation failed") );
-        return;
-    }
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+    wxGenericFileDialog::GetFilenames( files );
+}

 
 

-    m_widget = gtk_file_selection_new( m_message.mbc_str() );
+void wxFileDialog::GetPaths(wxArrayString& paths) const
+{
+    wxGenericFileDialog::GetPaths( paths );
+}

 
 

-    int x = (gdk_screen_width () - 400) / 2;
-    int y = (gdk_screen_height () - 400) / 2;
-    gtk_widget_set_uposition( m_widget, x, y );
+void wxFileDialog::SetMessage(const wxString& message)
+{
+    wxGenericFileDialog::SetMessage( message );
+}

 
 

-    GtkFileSelection *sel = GTK_FILE_SELECTION(m_widget);
-    gtk_file_selection_hide_fileop_buttons( sel ); // they don't work anyway
+void wxFileDialog::SetPath(const wxString& path)
+{
+    wxGenericFileDialog::SetPath( path );
+}

 
 

-    m_path.Append(m_dir);
-    if( ! m_path.IsEmpty() && m_path.Last()!=wxT('/') )
-        m_path.Append('/');
-    m_path.Append(m_fileName);
+void wxFileDialog::SetDirectory(const wxString& dir)
+{
+    wxGenericFileDialog::SetDirectory( dir );
+}

 
 

-    if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path.mbc_str());
+wxString wxFileDialog::GetDirectory() const
+{
+    return wxGenericFileDialog::GetDirectory();
+}

 
 

-    gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
-      GTK_SIGNAL_FUNC(gtk_filedialog_ok_callback), (gpointer*)this );
+void wxFileDialog::SetFilename(const wxString& name)
+{

 
 

-    // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConvCurrent->cWX2MB(_("OK")) );
+    wxGenericFileDialog::SetFilename( name );
+}

 
 

-    gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
-      GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
+wxString wxFileDialog::GetFilename() const
+{
+    return wxGenericFileDialog::GetFilename();
+}

 
 

-    // strange way to internationalize
-    gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) );
+void wxFileDialog::SetWildcard(const wxString& wildCard)
+{
+    wxGenericFileDialog::SetWildcard( wildCard );
+}

 
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-        GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
+void wxFileDialog::SetFilterIndex(int filterIndex)
+{
+    wxGenericFileDialog::SetFilterIndex( filterIndex );

 }
 
 }
 

-void wxFileDialog::SetPath(const wxString& path)
+int wxFileDialog::GetFilterIndex() const

 {
 {

-    // not only set the full path but also update filename and dir
-    m_path = path;
-    if ( !!path )
-    {
-        wxString ext;
-        wxSplitPath(path, &m_dir, &m_fileName, &ext);
-        if (!ext.IsEmpty())
-        {
-            m_fileName += wxT(".");
-            m_fileName += ext;
-        }
-    }
+    return wxGenericFileDialog::GetFilterIndex();

 }
 
 }
 

+#endif // wxUSE_FILEDLG