From dec94518e7461d19510a9025ad2c8503abaf8fe7 Mon Sep 17 00:00:00 2001
From: Sonicadvance1 <sonicadvance1@gmail.com>
Date: Mon, 13 Oct 2008 16:45:17 +0000
Subject: [PATCH] Add CPUCompare variables to INI file and also make the
 gamelist look sexy on all platforms, not just Win32

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@849 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/Config.cpp          | 4 ++++
 Source/Core/DolphinWX/Src/GameListCtrl.cpp    | 8 +-------
 Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/Config.cpp b/Source/Core/DolphinWX/Src/Config.cpp
index 87fdd0f0d5..060606e84e 100644
--- a/Source/Core/DolphinWX/Src/Config.cpp
+++ b/Source/Core/DolphinWX/Src/Config.cpp
@@ -73,6 +73,8 @@ void SConfig::SaveSettings()
 		ini.Set("Core", "DVDRoot",        m_LocalCoreStartupParameter.m_strDVDRoot);
 		ini.Set("Core", "OptimizeQuantizers", m_LocalCoreStartupParameter.bOptimizeQuantizers);
 		ini.Set("Core", "SelectedLanguage", m_LocalCoreStartupParameter.SelectedLanguage);
+		ini.Set("Core", "RunCompareServer", m_LocalCoreStartupParameter.bRunCompareServer);
+		ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient);
 	}
 
 	ini.Save("Dolphin.ini");
@@ -127,5 +129,7 @@ void SConfig::LoadSettings()
 		ini.Get("Core", "DVDRoot",     &m_LocalCoreStartupParameter.m_strDVDRoot);
 		ini.Get("Core", "OptimizeQuantizers", &m_LocalCoreStartupParameter.bOptimizeQuantizers, true);
 		ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage, 0);
+		ini.Get("Core", "RunCompareServer", &m_LocalCoreStartupParameter.bRunCompareServer, false);
+		ini.Get("Core", "RunCompareClient", &m_LocalCoreStartupParameter.bRunCompareClient, false);
 	}
 }
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index e3744d0dbf..3f7d9b07bd 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -354,22 +354,16 @@ bool CGameListCtrl::MSWDrawSubItem(wxPaintDC& rPaintDC, int item, int subitem)
 	return(Result);
 }
 
-#ifdef _WIN32
 wxColour blend50(const wxColour& c1, const wxColour& c2)
 {
 	return(((c1.GetPixel() & 0xFEFEFE) >> 1) + ((c2.GetPixel() & 0xFEFEFE) >> 1) + 0x010101);
 }
-#endif
 
 void CGameListCtrl::SetBackgroundColor()
 {
 	for(long i = 0; i < GetItemCount(); i++)
 	{
-#ifdef _WIN32
-		wxColour color = (i & 1) ? blend50(GetSysColor(COLOR_3DLIGHT), GetSysColor(COLOR_WINDOW)) : GetSysColor(COLOR_WINDOW);
-#else
-		wxColour color = (i & 1) ? 0xFFFFFF : 0xEEEEEE;
-#endif
+		wxColour color = (i & 1) ? blend50(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)) : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 		CGameListCtrl::SetItemBackgroundColour(i, color);
 	}
 }
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
index 47df636869..8c9450493c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
@@ -586,7 +586,7 @@ void OpenGL_Update()
                 rcWindow.right = GLWin.width;
                 rcWindow.bottom = GLWin.height;
                 break;
-            case ClientMessage: //TODO: We aren't reading this correctly, It could be anything, highest change is that it's a close event though
+            case ClientMessage: //TODO: We aren't reading this correctly, It could be anything, highest chance is that it's a close event though
                 Video_Shutdown(); // Calling from here since returning false does nothing
                 return; 
                 break;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 0f6fef6fbb..47cad1cde4 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -253,8 +253,8 @@ bool Renderer::Create2()
 
     g_cgvProf = cgGLGetLatestProfile(CG_GL_VERTEX);
     g_cgfProf = cgGLGetLatestProfile(CG_GL_FRAGMENT);//CG_PROFILE_ARBFP1;
-    //cgGLSetOptimalOptions(g_cgvProf);
-    //cgGLSetOptimalOptions(g_cgfProf);
+    cgGLSetOptimalOptions(g_cgvProf);
+    cgGLSetOptimalOptions(g_cgfProf);
 
     //ERROR_LOG("max buffer sizes: %d %d\n", cgGetProgramBufferMaxSize(g_cgvProf), cgGetProgramBufferMaxSize(g_cgfProf));
     int nenvvertparams, nenvfragparams, naddrregisters[2];