Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frmContactEditorNickname: Implemented priority control
[xestiaab/.git]
/
source
/
main.cpp
diff --git
a/source/main.cpp
b/source/main.cpp
index
0320085
..
3de7a64
100644
(file)
--- a/
source/main.cpp
+++ b/
source/main.cpp
@@
-1,6
+1,6
@@
// main.cpp - Main subroutine (application start).
//
// main.cpp - Main subroutine (application start).
//
-// (c) 2012-201
5
Xestia Software Development.
+// (c) 2012-201
7
Xestia Software Development.
//
// This file is part of Xestia Address Book.
//
//
// This file is part of Xestia Address Book.
//
@@
-39,6
+39,10
@@
#include "common/defaults.h"
#include "common/dirs.h"
#include "common/defaults.h"
#include "common/dirs.h"
+#if defined(__WIN32__)
+#include "common/win32ssl.h"
+#endif
+
class XestiaABApp: public wxApp
{
virtual bool OnInit();
class XestiaABApp: public wxApp
{
virtual bool OnInit();
@@
-49,6
+53,13
@@
IMPLEMENT_APP(XestiaABApp);
bool XestiaABApp::OnInit()
{
bool XestiaABApp::OnInit()
{
+#if defined(__WIN32__)
+
+ PSecurityFunctionTableW SecurityFunctionTbl;
+ SecurityFunctionTbl = (*InitSecurityInterface)();
+
+#endif
+
// Setup the locale.
wxLocale locale;
// Setup the locale.
wxLocale locale;
@@
-56,25
+67,25
@@
bool XestiaABApp::OnInit()
static const wxCmdLineEntryDesc g_cmdLineDesc [] =
{
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_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_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_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_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_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_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_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_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_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 }
};
wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_NONE }
};
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy