From 0d5cfdda035d992d9235a172720a8dd62700cf3a Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 25 Jun 2010 22:54:00 +0000 Subject: [PATCH] - updates for application icons --- mk/linux/configuration.xml | 4 ++-- source/g3d_viewer/main.cpp | 11 +++++++++-- source/glest_map_editor/main.cpp | 11 +++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/mk/linux/configuration.xml b/mk/linux/configuration.xml index b4bbb067..99efe1fc 100644 --- a/mk/linux/configuration.xml +++ b/mk/linux/configuration.xml @@ -1,8 +1,8 @@ - <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"> diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp index 7c374c11..60d8affa 100644 --- a/source/g3d_viewer/main.cpp +++ b/source/g3d_viewer/main.cpp @@ -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); diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp index 5740ced8..74335974 100755 --- a/source/glest_map_editor/main.cpp +++ b/source/glest_map_editor/main.cpp @@ -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);