- updates for application icons
This commit is contained in:
parent
15ee2da57f
commit
0d5cfdda03
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" standalone="yes"?>
|
<?xml version="1.0" standalone="yes"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<title value="Mega Glest"/>
|
<title value="Mega Glest"/>
|
||||||
<file-name value="megaglest.ini"/>
|
<file-name value="glest.ini"/>
|
||||||
<icon value="true" path="glest.ico"/>
|
<icon value="true" path="megaglest.ico"/>
|
||||||
<field-groups>
|
<field-groups>
|
||||||
<field-group name="General">
|
<field-group name="General">
|
||||||
<field type="Int">
|
<field type="Int">
|
||||||
|
|
|
@ -115,11 +115,18 @@ MainWindow::MainWindow(const string &modelPath)
|
||||||
|
|
||||||
CreateStatusBar();
|
CreateStatusBar();
|
||||||
|
|
||||||
|
//std::cout << "A" << std::endl;
|
||||||
|
wxInitAllImageHandlers();
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
wxInitAllImageHandlers();
|
//std::cout << "B" << std::endl;
|
||||||
wxIcon icon("IDI_ICON1");
|
wxIcon icon("IDI_ICON1");
|
||||||
SetIcon(icon);
|
#else
|
||||||
|
//std::cout << "B" << std::endl;
|
||||||
|
wxIcon icon;
|
||||||
|
icon.LoadFile(wxT("g3dviewer.ico"),wxBITMAP_TYPE_ICO);
|
||||||
#endif
|
#endif
|
||||||
|
//std::cout << "C" << std::endl;
|
||||||
|
SetIcon(icon);
|
||||||
|
|
||||||
timer = new wxTimer(this);
|
timer = new wxTimer(this);
|
||||||
timer->Start(100);
|
timer->Start(100);
|
||||||
|
|
|
@ -289,11 +289,18 @@ MainWindow::MainWindow()
|
||||||
this->panel->SetSizer(boxsizer);
|
this->panel->SetSizer(boxsizer);
|
||||||
this->Layout();
|
this->Layout();
|
||||||
|
|
||||||
|
//std::cout << "A" << std::endl;
|
||||||
|
wxInitAllImageHandlers();
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
wxInitAllImageHandlers();
|
//std::cout << "B" << std::endl;
|
||||||
wxIcon icon("IDI_ICON1");
|
wxIcon icon("IDI_ICON1");
|
||||||
SetIcon(icon);
|
#else
|
||||||
|
//std::cout << "B" << std::endl;
|
||||||
|
wxIcon icon;
|
||||||
|
icon.LoadFile(wxT("editor.ico"),wxBITMAP_TYPE_ICO);
|
||||||
#endif
|
#endif
|
||||||
|
//std::cout << "C" << std::endl;
|
||||||
|
SetIcon(icon);
|
||||||
|
|
||||||
//#ifndef WIN32
|
//#ifndef WIN32
|
||||||
timer = new wxTimer(this);
|
timer = new wxTimer(this);
|
||||||
|
|
Loading…
Reference in New Issue