Initialize m_privData before doign the assignment

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index b554a0de1b6cfa7d2e5af5eb7ffd99151f7a9e18..e1082ea83eccef1268cb0967d18b0ee39193be5e 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -38,6 +38,7 @@ extern bool g_isIdle;
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 {
     int style = dialog->GetStyle();
 static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 {
     int style = dialog->GetStyle();


@@ -86,16 +87,18 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 
     dialog->SetPath(filename);
     dialog->UpdateFromDialog();
 
     dialog->SetPath(filename);
     dialog->UpdateFromDialog();

-    
+

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);
 }
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);
 }

+}

 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
                                            wxFileDialog *dialog)
 {
 static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
                                            wxFileDialog *dialog)
 {


@@ -103,13 +106,15 @@ static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);
 }
     event.SetEventObject(dialog);
     dialog->GetEventHandler()->ProcessEvent(event);
 }

+}

 
 

+extern "C" {

 static void gtk_filedialog_response_callback(GtkWidget *w,
                                              int response,
                                              wxFileDialog *dialog)
 {
     wxapp_install_idle_handler();
 static void gtk_filedialog_response_callback(GtkWidget *w,
                                              int response,
                                              wxFileDialog *dialog)
 {
     wxapp_install_idle_handler();

-    
+

     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);
     else if (response == GTK_RESPONSE_CANCEL)
     if (response == GTK_RESPONSE_ACCEPT)
         gtk_filedialog_ok_callback(w, dialog);
     else if (response == GTK_RESPONSE_CANCEL)


@@ -117,10 +122,12 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
     else // "delete"
     {
         gtk_filedialog_cancel_callback(w, dialog);
     else // "delete"
     {
         gtk_filedialog_cancel_callback(w, dialog);

-        dialog->m_destroyed_by_delete = TRUE;
+        dialog->m_destroyed_by_delete = true;

     }
 }
     }
 }

-#endif
+}
+
+#endif // __WXGTK24__

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


@@ -141,35 +148,37 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                        wildCard, style, pos, true )
 {
 #ifdef __WXGTK24__
                        wildCard, style, pos, true )
 {
 #ifdef __WXGTK24__

-    m_needParent = FALSE;
-    m_destroyed_by_delete = FALSE;
+    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);
-    
-    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(
+        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(

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


@@ -177,239 +186,269 @@ 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_signal_connect(GTK_OBJECT(m_widget),
-                             "response", 
+        gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), multiple);
+
+        gtk_signal_connect(GTK_OBJECT(m_widget),
+                             "response",

                              GTK_SIGNAL_FUNC(gtk_filedialog_response_callback),
                              (gpointer*)this);
                              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);
-    
-    SetWildcard(wildCard);
-    SetFilterIndex(0);
-#else
-    wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );
+
+        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);
+    }
+    else

 #endif
 #endif

+        wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );

 }
 
 wxFileDialog::~wxFileDialog()
 {
 #ifdef __WXGTK24__
 }
 
 wxFileDialog::~wxFileDialog()
 {
 #ifdef __WXGTK24__

-    if (m_destroyed_by_delete)
-        m_widget = NULL;
+    if (!gtk_check_version(2,4,0))
+    {
+        if (m_destroyed_by_delete)
+            m_widget = NULL;
+    }

 #endif
 }
 
 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {
 #ifdef __WXGTK24__
 #endif
 }
 
 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {
 #ifdef __WXGTK24__

-    wxDialog::OnOK( event );
-#else
-    wxGenericFileDialog::OnListOk( event );
+    if (!gtk_check_version(2,4,0))
+        wxDialog::OnOK( event );
+    else

 #endif
 #endif

+        wxGenericFileDialog::OnListOk( event );

 }
 
 int wxFileDialog::ShowModal()
 {
 #ifdef __WXGTK24__
 }
 
 int wxFileDialog::ShowModal()
 {
 #ifdef __WXGTK24__

-    return wxDialog::ShowModal();
-#else
-    return wxGenericFileDialog::ShowModal();
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::ShowModal();
+    else

 #endif
 #endif

+        return wxGenericFileDialog::ShowModal();

 }
 
 bool wxFileDialog::Show( bool show )
 {
 #ifdef __WXGTK24__
 }
 
 bool wxFileDialog::Show( bool show )
 {
 #ifdef __WXGTK24__

-    return wxDialog::Show( show );
-#else
-    return wxGenericFileDialog::Show( show );
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::Show( show );
+    else

 #endif
 #endif

+        return wxGenericFileDialog::Show( show );

 }
 
 }
 

-void wxFileDialog::GetFilenames(wxArrayString& files) const 
+void wxFileDialog::GetFilenames(wxArrayString& files) const

 {
 #ifdef __WXGTK24__
 {
 #ifdef __WXGTK24__

-    GetPaths(files);
-    for (size_t n = 0; n < files.GetCount(); n++ )
+    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.empty())
+            {
+                name += wxT(".");
+                name += ext;
+            }
+            files[n] = name;

         }
         }

-        files[n] = name;

     }
     }

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

 #endif
 #endif

+        wxGenericFileDialog::GetFilenames( files );

 }
 
 }
 

-void wxFileDialog::GetPaths(wxArrayString& paths) const 
+void wxFileDialog::GetPaths(wxArrayString& paths) const

 {
 #ifdef __WXGTK24__
 {
 #ifdef __WXGTK24__

-    paths.Empty(); 
-    if (GetWindowStyle() & wxMULTIPLE)
+    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)
+        {
+            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

         {
         {

-            wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
-            paths.Add(file);
-            g_free(gpathsi->data);
-            gpathsi = gpathsi->next;
+            paths.Add(m_fileName);

         }
         }

-        if (gpaths) 
-            g_slist_free(gpaths);

     }
     else
     }
     else

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

 #endif
 #endif

+        wxGenericFileDialog::GetPaths( paths );

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

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

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

-    if (path.empty()) return;
-
-    wxFileName fn(path);
-    m_path = fn.GetFullPath();
-    m_dir = fn.GetPath();
-    m_fileName = fn.GetFullName();
-    UpdateDialog();
-#else
-    wxGenericFileDialog::SetPath( path );
-#endif    
+    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();
+    }
+    else
+#endif
+        wxGenericFileDialog::SetPath( path );

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

-    if (wxDirExists(dir))
+    if (!gtk_check_version(2,4,0))

     {
     {

-        m_dir = dir;
-        m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-        UpdateDialog();
+        if (wxPathExists(dir))
+        {
+            m_dir = dir;
+            m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+            UpdateDialog();
+        }

     }
     }

-#else
-    wxGenericFileDialog::SetDirectory( dir );
-#endif    
+    else
+#endif
+        wxGenericFileDialog::SetDirectory( dir );

 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
 #ifdef __WXGTK24__

-    m_fileName = name;
-    m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-    UpdateDialog();
-#else
-    wxGenericFileDialog::SetFilename( name );
+    if (!gtk_check_version(2,4,0))
+    {
+        m_fileName = name;
+        m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+        UpdateDialog();
+    }
+    else

 #endif
 #endif

+        wxGenericFileDialog::SetFilename( name );

 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 #ifdef __WXGTK24__

-    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
+    if (!gtk_check_version(2,4,0))

     {
     {

-        // add parsed to GtkChooser
-        for (size_t n = 0; n < wildFilters.GetCount(); n++)
+        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

         {
         {

-            GtkFileFilter* filter = gtk_file_filter_new();
-            gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
-            wxString after = wildFilters[n];
-            do
+            // add parsed to GtkChooser
+            for (size_t n = 0; n < wildFilters.GetCount(); n++)

             {
             {

-                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(';'));
+                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);

             }
             }

-            while (!after.empty());
-            
-            gtk_file_chooser_add_filter(chooser, filter);

         }
     }
         }
     }

-#else
-    wxGenericFileDialog::SetWildcard( wildCard );
+    else

 #endif
 #endif

+        wxGenericFileDialog::SetWildcard( wildCard );

 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 #ifdef __WXGTK24__

-    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 (!gtk_check_version(2,4,0))

     {
     {

-        if (i == 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)

         {
         {

-            gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
-            m_filterIndex = i;
-            break;
+            if (i == filterIndex)
+            {
+                gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
+                m_filterIndex = i;
+                break;
+            }
+            i++;
+            fnode = fnode->next;

         }
         }

-        i++;
-        fnode = fnode->next;
+        g_slist_free(filters);

     }
     }

-    g_slist_free(filters);
-#else
-    wxGenericFileDialog::SetFilterIndex( filterIndex );
+    else

 #endif
 #endif

+        wxGenericFileDialog::SetFilterIndex( filterIndex );

 }
 
 void wxFileDialog::UpdateDialog()
 {
 #ifdef __WXGTK24__
     // set currently selected directory to match the path:
 }
 
 void wxFileDialog::UpdateDialog()
 {
 #ifdef __WXGTK24__
     // set currently selected directory to match the path:

-    if (!m_dir.empty() && wxDirExists(m_dir))
+    if (!m_dir.empty() && wxPathExists(m_dir))

     {
         // NB: This is important -- if we set directory only and not the path,
         //     then dialog will still remember old path set using previous
     {
         // NB: This is important -- if we set directory only and not the path,
         //     then dialog will still remember old path set using previous


@@ -424,18 +463,18 @@ void wxFileDialog::UpdateDialog()
         if (m_fileName.empty())
             gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
                                           wxGTK_CONV(m_dir));
         if (m_fileName.empty())
             gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
                                           wxGTK_CONV(m_dir));

-        
+

         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
                                             wxGTK_CONV(m_dir));
     }
         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
                                             wxGTK_CONV(m_dir));
     }

-    
+

     // if the user set only the directory (e.g. by calling SetDirectory)
     // and not the default filename, then we don't want to set the filename:
     if (!m_fileName.empty())
     {
         gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
                                       wxGTK_CONV(m_path));
     // if the user set only the directory (e.g. by calling SetDirectory)
     // and not the default filename, then we don't want to set the filename:
     if (!m_fileName.empty())
     {
         gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
                                       wxGTK_CONV(m_path));

-                                          
+

         // pre-fill the filename when saving, too (there's no text entry
         // control when opening a file, so it doesn't make sense to
         // do this when opening files):
         // pre-fill the filename when saving, too (there's no text entry
         // control when opening a file, so it doesn't make sense to
         // do this when opening files):


@@ -456,7 +495,7 @@ void wxFileDialog::UpdateFromDialog()
     GSList *filters = fnode;
     GtkFileFilter *current =
         gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_widget));
     GSList *filters = fnode;
     GtkFileFilter *current =
         gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_widget));

-    
+

     int i = 0;
     m_filterIndex = 0;
     while (fnode)
     int i = 0;
     m_filterIndex = 0;
     while (fnode)