From ee1c8c5c25d25dfa42120125a8a45dc9831ee412 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:23:48 +0200
Subject: 5.14

---
 Application.h | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'Application.h')

diff --git a/Application.h b/Application.h
index 4121ae4c..1c542903 100644
--- a/Application.h
+++ b/Application.h
@@ -7,21 +7,31 @@
 #ifndef FREEFILESYNCAPP_H
 #define FREEFILESYNCAPP_H
 
+#include <vector>
 #include <wx/app.h>
-#include "lib/process_xml.h"
+//#include "lib/process_xml.h"
 #include "lib/return_codes.h"
 
 
 class Application : public wxApp
 {
+public:
+    Application() : returnCode(zen::FFS_RC_SUCCESS) {}
+
 private:
     virtual bool OnInit();
     virtual int  OnRun();
     virtual int  OnExit() { return 0; }
     virtual bool OnExceptionInMainLoop() { throw; } //just re-throw and avoid display of additional messagebox: it will be caught in OnRun()
 
-    void OnStartApplication(wxIdleEvent& event);
-    void OnQueryEndSession(wxEvent& event);
+#ifdef FFS_MAC
+    virtual void MacOpenFiles(const wxArrayString& filenames);
+    virtual void MacNewFile();
+#endif
+
+    void onEnterEventLoop(wxEvent& event);
+    void onQueryEndSession(wxEvent& event);
+    void launch(const std::vector<wxString>& commandArgs);
 
     zen::FfsReturnCode returnCode;
 };
-- 
cgit