Don't cause scroll events for position changes from SetScrollbars, broken in r67326.

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

diff --git a/src/gtk/filectrl.cpp b/src/gtk/filectrl.cpp
index 5beb5a438e5d219bacfbbbfccd6d20f4d9714d01..eec4ce2a7a21bfd2065bde5ef890319fd2c1661f 100644 (file)
--- a/src/gtk/filectrl.cpp
+++ b/src/gtk/filectrl.cpp
@@ -16,7 +16,7 @@
 
 #include "wx/filectrl.h"
 
 
 #include "wx/filectrl.h"
 

-#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#if wxUSE_FILECTRL && !defined(__WXUNIVERSAL__)

 
 #ifndef WX_PRECOMP
 #    include "wx/sizer.h"
 
 #ifndef WX_PRECOMP
 #    include "wx/sizer.h"


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


@@ -47,7 +48,7 @@ wxString wxGtkFileChooser::GetPath() const
 
     wxString string;
     if (str.c_str() != NULL)
 
     wxString string;
     if (str.c_str() != NULL)

-        string = wxConvFileName->cMB2WX(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() );

 }
 
 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,13 +266,27 @@ 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 )
 
 void wxGtkFileCtrl::Init()
 {
 // wxGtkFileCtrl implementation
 
 IMPLEMENT_DYNAMIC_CLASS( wxGtkFileCtrl, wxControl )
 
 void wxGtkFileCtrl::Init()
 {

-    m_hasFocus = false;

     m_checkNextSelEvent = false;
 
     // ignore the first folder change event which is fired upon startup.
     m_checkNextSelEvent = false;
 
     // ignore the first folder change event which is fired upon startup.


@@ -288,6 +316,7 @@ bool wxGtkFileCtrl::Create( wxWindow *parent,
         gtkAction = GTK_FILE_CHOOSER_ACTION_SAVE;
 
     m_widget =  gtk_alignment_new ( 0, 0, 1, 1 );
         gtkAction = GTK_FILE_CHOOSER_ACTION_SAVE;
 
     m_widget =  gtk_alignment_new ( 0, 0, 1, 1 );

+    g_object_ref(m_widget);

     m_fcWidget = GTK_FILE_CHOOSER( gtk_file_chooser_widget_new(gtkAction) );
     gtk_widget_show ( GTK_WIDGET( m_fcWidget ) );
     gtk_container_add ( GTK_CONTAINER ( m_widget ), GTK_WIDGET( m_fcWidget ) );
     m_fcWidget = GTK_FILE_CHOOSER( gtk_file_chooser_widget_new(gtkAction) );
     gtk_widget_show ( GTK_WIDGET( m_fcWidget ) );
     gtk_container_add ( GTK_CONTAINER ( m_widget ), GTK_WIDGET( m_fcWidget ) );


@@ -306,6 +335,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 )


@@ -369,18 +402,13 @@ bool wxGtkFileCtrl::SetDirectory( const wxString& dir )
 
 bool wxGtkFileCtrl::SetFilename( const wxString& name )
 {
 
 bool wxGtkFileCtrl::SetFilename( const wxString& name )
 {

-    if ( !gtk_check_version( 2, 4, 0 ) )
+    if ( HasFlag( wxFC_SAVE ) )

     {
     {

-        if ( HasFlag( wxFC_SAVE ) )
-        {
-            gtk_file_chooser_set_current_name( m_fcWidget, wxGTK_CONV( name ) );
-            return true;
-        }
-        else
-            return SetPath( wxFileName( GetDirectory(), name ).GetFullPath() );
+        gtk_file_chooser_set_current_name( m_fcWidget, wxGTK_CONV( name ) );
+        return true;

     }
     }

-
-    return false;
+    else
+        return SetPath( wxFileName( GetDirectory(), name ).GetFullPath() );

 }
 
 void wxGtkFileCtrl::SetWildcard( const wxString& wildCard )
 }
 
 void wxGtkFileCtrl::SetWildcard( const wxString& wildCard )


@@ -422,16 +450,10 @@ void wxGtkFileCtrl::GetFilenames( wxArrayString& files ) const
 
 void wxGtkFileCtrl::ShowHidden(bool show)
 {
 
 void wxGtkFileCtrl::ShowHidden(bool show)
 {

-#ifdef __WXGTK26__    
-    gtk_file_chooser_set_show_hidden(m_fcWidget, show);
-#else
-    //  gtk_file_chooser_set_show_hidden only in 2.6
+    // gtk_file_chooser_set_show_hidden() is new in 2.6

     g_object_set (G_OBJECT (m_fcWidget), "show-hidden", show, NULL);
     g_object_set (G_OBJECT (m_fcWidget), "show-hidden", show, NULL);

-#endif    

 }
 
 }
 

-#endif 
-    // wxUSE_FILECTRL
+#endif // wxUSE_FILECTRL

 
 

-#endif
-    // if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#endif // wxUSE_FILECTRL && !defined(__WXUNIVERSAL__)