Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

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

diff --git a/src/gtk/filectrl.cpp b/src/gtk/filectrl.cpp
index dace1751e773a88f90abb84daad02da6e18936b6..7eaf55511731393e938f559e86e81e9fee725acb 100644 (file)
--- a/src/gtk/filectrl.cpp
+++ b/src/gtk/filectrl.cpp
@@ -26,6 +26,7 @@
 #include "wx/gtk/private.h"
 #include "wx/filedlg.h"
 #include "wx/filename.h"
 #include "wx/gtk/private.h"
 #include "wx/filedlg.h"
 #include "wx/filename.h"

+#include "wx/scopeguard.h"

 #include "wx/tokenzr.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/tokenzr.h"
 
 //-----------------------------------------------------------------------------


@@ -46,8 +47,8 @@ wxString wxGtkFileChooser::GetPath() const
     wxGtkString str( gtk_file_chooser_get_filename( m_widget ) );
 
     wxString string;
     wxGtkString str( gtk_file_chooser_get_filename( m_widget ) );
 
     wxString string;

-    if (str.c_str() != NULL)
-        string = wxConvFileName->cMB2WX(str);
+    if (str)
+        string = wxString::FromUTF8(str);

     return string;
 }
 
     return string;
 }
 


@@ -70,7 +71,7 @@ void wxGtkFileChooser::GetPaths( wxArrayString& paths ) const
         GSList *gpaths = gpathsi;
         while ( gpathsi )
         {
         GSList *gpaths = gpathsi;
         while ( gpathsi )
         {

-            wxString file( wxConvFileName->cMB2WX( ( gchar* ) gpathsi->data ) );
+            wxString file(wxString::FromUTF8(static_cast<gchar *>(gpathsi->data)));

             paths.Add( file );
             g_free( gpathsi->data );
             gpathsi = gpathsi->next;
             paths.Add( file );
             g_free( gpathsi->data );
             gpathsi = gpathsi->next;


@@ -84,24 +85,21 @@ void wxGtkFileChooser::GetPaths( wxArrayString& paths ) const
 
 bool wxGtkFileChooser::SetPath( const wxString& path )
 {
 
 bool wxGtkFileChooser::SetPath( const wxString& path )
 {

-    if ( path.empty() ) return true;
+    if ( path.empty() )
+        return true;

 
 

-    return gtk_file_chooser_set_filename( m_widget,
-                                          wxConvFileName->cWX2MB( path.c_str() ) );
+    return gtk_file_chooser_set_filename( m_widget, path.utf8_str() ) != 0;

 }
 
 bool wxGtkFileChooser::SetDirectory( const wxString& dir )
 {
 }
 
 bool wxGtkFileChooser::SetDirectory( const wxString& dir )
 {

-    const gboolean b =
-        gtk_file_chooser_set_current_folder( m_widget,
-                                             wxConvFileName->cWX2MB( dir.c_str() ) );
-    return b != 0;
+    return gtk_file_chooser_set_current_folder( m_widget, dir.utf8_str() ) != 0;

 }
 
 wxString wxGtkFileChooser::GetDirectory() const
 {
     const wxGtkString str( gtk_file_chooser_get_current_folder( m_widget ) );
 }
 
 wxString wxGtkFileChooser::GetDirectory() const
 {
     const wxGtkString str( gtk_file_chooser_get_current_folder( m_widget ) );

-    return wxString( str, *wxConvFileName );
+    return wxString::FromUTF8(str);

 }
 
 wxString wxGtkFileChooser::GetFilename() const
 }
 
 wxString wxGtkFileChooser::GetFilename() const


@@ -111,6 +109,8 @@ wxString wxGtkFileChooser::GetFilename() const
 
 void wxGtkFileChooser::SetWildcard( const wxString& wildCard )
 {
 
 void wxGtkFileChooser::SetWildcard( const wxString& wildCard )
 {

+    m_wildcards.Empty();
+

     // parse filters
     wxArrayString wildDescriptions, wildFilters;
 
     // parse filters
     wxArrayString wildDescriptions, wildFilters;
 


@@ -127,6 +127,9 @@ void wxGtkFileChooser::SetWildcard( const wxString& wildCard )
         GSList* ifilters = gtk_file_chooser_list_filters( chooser );
         GSList* filters = ifilters;
 
         GSList* ifilters = gtk_file_chooser_list_filters( chooser );
         GSList* filters = ifilters;
 

+        m_ignoreNextFilterEvent = true;
+        wxON_BLOCK_EXIT_SET(m_ignoreNextFilterEvent, false);
+

         while ( ifilters )
         {
             gtk_file_chooser_remove_filter( chooser, GTK_FILE_FILTER( ifilters->data ) );
         while ( ifilters )
         {
             gtk_file_chooser_remove_filter( chooser, GTK_FILE_FILTER( ifilters->data ) );


@@ -144,10 +147,16 @@ void wxGtkFileChooser::SetWildcard( const wxString& wildCard )
                 gtk_file_filter_set_name( filter, wxGTK_CONV_SYS( wildDescriptions[n] ) );
 
                 wxStringTokenizer exttok( wildFilters[n], wxT( ";" ) );
                 gtk_file_filter_set_name( filter, wxGTK_CONV_SYS( wildDescriptions[n] ) );
 
                 wxStringTokenizer exttok( wildFilters[n], wxT( ";" ) );

+
+                int n1 = 1;

                 while ( exttok.HasMoreTokens() )
                 {
                     wxString token = exttok.GetNextToken();
                     gtk_file_filter_add_pattern( filter, wxGTK_CONV_SYS( token ) );
                 while ( exttok.HasMoreTokens() )
                 {
                     wxString token = exttok.GetNextToken();
                     gtk_file_filter_add_pattern( filter, wxGTK_CONV_SYS( token ) );

+
+                    if (n1 == 1)
+                        m_wildcards.Add( token ); // Only add first pattern to list, used later when saving
+                    n1++;

                 }
 
                 gtk_file_chooser_add_filter( chooser, filter );
                 }
 
                 gtk_file_chooser_add_filter( chooser, filter );


@@ -196,6 +205,11 @@ int wxGtkFileChooser::GetFilterIndex() const
         return index;
 }
 
         return index;
 }
 

+bool wxGtkFileChooser::HasFilterChoice() const
+{
+    return gtk_file_chooser_get_filter( m_widget ) != NULL;
+}
+

 //-----------------------------------------------------------------------------
 // end wxGtkFileChooser Implementation
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // end wxGtkFileChooser Implementation
 //-----------------------------------------------------------------------------


@@ -252,10 +266,31 @@ extern "C"
     }
 }
 
     }
 }
 

+extern "C"
+{
+    static void
+    gtkfilechooserwidget_notify_callback( GObject *WXUNUSED( gobject ), GParamSpec *arg1, wxGtkFileCtrl *fileCtrl )
+    {
+        const char *name = g_param_spec_get_name (arg1);
+        if ( strcmp( name, "filter" ) == 0 &&
+             fileCtrl->HasFilterChoice() &&
+             !fileCtrl->GTKShouldIgnoreNextFilterEvent() )
+        {
+            GenerateFilterChangedEvent( fileCtrl, fileCtrl );
+        }
+    }
+}
+

 // wxGtkFileCtrl implementation
 
 IMPLEMENT_DYNAMIC_CLASS( wxGtkFileCtrl, wxControl )
 
 // wxGtkFileCtrl implementation
 
 IMPLEMENT_DYNAMIC_CLASS( wxGtkFileCtrl, wxControl )
 

+wxGtkFileCtrl::~wxGtkFileCtrl()
+{
+    if (m_fcWidget)
+        GTKDisconnect(m_fcWidget);
+}
+

 void wxGtkFileCtrl::Init()
 {
     m_checkNextSelEvent = false;
 void wxGtkFileCtrl::Init()
 {
     m_checkNextSelEvent = false;


@@ -306,6 +341,10 @@ bool wxGtkFileCtrl::Create( wxWindow *parent,
                        G_CALLBACK ( gtkfilechooserwidget_selection_changed_callback ),
                        this );
 
                        G_CALLBACK ( gtkfilechooserwidget_selection_changed_callback ),
                        this );
 

+    g_signal_connect ( m_fcWidget, "notify",
+                       G_CALLBACK ( gtkfilechooserwidget_notify_callback ),
+                       this );
+

     m_fc.SetWidget( m_fcWidget );
 
     if ( style & wxFC_MULTIPLE )
     m_fc.SetWidget( m_fcWidget );
 
     if ( style & wxFC_MULTIPLE )


@@ -329,7 +368,7 @@ bool wxGtkFileCtrl::Create( wxWindow *parent,
     if ( !dir.empty() )
     {
         gtk_file_chooser_set_current_folder( m_fcWidget,
     if ( !dir.empty() )
     {
         gtk_file_chooser_set_current_folder( m_fcWidget,

-                                             dir.fn_str() );
+                                             wxGTK_CONV_FN(dir) );

     }
 
     const wxString fname = fn.GetFullName();
     }
 
     const wxString fname = fn.GetFullName();


@@ -338,7 +377,7 @@ bool wxGtkFileCtrl::Create( wxWindow *parent,
         if ( !fname.empty() )
         {
             gtk_file_chooser_set_current_name( m_fcWidget,
         if ( !fname.empty() )
         {
             gtk_file_chooser_set_current_name( m_fcWidget,

-                                               fname.fn_str() );
+                                               wxGTK_CONV_FN(fname) );

         }
     }
     else // wxFC_OPEN
         }
     }
     else // wxFC_OPEN


@@ -346,7 +385,7 @@ bool wxGtkFileCtrl::Create( wxWindow *parent,
         if ( !fname.empty() )
         {
             gtk_file_chooser_set_filename( m_fcWidget,
         if ( !fname.empty() )
         {
             gtk_file_chooser_set_filename( m_fcWidget,

-                                           fn.GetFullPath().fn_str() );
+                                           wxGTK_CONV_FN(fn.GetFullPath()) );

         }
     }
 
         }
     }