Skip to content

Commit 77c1949

Browse files
committed
adding icon for linux
1 parent 5fc3a77 commit 77c1949

File tree

3 files changed

+1236
-3
lines changed

3 files changed

+1236
-3
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
"cinttypes": "cpp",
6565
"*.cpng": "cpp",
6666
"bitset": "cpp",
67-
"codecvt": "cpp"
67+
"codecvt": "cpp",
68+
"*.xpm": "cpp"
6869
}
6970
}

app/daotk_app.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
#include "../app/menu.cpng"
1717
#include "../app/notes_white.cpng"
18+
#ifndef __WXMSW__
19+
#include "../deploy/linux/app.xpm"
20+
#endif
1821

1922
#include <wex/easycurl.h>
2023
#include <wex/metro.h>
@@ -151,8 +154,11 @@ MainWindow::MainWindow()
151154
{
152155
#ifdef __WXMSW__
153156
SetIcon(wxICON(appicon));
157+
#else
158+
SetIcon(app_128_xpm);
154159
#endif
155160

161+
156162
if (g_mainWindow != 0)
157163
wxMessageBox("internal error - only one main window can exist!");
158164
else
@@ -338,7 +344,7 @@ void MainWindow::Save()
338344

339345
rjs::Value jdata;
340346

341-
switch(v->type)
347+
switch(v->type())
342348
{
343349
case lk::vardata_t::NUMBER:
344350
{
@@ -553,7 +559,7 @@ bool MainWindow::Load(const wxString &file)
553559

554560
rjs::Value &jv = D[v->name.c_str()];
555561

556-
switch(v->type)
562+
switch(v->type())
557563
{
558564
case lk::vardata_t::NUMBER:
559565
{

0 commit comments

Comments
 (0)