corrected bitmap mask -> Image conversion

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 6234348501f40c3bde166d27efa0f4a03b99b6a8..2376366750043e957b7fcb385cf863931ef83ef6 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -8,13 +8,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

-#pragma implementation "filedlg.h"
+#pragma implementation "filedlggtk.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_FILEDLG && defined(__WXGTK24__)
+#if wxUSE_FILEDLG

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


@@ -23,6 +23,8 @@
 #include "wx/msgdlg.h"
 
 #include <gtk/gtk.h>
 #include "wx/msgdlg.h"
 
 #include <gtk/gtk.h>

+
+#ifdef __WXGTK24__

 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------


@@ -108,54 +110,68 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
 {
     wxapp_install_idle_handler();
     
 {
     wxapp_install_idle_handler();
     

-    if (response == GTK_RESPONSE_CANCEL)
-        gtk_filedialog_cancel_callback(w, dialog);
-    else
+    if (response == GTK_RESPONSE_ACCEPT)

         gtk_filedialog_ok_callback(w, dialog);
         gtk_filedialog_ok_callback(w, dialog);

+    else if (response == GTK_RESPONSE_CANCEL)
+        gtk_filedialog_cancel_callback(w, dialog);
+    else // "delete"
+    {
+        gtk_filedialog_cancel_callback(w, dialog);
+        dialog->m_destroyed_by_delete = TRUE;
+    }

 }
 }

+#endif

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

-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)
+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)
 
 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)
+    : wxGenericFileDialog(parent, message, defaultDir, defaultFileName,
+                       wildCard, style, pos, true )

 {
 {

-    m_needParent = FALSE;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        m_needParent = FALSE;
+        m_destroyed_by_delete = FALSE;

 
 

-    if (!PreCreation(parent, pos, wxDefaultSize) ||
-        !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+        if (!PreCreation(parent, pos, wxDefaultSize) ||
+            !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,

                     wxDefaultValidator, wxT("filedialog")))
                     wxDefaultValidator, wxT("filedialog")))

-    {
-        wxFAIL_MSG( wxT("wxFileDialog creation failed") );
-        return;
-    }
+        {
+            wxFAIL_MSG( wxT("wxFileDialog creation failed") );
+            return;
+        }

 
 

-    bool multiple = (style & wxMULTIPLE) == wxMULTIPLE;
-    GtkFileChooserAction gtk_action;
-    GtkWindow* gtk_parent = NULL;
-    if (parent)
-        gtk_parent = GTK_WINDOW(parent->m_widget);
+        bool multiple = (style & wxMULTIPLE) == wxMULTIPLE;
+        GtkFileChooserAction gtk_action;
+        GtkWindow* gtk_parent = NULL;
+        if (parent)
+            gtk_parent = GTK_WINDOW(parent->m_widget);

     
     

-    gchar* ok_btn_stock;
-    if ((style & wxSAVE) == wxSAVE)
-    {
-        gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
-        ok_btn_stock = GTK_STOCK_SAVE;
-    }
-    else
-    {
-        gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
-        ok_btn_stock = GTK_STOCK_OPEN;
-    }
-    m_widget = gtk_file_chooser_dialog_new(
+        gchar* ok_btn_stock;
+        if ((style & wxSAVE) == wxSAVE)
+        {
+            gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
+            ok_btn_stock = GTK_STOCK_SAVE;
+        }
+        else
+        {
+            gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
+            ok_btn_stock = GTK_STOCK_OPEN;
+        }
+        m_widget = gtk_file_chooser_dialog_new(

                        wxGTK_CONV(m_message),
                        gtk_parent,
                        gtk_action,
                        wxGTK_CONV(m_message),
                        gtk_parent,
                        gtk_action,


@@ -163,104 +179,267 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                        ok_btn_stock, GTK_RESPONSE_ACCEPT,
                        NULL);
 
                        ok_btn_stock, GTK_RESPONSE_ACCEPT,
                        NULL);
 

-    gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), multiple);
+        gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), multiple);

         
         

-    gtk_signal_connect(GTK_OBJECT(m_widget),
+        gtk_signal_connect(GTK_OBJECT(m_widget),

                              "response", 
                              GTK_SIGNAL_FUNC(gtk_filedialog_response_callback),
                              (gpointer*)this);
     
                              "response", 
                              GTK_SIGNAL_FUNC(gtk_filedialog_response_callback),
                              (gpointer*)this);
     

-    m_path = m_dir;
-    if (!m_path.empty() && m_path.Last() != wxT('/'))
-        m_path += wxT('/');
-    m_path += m_fileName;
-    SetPath(m_path);
+        m_path = m_dir;
+        if (!m_path.empty() && m_path.Last() != wxT('/'))
+            m_path += wxT('/');
+        m_path += m_fileName;
+        SetPath(m_path);

     
     

-    SetWildcard(wildCard);
-    SetFilterIndex(0);
+        SetWildcard(wildCard);
+        SetFilterIndex(0);
+    }
+    else
+#endif
+        wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );

 }
 
 wxFileDialog::~wxFileDialog()
 {
 }
 
 wxFileDialog::~wxFileDialog()
 {

-    m_widget = NULL;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        if (m_destroyed_by_delete)
+            m_widget = NULL;
+    }
+#endif
+}
+
+void wxFileDialog::OnFakeOk( wxCommandEvent &event )
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        wxDialog::OnOK( event );
+    else
+#endif
+        wxGenericFileDialog::OnListOk( event );
+}
+
+int wxFileDialog::ShowModal()
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::ShowModal();
+    else
+#endif
+        return wxGenericFileDialog::ShowModal();
+}
+
+bool wxFileDialog::Show( bool show )
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::Show( show );
+    else
+#endif
+        return wxGenericFileDialog::Show( show );

 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const 
 {
 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const 
 {

-    GetPaths(files);
-    for (size_t n = 0; n < files.GetCount(); n++ )
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

-        wxString name,ext;
-        wxSplitPath(files[n], NULL, &name, &ext);
-        if (!ext.IsEmpty())
+        GetPaths(files);
+        for (size_t n = 0; n < files.GetCount(); n++ )

         {
         {

-            name += wxT(".");
-            name += ext;
+            wxString name,ext;
+            wxSplitPath(files[n], NULL, &name, &ext);
+            if (!ext.IsEmpty())
+            {
+                name += wxT(".");
+                name += ext;
+            }
+            files[n] = name;

         }
         }

-        files[n] = name;

     }
     }

+    else
+#endif
+        wxGenericFileDialog::GetFilenames( files );

 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const 
 {
 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const 
 {

-    paths.Empty(); 
-    if (GetWindowStyle() & wxMULTIPLE)
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

-        GSList *gpathsi = 
-            gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
-        GSList *gpaths = gpathsi;
-        while (gpathsi)
+        paths.Empty(); 
+        if (GetWindowStyle() & wxMULTIPLE)

         {
         {

-            wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
-            paths.Add(file);
-            g_free(gpathsi->data);
-            gpathsi = gpathsi->next;
+            GSList *gpathsi = 
+                gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
+            GSList *gpaths = gpathsi;
+            while (gpathsi)
+            {
+                wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
+               paths.Add(file);
+                g_free(gpathsi->data);
+                gpathsi = gpathsi->next;
+            }
+            if (gpaths) 
+                g_slist_free(gpaths);
+        }
+        else
+        {
+            paths.Add(m_fileName);

         }
         }

-        if (gpaths) 
-            g_slist_free(gpaths);

     }
     else
     }
     else

-    {
-        paths.Add(m_fileName);
-    }
+#endif
+        wxGenericFileDialog::GetPaths( paths );

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

-    m_message = message;
-    SetTitle(message);
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        m_message = message;
+        SetTitle(message);
+    }
+    else
+#endif    
+        wxGenericFileDialog::SetMessage( message );

 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {
 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {

-    if (path.empty()) return;
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        if (path.empty()) return;

 
 

-    wxFileName fn(path);
-    m_path = fn.GetFullPath();
-    m_dir = fn.GetPath();
-    m_fileName = fn.GetFullName();
-    UpdateDialog();
+        wxFileName fn(path);
+        m_path = fn.GetFullPath();
+        m_dir = fn.GetPath();
+        m_fileName = fn.GetFullName();
+        UpdateDialog();
+    }
+    else
+#endif    
+        wxGenericFileDialog::SetPath( path );

 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {

-    if (wxDirExists(dir))
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        if (wxDirExists(dir))
+        {
+            m_dir = dir;
+            m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+            UpdateDialog();
+        }
+    }
+    else
+#endif    
+        wxGenericFileDialog::SetDirectory( dir );
+}
+
+void wxFileDialog::SetFilename(const wxString& name)
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))

     {
     {

-        m_dir = dir;
+        m_fileName = name;

         m_path = wxFileName(m_dir, m_fileName).GetFullPath();
         UpdateDialog();
     }
         m_path = wxFileName(m_dir, m_fileName).GetFullPath();
         UpdateDialog();
     }

+    else
+#endif
+        wxGenericFileDialog::SetFilename( name );

 }
 
 }
 

-void wxFileDialog::SetFilename(const wxString& name)
+void wxFileDialog::SetWildcard(const wxString& wildCard)
+{
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        m_wildCard = wildCard;
+        GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);
+    
+        // empty current filter list:
+        GSList* ifilters = gtk_file_chooser_list_filters(chooser);
+        GSList* filters = ifilters;
+        while (ifilters)
+        {
+            gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data));
+            ifilters = ifilters->next;
+       }
+        g_slist_free(filters);
+    
+        // parse filters
+        wxArrayString wildDescriptions, wildFilters;
+        if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters))
+        {
+            wxFAIL_MSG( wxT("Wrong file type description") );
+        }
+        else
+        {
+            // add parsed to GtkChooser
+            for (size_t n = 0; n < wildFilters.GetCount(); n++)
+            {
+                GtkFileFilter* filter = gtk_file_filter_new();
+                gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
+                wxString after = wildFilters[n];
+                do
+                {
+                    wxString ext = after.BeforeFirst(wxT(';'));
+                    gtk_file_filter_add_pattern(filter,wxGTK_CONV(ext));
+                    if (after.Find(wxT(';')) == wxNOT_FOUND)
+                        break;
+                    after = after.AfterLast(wxT(';'));
+                }
+                while (!after.empty());
+            
+                gtk_file_chooser_add_filter(chooser, filter);
+            }
+        }
+    }
+    else
+#endif
+        wxGenericFileDialog::SetWildcard( wildCard );
+}
+
+void wxFileDialog::SetFilterIndex(int filterIndex)

 {
 {

-    m_fileName = name;
-    m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-    UpdateDialog();
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        m_filterIndex = filterIndex;
+
+        GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
+        GSList *fnode = gtk_file_chooser_list_filters(chooser);
+        GSList *filters = fnode;
+        int i = 0;
+        while (fnode)
+        {
+            if (i == filterIndex)
+            {
+                gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
+                m_filterIndex = i;
+                break;
+            }
+            i++;
+            fnode = fnode->next;
+        }
+        g_slist_free(filters);
+    }
+    else
+#endif
+        wxGenericFileDialog::SetFilterIndex( filterIndex );

 }
 
 void wxFileDialog::UpdateDialog()
 {
 }
 
 void wxFileDialog::UpdateDialog()
 {

+#ifdef __WXGTK24__

     // set currently selected directory to match the path:
     if (!m_dir.empty() && wxDirExists(m_dir))
     {
     // set currently selected directory to match the path:
     if (!m_dir.empty() && wxDirExists(m_dir))
     {


@@ -298,77 +477,12 @@ void wxFileDialog::UpdateDialog()
                                               wxGTK_CONV(m_fileName));
         }
     }
                                               wxGTK_CONV(m_fileName));
         }
     }

-}
-
-void wxFileDialog::SetWildcard(const wxString& wildCard)
-{
-    m_wildCard = wildCard;
-    
-    GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);
-    
-    // empty current filter list:
-    GSList* ifilters = gtk_file_chooser_list_filters(chooser);
-    GSList* filters = ifilters;
-    while (ifilters)
-    {
-        gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data));
-        ifilters = ifilters->next;
-    }
-    g_slist_free(filters);
-    
-    // parse filters
-    wxArrayString wildDescriptions, wildFilters;
-    if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters))
-    {
-        wxFAIL_MSG( wxT("Wrong file type description") );
-    }
-    else
-    {
-        // add parsed to GtkChooser
-        for (size_t n = 0; n < wildFilters.GetCount(); n++)
-        {
-            GtkFileFilter* filter = gtk_file_filter_new();
-            gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
-            wxString after = wildFilters[n];
-            do
-            {
-                wxString ext = after.BeforeFirst(wxT(';'));
-                gtk_file_filter_add_pattern(filter,wxGTK_CONV(ext));
-                if (after.Find(wxT(';')) == wxNOT_FOUND)
-                    break;
-                after = after.AfterLast(wxT(';'));
-            }
-            while (!after.empty());
-            
-            gtk_file_chooser_add_filter(chooser, filter);
-        }
-    }
-}
-
-void wxFileDialog::SetFilterIndex(int filterIndex)
-{
-    m_filterIndex = filterIndex;
-
-    GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
-    GSList *fnode = gtk_file_chooser_list_filters(chooser);
-    GSList *filters = fnode;
-    int i = 0;
-    while (fnode)
-    {
-        if (i == filterIndex)
-        {
-            gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
-            m_filterIndex = i;
-            break;
-        }
-        i++;
-        fnode = fnode->next;
-    }
-    g_slist_free(filters);
+#endif

 }
 
 void wxFileDialog::UpdateFromDialog()
 {
 }
 
 void wxFileDialog::UpdateFromDialog()
 {

+#ifdef __WXGTK24__

     // update filterIndex
     GSList *fnode = gtk_file_chooser_list_filters(GTK_FILE_CHOOSER(m_widget));
     GSList *filters = fnode;
     // update filterIndex
     GSList *fnode = gtk_file_chooser_list_filters(GTK_FILE_CHOOSER(m_widget));
     GSList *filters = fnode;


@@ -388,6 +502,7 @@ void wxFileDialog::UpdateFromDialog()
         fnode = fnode->next;
     }
     g_slist_free(filters);
         fnode = fnode->next;
     }
     g_slist_free(filters);

+#endif

 }
 
 }
 

-#endif // wxUSE_FILEDLG && defined(__WXGTK24__)
+#endif // wxUSE_FILEDLG