Deal with some clang-inspired buglets.

Respect the initial fullscreen setting in nowx.


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

Source/Core/Core/Src/Core.cpp

@@ -193,14 +193,14 @@ void Stop()  // - Hammertime!
 	g_bStopping = true;
 	g_video_backend->EmuStateChange(EMUSTATE_CHANGE_STOP);
 
-	WARN_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutting down ----");	
+	INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutting down ----");	
 
 	Host_SetWaitCursor(true);  // hourglass!
 	if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN)
 		return;
 
 	// Stop the CPU
-	WARN_LOG(CONSOLE, "%s", StopMessage(true, "Stop CPU").c_str());
+	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stop CPU").c_str());
 	PowerPC::Stop();
 	CCPU::StepOpcode();  // Kick it if it's waiting (code stepping wait loop)
 
@@ -225,7 +225,7 @@ void Stop()  // - Hammertime!
 	// Update mouse pointer
 	Host_SetWaitCursor(false);
 
-	WARN_LOG(CONSOLE, "%s", StopMessage(true, "Stopping Emu thread ...").c_str());
+	INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stopping Emu thread ...").c_str());
 	g_EmuThread.join();	// Wait for emuthread to close. 
 }
 

Source/Core/DolphinWX/Src/CheatsWindow.cpp

@@ -488,7 +488,8 @@ void CheatSearchTab::UpdateCheatSearchResultsList()
 {
 	lbox_search_results->Clear();
 
-	wxString count_label = _("Count:") + wxString::Format(wxT(" %i"), search_results.size());
+	wxString count_label = _("Count:") + wxString::Format(wxT(" %lu"),
+		(unsigned long)search_results.size());
 	if (search_results.size() > MAX_CHEAT_SEARCH_RESULTS_DISPLAY)
 	{
 		count_label += _(" (too many to display)");

Source/Core/DolphinWX/Src/MemcardManager.cpp

@@ -97,10 +97,6 @@ BEGIN_EVENT_TABLE(CMemcardManager, wxDialog)
 	EVT_MENU_RANGE(COLUMN_BANNER, NUMBER_OF_COLUMN, CMemcardManager::OnMenuChange)
 END_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(CMemcardManager::CMemcardListCtrl, wxListCtrl)
-	EVT_RIGHT_DOWN(CMemcardManager::CMemcardListCtrl::OnRightClick)
-END_EVENT_TABLE()
-
 CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
 	: wxDialog(parent, id, title, position, size, style)
 {
@@ -111,7 +107,7 @@ CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString
 	{
 		itemsPerPage = 16;
 		mcmSettings.usePages = true;
-		for (int i = 0; i < NUMBER_OF_COLUMN; i++)
+		for (int i = COLUMN_BANNER; i < NUMBER_OF_COLUMN; i++)
 		{
 			mcmSettings.column[i] = (i <= COLUMN_FIRSTBLOCK)? true:false;
 		}
@@ -191,7 +187,7 @@ void CMemcardManager::CreateGUIControls()
 
 	m_ConvertToGci = new wxButton(this, ID_CONVERTTOGCI, _("Convert to GCI"));
 	
-	for (int slot = SLOT_A; slot < SLOT_B + 1; slot++)
+	for (int slot = SLOT_A; slot <= SLOT_B; slot++)
 	{
 		m_CopyFrom[slot]	= new wxButton(this, ID_COPYFROM_A + slot,
 			wxString::Format(_("%1$sCopy%1$s"), ARROW[slot ? 0 : 1]));
@@ -256,7 +252,7 @@ void CMemcardManager::CreateGUIControls()
 	Fit();
 	Center();
 
-	for (int i = SLOT_A; i < SLOT_B + 1; i++)
+	for (int i = SLOT_A; i <= SLOT_B; i++)
 	{
 		m_PrevPage[i]->Disable();
 		m_NextPage[i]->Disable();
@@ -274,7 +270,7 @@ void CMemcardManager::CreateGUIControls()
 
 void CMemcardManager::OnClose(wxCloseEvent& WXUNUSED (event))
 {
-	Close();
+	EndModal(wxID_OK);
 }
 
 void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event)
@@ -758,7 +754,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
 
 	delete[] images;
 	// Automatic column width and then show the list
-	for (int i = 0; i < NUMBER_OF_COLUMN; i++)
+	for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++)
 	{
 		if (mcmSettings.column[i])
 			m_MemcardList[card]->SetColumnWidth(i, wxLIST_AUTOSIZE);
@@ -767,7 +763,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
 	}
 
 	m_MemcardList[card]->Show();
-	wxLabel.Printf(_("%d Free Blocks; %d Free Dir Entries"),
+	wxLabel.Printf(_("%u Free Blocks; %u Free Dir Entries"),
 		memoryCard[card]->GetFreeBlocks(), DIRLEN - nFiles);
 	t_Status[card]->SetLabel(wxLabel);
 
@@ -812,13 +808,15 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
 		
 		popupMenu->AppendSeparator();
 
-		popupMenu->AppendCheckItem(COLUMN_BANNER, _("Show save banner"));
+//		popupMenu->AppendCheckItem(COLUMN_BANNER, _("Show save banner"));
 		popupMenu->AppendCheckItem(COLUMN_TITLE, _("Show save title"));
 		popupMenu->AppendCheckItem(COLUMN_COMMENT, _("Show save comment"));
 		popupMenu->AppendCheckItem(COLUMN_ICON, _("Show save icon"));
 		popupMenu->AppendCheckItem(COLUMN_BLOCKS, _("Show save blocks"));
+		popupMenu->AppendCheckItem(COLUMN_FIRSTBLOCK, _("Show first block"));
 
-		for (int i = COLUMN_BANNER; i <= COLUMN_BLOCKS; i++)
+//		for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++)
+		for (int i = COLUMN_TITLE; i <= COLUMN_FIRSTBLOCK; i++)
 		{
 			popupMenu->FindItem(i)->Check(__mcmSettings.column[i]);
 		}

Source/Core/DolphinWX/Src/MemcardManager.h

@@ -137,22 +137,35 @@ class CMemcardManager : public wxDialog
 
 		struct _mcmSettings
 		{
-			bool twoCardsLoaded,
+			bool twoCardsLoaded;
-				 usePages,
+			bool usePages;
-				 column[NUMBER_OF_COLUMN+1];
+			bool column[NUMBER_OF_COLUMN + 1];
 		} mcmSettings;
 
 		class CMemcardListCtrl : public wxListCtrl
 		{
+//BEGIN_EVENT_TABLE(CMemcardManager::CMemcardListCtrl, wxListCtrl)
+//      EVT_RIGHT_DOWN(CMemcardManager::CMemcardListCtrl::OnRightClick)
+//END_EVENT_TABLE()
 		public:
-			CMemcardListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style, _mcmSettings& _mcmSetngs)
+			CMemcardListCtrl(wxWindow* parent, const wxWindowID id,
-				: wxListCtrl(parent, id, pos, size, style),	__mcmSettings(_mcmSetngs){;}
+				const wxPoint& pos, const wxSize& size,
-			~CMemcardListCtrl(){;}
+				long style, _mcmSettings& _mcmSetngs)
+				: wxListCtrl(parent, id, pos, size, style)
+				, __mcmSettings(_mcmSetngs)
+			{
+				Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(
+					CMemcardListCtrl::OnRightClick));
+			}
+			~CMemcardListCtrl()
+			{
+				Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(
+					CMemcardListCtrl::OnRightClick));
+			}
 			_mcmSettings & __mcmSettings;
 			bool prevPage,
 				 nextPage;
 		private:
-			DECLARE_EVENT_TABLE()
 			void OnRightClick(wxMouseEvent& event);	
 		};
 		

Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp

@@ -338,6 +338,8 @@ bool OpenGL_Create(int _iwidth, int _iheight)
 		GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
 
 #elif defined(__APPLE__)
+	NSRect size;
+	NSUInteger style = NSMiniaturizableWindowMask;
 	NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 };
 	NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc]
 		initWithAttributes: attr];
@@ -354,15 +356,29 @@ bool OpenGL_Create(int _iwidth, int _iheight)
 		return NULL;
 	}
 
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) {
+		size = [[NSScreen mainScreen] frame];
+		style |= NSBorderlessWindowMask;
+	} else {
+		size = NSMakeRect(_tx, _ty, _twidth, _theight);
+		style |= NSResizableWindowMask | NSTitledWindowMask;
+	}
+
 	(void)VideoWindowHandle;
+	GLWin.cocoaWin = [[NSWindow alloc] initWithContentRect: size
+		styleMask: style backing: NSBackingStoreBuffered defer: NO];
+	if (GLWin.cocoaWin == nil) {
+		ERROR_LOG(VIDEO, "failed to create window");
+		return NULL;
+	}
+
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) {
 		CGDisplayCapture(CGMainDisplayID());
-	GLWin.cocoaWin = [[NSWindow alloc]
-		initWithContentRect: [[NSScreen mainScreen] frame]
-		styleMask: NSBorderlessWindowMask
-		backing: NSBackingStoreBuffered defer: NO];
-	[GLWin.cocoaWin makeKeyAndOrderFront: nil];
 		[GLWin.cocoaWin setLevel: CGShieldingWindowLevel()];
+	}
+
 	[GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]];
+	[GLWin.cocoaWin makeKeyAndOrderFront: nil];
 
 #elif defined(_WIN32)
 	VideoWindowHandle() = (void*)EmuWindow::Create((HWND)VideoWindowHandle(), GetModuleHandle(0), _T("Please wait..."));

Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp

@@ -133,7 +133,7 @@ inline s16 Clamp1024(s16 in)
      return in>1023?1023:(in<-1024?-1024:in);
 }
 
-inline void Tev::SetRasColor(int colorChan, int swaptable)
+void Tev::SetRasColor(int colorChan, int swaptable)
 {
     switch(colorChan)
     {

Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp

@@ -116,7 +116,7 @@ void TransformNormal(const InputVertexData *src, bool nbt, OutputVertexData *dst
     }    
 }
 
-inline void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool specialCase, const InputVertexData *srcVertex, OutputVertexData *dstVertex)
+void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool specialCase, const InputVertexData *srcVertex, OutputVertexData *dstVertex)
 {
     const Vec3 *src;
     switch (texinfo.sourcerow)