- updates for application icons
This commit is contained in:
parent
15ee2da57f
commit
0d5cfdda03
|
@ -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">
|
||||
|
|
|
@ -115,11 +115,18 @@ MainWindow::MainWindow(const string &modelPath)
|
|||
|
||||
CreateStatusBar();
|
||||
|
||||
#ifdef WIN32
|
||||
//std::cout << "A" << std::endl;
|
||||
wxInitAllImageHandlers();
|
||||
#ifdef WIN32
|
||||
//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);
|
||||
|
|
|
@ -289,11 +289,18 @@ MainWindow::MainWindow()
|
|||
this->panel->SetSizer(boxsizer);
|
||||
this->Layout();
|
||||
|
||||
#ifdef WIN32
|
||||
//std::cout << "A" << std::endl;
|
||||
wxInitAllImageHandlers();
|
||||
#ifdef WIN32
|
||||
//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);
|
||||
|
|
Loading…
Reference in New Issue