Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- updates for application icons

This commit is contained in:
Mark Vejvoda 2010-06-25 22:54:00 +00:00
parent 15ee2da57f
commit 0d5cfdda03
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/linux/configuration.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" standalone="yes"?>
<configuration>
<title value="Mega Glest"/>
<file-name value="megaglest.ini"/>
<icon value="true" path="glest.ico"/>
<file-name value="glest.ini"/>
<icon value="true" path="megaglest.ico"/>
<field-groups>
<field-group name="General">
<field type="Int">

11
source/g3d_viewer/main.cpp
View File

@ -115,11 +115,18 @@ MainWindow::MainWindow(const string &modelPath)
CreateStatusBar();
//std::cout << "A" << std::endl;
wxInitAllImageHandlers();
#ifdef WIN32
wxInitAllImageHandlers();
//std::cout << "B" << std::endl;
wxIcon icon("IDI_ICON1");
SetIcon(icon);
#else
//std::cout << "B" << std::endl;
wxIcon icon;
icon.LoadFile(wxT("g3dviewer.ico"),wxBITMAP_TYPE_ICO);
#endif
//std::cout << "C" << std::endl;
SetIcon(icon);
timer = new wxTimer(this);
timer->Start(100);

11
source/glest_map_editor/main.cpp
View File

@ -289,11 +289,18 @@ MainWindow::MainWindow()
this->panel->SetSizer(boxsizer);
this->Layout();
//std::cout << "A" << std::endl;
wxInitAllImageHandlers();
#ifdef WIN32
wxInitAllImageHandlers();
//std::cout << "B" << std::endl;
wxIcon icon("IDI_ICON1");
SetIcon(icon);
#else
//std::cout << "B" << std::endl;
wxIcon icon;
icon.LoadFile(wxT("editor.ico"),wxBITMAP_TYPE_ICO);
#endif
//std::cout << "C" << std::endl;
SetIcon(icon);
//#ifndef WIN32
timer = new wxTimer(this);