Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiacalendar
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f0e3327
)
main.cpp: Exit on -h and load application icon.
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Sat, 26 Nov 2016 22:58:15 +0000
(22:58 +0000)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Sat, 26 Nov 2016 22:58:15 +0000
(22:58 +0000)
source/main.cpp
patch
|
blob
|
history
diff --git
a/source/main.cpp
b/source/main.cpp
index
849a52c
..
2faffa9
100644
(file)
--- a/
source/main.cpp
+++ b/
source/main.cpp
@@
-27,6
+27,7
@@
#include <curl/curl.h>
#include "version.h"
#include <curl/curl.h>
#include "version.h"
+#include "bitmaps.h"
#include "forms/main/frmMain.h"
class XestiaCALApp: public wxApp
#include "forms/main/frmMain.h"
class XestiaCALApp: public wxApp
@@
-39,6
+40,8
@@
IMPLEMENT_APP(XestiaCALApp);
bool XestiaCALApp::OnInit()
{
bool XestiaCALApp::OnInit()
{
+ wxInitAllImageHandlers();
+
static const wxCmdLineEntryDesc g_cmdLineDesc [] =
{
{ wxCMD_LINE_SWITCH, "h", "help", "Displays help on command line parameters",
static const wxCmdLineEntryDesc g_cmdLineDesc [] =
{
{ wxCMD_LINE_SWITCH, "h", "help", "Displays help on command line parameters",
@@
-56,6
+59,14
@@
bool XestiaCALApp::OnInit()
wxCmdLineParser XCALArgs (g_cmdLineDesc, argc, argv);
XCALArgs.Parse();
wxCmdLineParser XCALArgs (g_cmdLineDesc, argc, argv);
XCALArgs.Parse();
+ if (XCALArgs.Found(wxT("h"))){
+
+ // Print out the list of help commands.
+
+ return false;
+
+ }
+
if (XCALArgs.Found(wxT("v"))){
// Print out the version number.
if (XCALArgs.Found(wxT("v"))){
// Print out the version number.
@@
-66,6
+77,15
@@
bool XestiaCALApp::OnInit()
}
frmMain *frame = new frmMain( NULL );
}
frmMain *frame = new frmMain( NULL );
+
+ wxMemoryInputStream istream(bigimgs_appicon48_png, sizeof(bigimgs_appicon48_png));
+ wxImage bigimgs_appicon48i(istream, wxBITMAP_TYPE_PNG);
+ wxBitmap appiconbmp(bigimgs_appicon48i, -1);
+ wxIcon appicon;
+
+ appicon.CopyFromBitmap(appiconbmp);
+
+ frame->SetIcon(appicon);
frame->Show(true);
SetTopWindow(frame);
frame->Show(true);
SetTopWindow(frame);
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy