1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
diff --git a/TimingApp.cpp b/TimingApp.cpp
index ed78990..e2b5509 100644
--- a/TimingApp.cpp
+++ b/TimingApp.cpp
@@ -63,7 +63,7 @@ bool TimingApp::OnInit()
{ wxCMD_LINE_OPTION, _T("i"), _T("input"), _T("input dir") },
{ wxCMD_LINE_OPTION, _T("s"), _T("size"), _T("output block size"), wxCMD_LINE_VAL_NUMBER },
{ wxCMD_LINE_OPTION, _T("d"), _T("date"), _T("output file date"), wxCMD_LINE_VAL_DATE },*/
- { wxCMD_LINE_PARAM, NULL, NULL, _T("input file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE|wxCMD_LINE_PARAM_OPTIONAL },
+ { wxCMD_LINE_PARAM, NULL, NULL,wxT_2("input file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE|wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_NONE }
};
parser.SetDesc(cmdLineDesc);
diff --git a/TimingSubFrame.cpp b/TimingSubFrame.cpp
index 016d529..c85ef6e 100644
--- a/TimingSubFrame.cpp
+++ b/TimingSubFrame.cpp
@@ -13,8 +13,6 @@ TimingSubFrame::TimingSubFrame(wxDocument *doc, wxView* view, wxMDIParentFrame *
#ifdef __WXMSW__
SetIcon(wxIcon(_T("wxwinicon")));
- #else
- SetIcon(wxIcon(_T("wxwinicon.xpm")));
#endif
/// Make a menubar
diff --git a/TimingView.cpp b/TimingView.cpp
index 7940225..dd4bad2 100644
--- a/TimingView.cpp
+++ b/TimingView.cpp
@@ -36,7 +36,7 @@
#endif
#include <wx/clipbrd.h>
-#include <wx/svg/dcsvg.h>
+#include <wx/dcsvg.h>
#include <wx/dcps.h>
#include <wx/filename.h>
|