X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fmain.cpp;h=2140dfd0bf0ba7d987cefc01bc3b1fa1b46383a6;hp=4bc72497dd4ab23849bb32976c9dab284f0da3f1;hb=3ef806261b5482a584e05dc8311c8d7633f146b4;hpb=6e7e508af65b6a65b491f2727006ce53f90f4b8e

diff --git a/source/main.cpp b/source/main.cpp
index 4bc7249..2140dfd 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,6 +1,6 @@
 // main.cpp - Main subroutine (application start).
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2017 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -39,6 +39,10 @@
 #include "common/defaults.h"
 #include "common/dirs.h"
 
+#if defined(__WIN32__)
+#include "common/win32ssl.h"
+#endif
+
 class XestiaABApp: public wxApp
 {
     virtual bool OnInit();
@@ -49,45 +53,39 @@ IMPLEMENT_APP(XestiaABApp);
 bool XestiaABApp::OnInit()
 {
 
-	// Setup the locale.
-
-	wxLocale locale;
-	locale.Init(wxLANGUAGE_DEFAULT, wxLOCALE_LOAD_DEFAULT);
-
-/*#if defined(__WIN32__)
+#if defined(__WIN32__)
 
-	// Check that the minimum version of Xestia Common Components is installed on the system.
+	PSecurityFunctionTableW SecurityFunctionTbl;
+	SecurityFunctionTbl = (*InitSecurityInterface)();
 
-#include <xestiaccdll.h>
+#endif
 
-	if (!CheckXCCVersion(1, 0, 0)){
-		MessageBox(0, L"The version of Xestia Common Components installed is an older version not supported by this version of Xestia Address Book.\n\nPlease visit http://xestia.co.uk/commoncomponents and follow the page instructions to download the version required.", L"Older version of Xestia Common Components installed", MB_OK|MB_ICONSTOP);
-		this->Exit();
-	}
+	// Setup the locale.
 
-#endif*/
+	wxLocale locale;
+    locale.Init(wxLANGUAGE_DEFAULT, wxLOCALE_LOAD_DEFAULT);
 
 	static const wxCmdLineEntryDesc g_cmdLineDesc [] =
 	{
-		{ wxCMD_LINE_SWITCH, wxT_2("h"), wxT_2("help"), wxTRANSLATE(_("Displays help on command line parameters")),
+		{ wxCMD_LINE_SWITCH, "h", "help", "Displays help on command line parameters",
 			wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
-		{ wxCMD_LINE_OPTION, wxT_2("e"), wxT_2("edit"), wxTRANSLATE(_("Edit a vCard 4.0 formatted contact")),
+		{ wxCMD_LINE_OPTION, "e", "edit", "Edit a vCard 4.0 formatted contact",
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-		{ wxCMD_LINE_SWITCH, wxT_2("c"), wxT_2("convert"), wxTRANSLATE(_("Convert a contact file into another format.")),
+		{ wxCMD_LINE_SWITCH, "c", "convert", "Convert a contact file into another format.",
 			wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-		{ wxCMD_LINE_OPTION, wxT_2("ifmt"), NULL, wxTRANSLATE(_("Input format to convert from. (used with -c)")),
+		{ wxCMD_LINE_OPTION, "ifmt", NULL, "Input format to convert from. (used with -c)",
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-		{ wxCMD_LINE_OPTION, wxT_2("ofmt"), NULL, wxTRANSLATE(_("Output format to convert to. (used with -c)")),
+		{ wxCMD_LINE_OPTION, "ofmt", NULL,"Output format to convert to. (used with -c)",
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-		{ wxCMD_LINE_OPTION, wxT_2("ifile"), NULL, wxTRANSLATE(_("Input filename to read from. (used with -c)")),
+		{ wxCMD_LINE_OPTION, "ifile", NULL, "Input filename to read from. (used with -c)",
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-		{ wxCMD_LINE_OPTION, wxT_2("ofile"), NULL, wxTRANSLATE(_("Output filename to write to (don't use to pipe to console). (used with -c)")),
+		{ wxCMD_LINE_OPTION, "ofile", NULL, "Output filename to write to (don't use to pipe to console). (used with -c)",
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-		{ wxCMD_LINE_OPTION, wxT_2("d"), wxT_2("display"), wxTRANSLATE(_("Display a contact in the contact information window.")),
+		{ wxCMD_LINE_OPTION, "d", "display", "Display a contact in the contact information window.",
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-		{ wxCMD_LINE_SWITCH, wxT_2("s"), wxT_2("search"), wxTRANSLATE(_("Display the search window instead of starting normally")),
+		{ wxCMD_LINE_SWITCH, "s", "search", "Display the search window instead of starting normally",
 			wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-		{ wxCMD_LINE_SWITCH, wxT_2("v"), wxT_2("version"), wxTRANSLATE(_("Displays version number")),
+		{ wxCMD_LINE_SWITCH, "v", "version", "Displays version number",
 			wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
 		{ wxCMD_LINE_NONE }
 	};
@@ -340,24 +338,11 @@ bool XestiaABApp::OnInit()
 		ContactWindow->SetupContactData(&FileLoadData);
 		ContactWindow->Show(true);
 		
-		/*frmContactEditor *ContactEditor = new frmContactEditor( NULL );
-		ContactEditor->SetupHeaders();
-		ContactEditor->SetMode(TRUE);
-		ContactEditor->LoadContact(wxSContactFilename);
-		ContactEditor->SetIcon(contacticon);
-		ContactEditor->Show(true);*/
-		
 		SetTopWindow(ContactWindow);
 	
 		return true;
     
 	}
-	
-	/*if (!XABArgs.Found(wxT(""))){
-	
-		return false;
-	
-	}*/
     
 	// Setup default settings and accounts if they don't exist.
     
@@ -382,4 +367,4 @@ bool XestiaABApp::OnInit()
    
 	return true;
 
-}
\ No newline at end of file
+}