Really fix hit testing in the generic wxDataViewToggleRenderer.

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 4d314208c57be7c5479a1fff2e7ed4265be846a5..59f8824386cee798d7be064e48b154a8f236a7fa 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -1,210 +1,132 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        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"
+
+#if wxUSE_FILEDLG

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

-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/generic/msgdlgg.h"
+#include "wx/testing.h"

 
 

-#include "gtk/gtk.h"

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

-// "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 )

 {
 {

-/*
-    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), gpointer data )
+wxFileDialog::~wxFileDialog()

 {
 {

-    wxFileDialog *dialog = (wxFileDialog*)data;
-    wxCommandEvent event(wxEVT_NULL);
-    int style;
-
-    style = dialog->GetStyle();
-
-    if( (style & wxSAVE ) && ( style&wxOVERWRITE_PROMPT ) )
-    {
-        char *filename = gtk_file_selection_get_filename(
-                            GTK_FILE_SELECTION(dialog->m_widget)
-                         );
-
-        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;
-        }
-    }
-
-    dialog->OnOK( event );

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// "clicked" for Cancel-button
-//-----------------------------------------------------------------------------
-
-static
-void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+void wxFileDialog::OnFakeOk( wxCommandEvent &event )

 {
 {

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

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// wxFileDialog
-//-----------------------------------------------------------------------------
-
-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 )
+int wxFileDialog::ShowModal()

 {
 {

-    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 );
-
-    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);
-
-    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->cancel_button), "clicked",
-      GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
-
-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-        GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
+    WX_TESTING_SHOW_MODAL_HOOK();

 
 

+    return wxGenericFileDialog::ShowModal();

 }
 
 }
 

-int wxFileDialog::ShowModal(void)
+bool wxFileDialog::Show( bool show )

 {
 {

-    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;
+    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 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 wxFileDialog::GetPath() const

 {
 {

-    wxString filter2("");
-    if ( defaultExtension && !filter )
-        filter2 = wxString("*.") + wxString(defaultExtension) ;
-    else if ( filter )
-        filter2 = filter;
+    return wxGenericFileDialog::GetPath();
+}

 
 

-    wxString defaultDirString;
-    if (defaultDir)
-        defaultDirString = defaultDir;
-    else
-        defaultDirString = "";
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+    wxGenericFileDialog::GetFilenames( files );
+}

 
 

-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
-    else
-        defaultFilenameString = "";
+void wxFileDialog::GetPaths(wxArrayString& paths) const
+{
+    wxGenericFileDialog::GetPaths( paths );
+}

 
 

-    wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
+void wxFileDialog::SetMessage(const wxString& message)
+{
+    wxGenericFileDialog::SetMessage( message );
+}

 
 

-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        return fileDialog.GetPath();
-    }
-    else
-    {
-        return wxEmptyString;
-    }
+void wxFileDialog::SetPath(const wxString& path)
+{
+    wxGenericFileDialog::SetPath( path );

 }
 
 }
 

-wxString wxLoadFileSelector( const char *what, const char *extension, const char *default_name, wxWindow *parent )
+void wxFileDialog::SetDirectory(const wxString& dir)

 {
 {

-    char *ext = (char *)extension;
+    wxGenericFileDialog::SetDirectory( dir );
+}

 
 

-    char prompt[50];
-    wxString str = _("Load %s file");
-    sprintf(prompt, str, what);
+wxString wxFileDialog::GetDirectory() const
+{
+    return wxGenericFileDialog::GetDirectory();
+}

 
 

-    if (*ext == '.') ext++;
-    char wild[60];
-    sprintf(wild, "*.%s", ext);
+void wxFileDialog::SetFilename(const wxString& name)
+{

 
 

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

 }
 
 }
 

-wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name,
-         wxWindow *parent )
+wxString wxFileDialog::GetFilename() const

 {
 {

-    char *ext = (char *)extension;
+    return wxGenericFileDialog::GetFilename();
+}

 
 

-    char prompt[50];
-    wxString str = _("Save %s file");
-    sprintf(prompt, str, what);
+void wxFileDialog::SetWildcard(const wxString& wildCard)
+{
+    wxGenericFileDialog::SetWildcard( wildCard );
+}

 
 

-    if (*ext == '.') ext++;
-    char wild[60];
-    sprintf(wild, "*.%s", ext);
+void wxFileDialog::SetFilterIndex(int filterIndex)
+{
+    wxGenericFileDialog::SetFilterIndex( filterIndex );
+}

 
 

-    return wxFileSelector (prompt, (const char *) NULL, default_name, ext, wild, 0, parent);
+int wxFileDialog::GetFilterIndex() const
+{
+    return wxGenericFileDialog::GetFilterIndex();

 }
 
 }
 

+#endif // wxUSE_FILEDLG