1.13

1 files changed, 34 insertions, 4 deletions

diff --git a/ui/SmallDialogs.h b/ui/SmallDialogs.h
index 7efb4dbe..c75a1b9a 100644
--- a/ui/SmallDialogs.h
+++ b/ui/SmallDialogs.h
@@ -74,23 +74,48 @@ private:
 class ErrorDlg : public ErrorDlgGenerated
 {
 public:
-    ErrorDlg(const wxString messageText, bool& continueError);
+    ErrorDlg(wxWindow* parentWindow, const wxString messageText, bool& ignoreNextErrors, int dummy);
     ~ErrorDlg();
 
     enum
     {
-        BUTTON_CONTINUE,
+        BUTTON_IGNORE,
         BUTTON_RETRY,
         BUTTON_ABORT
     };
 
 private:
     void OnClose(wxCloseEvent& event);
-    void OnContinue(wxCommandEvent& event);
+    void OnIgnore(wxCommandEvent& event);
     void OnRetry(wxCommandEvent& event);
     void OnAbort(wxCommandEvent& event);
 
-    bool& continueOnError;
+    bool& ignoreErrors;
+};
+
+
+class WarningDlg : public WarningDlgGenerated
+{
+public:
+    WarningDlg(wxWindow* parentWindow,  int activeButtons, const wxString messageText, bool& dontShowAgain);
+    ~WarningDlg();
+
+    enum
+    {
+        BUTTON_IGNORE  = 1,
+        BUTTON_RESOLVE = 2,
+        BUTTON_ABORT   = 4,
+        BUTTON_OKAY    = 8
+    };
+
+private:
+    void OnClose(wxCloseEvent& event);
+    void OnIgnore(wxCommandEvent& event);
+    void OnResolve(wxCommandEvent& event);
+    void OnAbort(wxCommandEvent& event);
+    void OnOkay(wxCommandEvent& event);
+
+    bool& dontShowAgain;
 };
 
 
@@ -100,6 +125,11 @@ public:
     ModifyFilesDlg(wxWindow* window, const wxString& parentDirectory, const int timeShift);
     ~ModifyFilesDlg();
 
+    enum
+    {
+        BUTTON_APPLY = 10
+    };
+
 private:
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);