From 420fb6c9b3427f65cfe24411944ee46b58cfcfb4 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 16:57:03 +0200
Subject: 1.17

---
 Application.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'Application.h')

diff --git a/Application.h b/Application.h
index 60b8fbe7..2cf69d9a 100644
--- a/Application.h
+++ b/Application.h
@@ -14,6 +14,7 @@
 #include "ui/smallDialogs.h"
 #include "library/misc.h"
 #include "library/processXml.h"
+#include <memory>
 
 class Application : public wxApp
 {
@@ -22,10 +23,7 @@ public:
     int  OnRun();
     int  OnExit();
     bool OnExceptionInMainLoop();
-
-    void initialize();
-
-    bool ProcessIdle();  //virtual impl.
+    void OnStartApplication(wxIdleEvent& event);
 
 private:
     void runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSettings& globalSettings);
@@ -59,7 +57,7 @@ class FfsTrayIcon;
 class BatchStatusHandlerSilent : public BatchStatusHandler
 {
 public:
-    BatchStatusHandlerSilent(const xmlAccess::OnError handleError, int& returnVal);
+    BatchStatusHandlerSilent(const xmlAccess::OnError handleError, const wxString& logfileDirectory, int& returnVal);
     ~BatchStatusHandlerSilent();
 
 
-- 
cgit