Remove the global namespace a bit and remove some dead code.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7043 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Src/ConfigMain.h

@@ -181,8 +181,8 @@ private:
 	wxRadioBox* DSPEngine;
 	wxSlider*	VolumeSlider;
 	wxStaticText* VolumeText;    
-    wxCheckBox*	EnableDTKMusic;
-    wxCheckBox*	EnableThrottle;
+	wxCheckBox*	EnableDTKMusic;
+	wxCheckBox*	EnableThrottle;
 	wxArrayString wxArrayBackends;
 	wxChoice*	BackendSelection;
 	wxChoice*	FrequencySelection;
@@ -278,7 +278,6 @@ private:
 	void OnSpin(wxSpinEvent& event);
 
 	void AudioSettingsChanged(wxCommandEvent& event);
-	bool SupportsVolumeChanges(std::string backend);
 	void AddAudioBackends();
 
 	void GCSettingsChanged(wxCommandEvent& event);
@@ -295,6 +294,9 @@ private:
 	void DVDRootChanged(wxFileDirPickerEvent& event);
 	void ApploaderPathChanged(wxFileDirPickerEvent& WXUNUSED (event));
 
+private:
 	DECLARE_EVENT_TABLE();
+
+	static bool SupportsVolumeChanges(std::string backend);
 };
 #endif

Source/Core/DolphinWX/Src/FrameTools.cpp

@@ -229,10 +229,14 @@ void CFrame::CreateMenu()
 	viewMenu->AppendCheckItem(IDM_TOGGLE_STATUSBAR, _("Show &Statusbar"));
 	viewMenu->Check(IDM_TOGGLE_STATUSBAR, SConfig::GetInstance().m_InterfaceStatusbar);
 	viewMenu->AppendSeparator();
-	viewMenu->AppendCheckItem(IDM_LOGWINDOW, _("Show &Logwindow"));
+	viewMenu->AppendCheckItem(IDM_LOGWINDOW, _("Show &Log"));
 	viewMenu->AppendCheckItem(IDM_CONSOLEWINDOW, _("Show &Console"));
 	viewMenu->AppendSeparator();
 
+#ifndef _WIN32
+	viewMenu->Enable(IDM_CONSOLEWINDOW, false);
+#endif
+
 	if (g_pCodeWindow)
 	{
 		viewMenu->Check(IDM_LOGWINDOW, g_pCodeWindow->bShowOnStart[0]);

Source/Core/DolphinWX/Src/Main.cpp

@@ -304,15 +304,18 @@ bool DolphinApp::OnInit()
 	int w = SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth;
 	int h = SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight;
 
-	// The following is not needed in linux.  Linux window managers do not allow windows to
-	// be created off the desktop.
+	// The following is not needed with X11, where window managers
+	// do not allow windows to be created off the desktop.
 #ifdef _WIN32
 	// Out of desktop check
 	HWND hDesktop = GetDesktopWindow();
 	RECT rc;
 	GetWindowRect(hDesktop, &rc);
 	if (rc.right < x + w || rc.bottom < y + h)
-		x = y = -1;
+		x = y = wxDefaultCoord;
+#elif defined __APPLE__
+	if (y < 1)
+		y = wxDefaultCoord;
 #endif
 
 	main_frame = new CFrame((wxFrame*)NULL, wxID_ANY,
@@ -412,11 +415,6 @@ void DolphinApp::InitLanguageSupport()
 	}
 }
 
-void DolphinApp::OnEndSession()
-{
-	SConfig::GetInstance().SaveSettings();
-}
-
 int DolphinApp::OnExit()
 {
 	WiimoteReal::Shutdown();

Source/Core/DolphinWX/Src/Main.h

@@ -29,7 +29,6 @@ public:
 
 private:
 	bool OnInit();
-	void OnEndSession();
 	int OnExit();
 	void OnFatalException();
 	void InitLanguageSupport();

Source/Core/DolphinWX/Src/MemcardManager.cpp

@@ -274,7 +274,7 @@ void CMemcardManager::CreateGUIControls()
 
 void CMemcardManager::OnClose(wxCloseEvent& WXUNUSED (event))
 {
-	Destroy();
+	Close();
 }
 
 void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event)

Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp

@@ -17,10 +17,7 @@
 #include "GCMemcard.h"
 #include "ColorUtil.h"
 
-// i think there is support for this stuff in the common lib... if not there should be support
-
-// undefined functions... prolly it means something like that
-void ByteSwap(u8 *valueA, u8 *valueB)
+static void ByteSwap(u8 *valueA, u8 *valueB)
 {
 	u8 tmp = *valueA;
 	*valueA = *valueB;