From 528635604eea1d8c679a3d038e2f00030ef72444 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:03:20 +0200
Subject: 3.2

---
 ui/SmallDialogs.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'ui/SmallDialogs.h')

diff --git a/ui/SmallDialogs.h b/ui/SmallDialogs.h
index ca22afa9..22a271c9 100644
--- a/ui/SmallDialogs.h
+++ b/ui/SmallDialogs.h
@@ -33,7 +33,6 @@ class HelpDlg : public HelpDlgGenerated
 {
 public:
     HelpDlg(wxWindow* window);
-    ~HelpDlg();
 
 private:
     void OnClose(wxCloseEvent& event);
@@ -44,7 +43,11 @@ private:
 class FilterDlg : public FilterDlgGenerated
 {
 public:
-    FilterDlg(wxWindow* window, Zstring& filterIncl, Zstring& filterExcl);
+    FilterDlg(wxWindow* window,
+              bool isGlobalFilter,
+              Zstring& filterIncl,
+              Zstring& filterExcl,
+              bool filterActive);
     ~FilterDlg() {}
 
     enum
@@ -59,6 +62,7 @@ private:
     void OnCancel(wxCommandEvent& event);
     void OnClose(wxCloseEvent& event);
 
+    const bool isGlobalFilter_;
     Zstring& includeFilter;
     Zstring& excludeFilter;
 };
@@ -324,6 +328,7 @@ public:
     void minimizeToTray();
 
 private:
+    void OnKeyPressed(wxKeyEvent& event);
     virtual void OnOkay(wxCommandEvent& event);
     virtual void OnPause(wxCommandEvent& event);
     virtual void OnAbort(wxCommandEvent& event);
-- 
cgit