From a69d19542c2dd43138f3035c997abdab7c7b66d6 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 23 Oct 2006 09:34:45 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=11339 --- checkin_notes | 11 +++++++++++ clientgui/SkinManager.cpp | 4 ++-- mac_build/boinc.xcodeproj/project.pbxproj | 6 ------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/checkin_notes b/checkin_notes index d2289303a1..8a253d6a13 100755 --- a/checkin_notes +++ b/checkin_notes @@ -11392,3 +11392,14 @@ Rom 22 Oct 2006 clientgui/ <*.cpp> + +Charlie 21 Oct 2006 + - Mac: Removed sg_SkinClass.cpp/h from XCode project. + - Fixed incorrect assignments of m_iconApplicationDisconnectedIcon and + m_iconApplicationSnoozeIcon. + + clientgui/ + SkinManager.cpp + mac_build/ + boinc.xcodeproj/ + project.pbxproj diff --git a/clientgui/SkinManager.cpp b/clientgui/SkinManager.cpp index f8b52ba332..74f0ba14fe 100644 --- a/clientgui/SkinManager.cpp +++ b/clientgui/SkinManager.cpp @@ -913,8 +913,8 @@ bool CSkinAdvanced::ValidateSkin() { } if (!m_iconApplicationSnoozeIcon.Ok()) { fprintf(stderr, wxT("Skin Manager: Failed to load application snooze icon. Using default.\n")); - m_iconApplicationDisconnectedIcon = wxIcon((const char**)boincsnooze_xpm); - wxASSERT(m_iconApplicationDisconnectedIcon.Ok()); + m_iconApplicationSnoozeIcon = wxIcon((const char**)boincsnooze_xpm); + wxASSERT(m_iconApplicationSnoozeIcon.Ok()); } if (!m_bitmapApplicationLogo.Ok()) { fprintf(stderr, wxT("Skin Manager: Failed to load application logo. Using default.\n")); diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 25d7120533..412fa037e8 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -169,7 +169,6 @@ DD3E15250A774397007E0084 /* sg_BoincSimpleGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDCAD7D10A6C603A0086C7EE /* sg_BoincSimpleGUI.cpp */; }; DD3E15260A774397007E0084 /* sg_DlgPreferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDCAD7D30A6C603A0086C7EE /* sg_DlgPreferences.cpp */; }; DD3E15270A774397007E0084 /* sg_ImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDCAD7D50A6C603A0086C7EE /* sg_ImageLoader.cpp */; }; - DD3E15280A774397007E0084 /* sg_SkinClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDCAD7D70A6C603A0086C7EE /* sg_SkinClass.cpp */; }; DD3E15290A774397007E0084 /* sg_StatImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDCAD7D90A6C603A0086C7EE /* sg_StatImageLoader.cpp */; }; DD3E152A0A774397007E0084 /* sg_ViewTabPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDCAD7DB0A6C603A0086C7EE /* sg_ViewTabPage.cpp */; }; DD3E152B0A774397007E0084 /* wxAnimate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDCE782E0A70BD55008218B6 /* wxAnimate.cpp */; }; @@ -1168,8 +1167,6 @@ DDCAD7D40A6C603A0086C7EE /* sg_DlgPreferences.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sg_DlgPreferences.h; path = ../clientgui/sg_DlgPreferences.h; sourceTree = SOURCE_ROOT; }; DDCAD7D50A6C603A0086C7EE /* sg_ImageLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = sg_ImageLoader.cpp; path = ../clientgui/sg_ImageLoader.cpp; sourceTree = SOURCE_ROOT; }; DDCAD7D60A6C603A0086C7EE /* sg_ImageLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sg_ImageLoader.h; path = ../clientgui/sg_ImageLoader.h; sourceTree = SOURCE_ROOT; }; - DDCAD7D70A6C603A0086C7EE /* sg_SkinClass.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = sg_SkinClass.cpp; path = ../clientgui/sg_SkinClass.cpp; sourceTree = SOURCE_ROOT; }; - DDCAD7D80A6C603A0086C7EE /* sg_SkinClass.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sg_SkinClass.h; path = ../clientgui/sg_SkinClass.h; sourceTree = SOURCE_ROOT; }; DDCAD7D90A6C603A0086C7EE /* sg_StatImageLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = sg_StatImageLoader.cpp; path = ../clientgui/sg_StatImageLoader.cpp; sourceTree = SOURCE_ROOT; }; DDCAD7DA0A6C603A0086C7EE /* sg_StatImageLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sg_StatImageLoader.h; path = ../clientgui/sg_StatImageLoader.h; sourceTree = SOURCE_ROOT; }; DDCAD7DB0A6C603A0086C7EE /* sg_ViewTabPage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = sg_ViewTabPage.cpp; path = ../clientgui/sg_ViewTabPage.cpp; sourceTree = SOURCE_ROOT; }; @@ -1574,8 +1571,6 @@ DD4C56130AD389A2009E23C6 /* sg_SGUIListControl.h */, DD4C56140AD389A2009E23C6 /* sg_StaticLine.cpp */, DD4C56150AD389A2009E23C6 /* sg_StaticLine.h */, - DDCAD7D70A6C603A0086C7EE /* sg_SkinClass.cpp */, - DDCAD7D80A6C603A0086C7EE /* sg_SkinClass.h */, DDCAD7D90A6C603A0086C7EE /* sg_StatImageLoader.cpp */, DDCAD7DA0A6C603A0086C7EE /* sg_StatImageLoader.h */, DDCAD7DB0A6C603A0086C7EE /* sg_ViewTabPage.cpp */, @@ -2697,7 +2692,6 @@ DD3E15250A774397007E0084 /* sg_BoincSimpleGUI.cpp in Sources */, DD3E15260A774397007E0084 /* sg_DlgPreferences.cpp in Sources */, DD3E15270A774397007E0084 /* sg_ImageLoader.cpp in Sources */, - DD3E15280A774397007E0084 /* sg_SkinClass.cpp in Sources */, DD3E15290A774397007E0084 /* sg_StatImageLoader.cpp in Sources */, DD3E152A0A774397007E0084 /* sg_ViewTabPage.cpp in Sources */, DD3E152B0A774397007E0084 /* wxAnimate.cpp in Sources */,