X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fmain.cpp;h=2140dfd0bf0ba7d987cefc01bc3b1fa1b46383a6;hp=0320085248fe1c23e245277dd1fbbd424c1bfa4d;hb=3ef806261b5482a584e05dc8311c8d7633f146b4;hpb=dd641bd67a5919cc0ff0b90bb2fce9207d8f4463 diff --git a/source/main.cpp b/source/main.cpp index 0320085..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,32 +53,39 @@ IMPLEMENT_APP(XestiaABApp); bool XestiaABApp::OnInit() { +#if defined(__WIN32__) + + PSecurityFunctionTableW SecurityFunctionTbl; + SecurityFunctionTbl = (*InitSecurityInterface)(); + +#endif + // Setup the locale. wxLocale locale; - locale.Init(wxLANGUAGE_DEFAULT, wxLOCALE_LOAD_DEFAULT); + locale.Init(wxLANGUAGE_DEFAULT, wxLOCALE_LOAD_DEFAULT); static const wxCmdLineEntryDesc g_cmdLineDesc [] = { - { wxCMD_LINE_SWITCH, "h", "help", _("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, "e", "edit", _("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, "c", "convert", _("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, "ifmt", NULL, _("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, "ofmt", NULL, _("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, "ifile", NULL, _("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, "ofile", NULL, _("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, "d", "display", _("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, "s", "search", _("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, "v", "version", _("Displays version number"), + { wxCMD_LINE_SWITCH, "v", "version", "Displays version number", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_NONE } }; @@ -356,4 +367,4 @@ bool XestiaABApp::OnInit() return true; -} \ No newline at end of file +}