spek

commit dcec7595f7b55c829d22d0c04c7179f591e1c9e6
parent 68989c8b6fd6ccda53ccd14766de5dee78663ead
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date:   Sun, 19 Aug 2012 13:17:29 -0700

Fix compilation under wx28

Diffstat:
M
src/spek-window.cc
 | 
2
+-
M
src/spek.cc
 | 
6
++++--

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/spek-window.cc b/src/spek-window.cc
@@ -36,7 +36,7 @@ SpekWindow::SpekWindow(const wxString& path) :
 {
     SetTitle(_("Spek - Acoustic Spectrum Analyser"));
     // TODO: test on all platforms
-    SetIcon(wxIcon(wxT("spek")));
+    //SetIcon(wxIcon(wxT("spek")));
 
     wxMenuBar *menu = new wxMenuBar();
 
diff --git a/src/spek.cc b/src/spek.cc
@@ -68,8 +68,10 @@ bool Spek::OnInit()
             wxT_2("FILE"),
             wxCMD_LINE_VAL_STRING,
             wxCMD_LINE_PARAM_OPTIONAL
-        },
-        wxCMD_LINE_DESC_END
+        }, {
+            // TODO: use wxCMD_LINE_DESC_END after settling on wx29.
+            wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0
+        }
     };
 
     wxCmdLineParser parser(desc, argc, argv);