remove unused variable assignment, closes #14928

[wxWidgets.git] / include / wx / gtk / filectrl.h

diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h
index e194bfc49fa41ae26f4de1162ce3bfec3d362b15..4d11d7f59ceb5e05e67b8a7ef3be88ff961063d9 100644 (file)
--- a/include/wx/gtk/filectrl.h
+++ b/include/wx/gtk/filectrl.h
@@ -32,7 +32,7 @@ typedef struct _GtkFileChooser GtkFileChooser;
 class WXDLLIMPEXP_CORE wxGtkFileChooser
 {
 public:
 class WXDLLIMPEXP_CORE wxGtkFileChooser
 {
 public:

-    wxGtkFileChooser() {}
+    wxGtkFileChooser() { m_ignoreNextFilterEvent = false; }

 
     void SetWidget(GtkFileChooser *w);
 
 
     void SetWidget(GtkFileChooser *w);
 


@@ -48,6 +48,10 @@ public:
     void SetWildcard( const wxString& wildCard );
     void SetFilterIndex( int filterIndex );
 
     void SetWildcard( const wxString& wildCard );
     void SetFilterIndex( int filterIndex );
 

+    bool HasFilterChoice() const;
+
+    bool ShouldIgnoreNextFilterEvent() const { return m_ignoreNextFilterEvent; }
+

     wxString GetCurrentWildCard() const
        { return m_wildcards[GetFilterIndex()]; }
 
     wxString GetCurrentWildCard() const
        { return m_wildcards[GetFilterIndex()]; }
 


@@ -55,7 +59,11 @@ private:
     GtkFileChooser *m_widget;
     // First wildcard in filter, to be used when the user
     // saves a file without giving an extension.
     GtkFileChooser *m_widget;
     // First wildcard in filter, to be used when the user
     // saves a file without giving an extension.

-    wxArrayString   m_wildcards; 
+    wxArrayString   m_wildcards;
+
+    // If true, ignore the next event because it was generated by us and not
+    // the user.
+    bool m_ignoreNextFilterEvent;

 };
 
 #if wxUSE_FILECTRL
 };
 
 #if wxUSE_FILECTRL


@@ -80,9 +88,8 @@ public:
         Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name );
     }
 
         Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name );
     }
 

-    virtual ~wxGtkFileCtrl() {};
+    virtual ~wxGtkFileCtrl();

 
 

-    void Init();

     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxString& defaultDirectory = wxEmptyString,
     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxString& defaultDirectory = wxEmptyString,


@@ -110,6 +117,14 @@ public:
     virtual bool HasMultipleFileSelection() const { return HasFlag( wxFC_MULTIPLE ); }
     virtual void ShowHidden(bool show);
 
     virtual bool HasMultipleFileSelection() const { return HasFlag( wxFC_MULTIPLE ); }
     virtual void ShowHidden(bool show);
 

+    virtual bool HasFilterChoice() const
+        { return m_fc.HasFilterChoice(); }
+
+
+    // Implementation only from now on.
+    bool GTKShouldIgnoreNextFilterEvent() const
+        { return m_fc.ShouldIgnoreNextFilterEvent(); }
+

     bool    m_checkNextSelEvent;
     bool    m_ignoreNextFolderChangeEvent;
 
     bool    m_checkNextSelEvent;
     bool    m_ignoreNextFolderChangeEvent;
 


@@ -118,6 +133,9 @@ protected:
     wxGtkFileChooser    m_fc;
     wxString            m_wildCard;
 
     wxGtkFileChooser    m_fc;
     wxString            m_wildCard;
 

+private:
+    void Init();
+

     DECLARE_DYNAMIC_CLASS( wxGtkFileCtrl )
 };
 
     DECLARE_DYNAMIC_CLASS( wxGtkFileCtrl )
 };