wxgui [Linux]: Updated project files, fixed docking logic.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1532 96395faa-99c1-11dd-bbfe-3dabce05a288

pcsx2/Linux/pcsx2.cbp

@@ -215,7 +215,6 @@
 		<Unit filename="../RecoverySystem.cpp" />
 		<Unit filename="../SPR.cpp" />
 		<Unit filename="../SPR.h" />
-		<Unit filename="../SafeArray.h" />
 		<Unit filename="../SamplProf.h" />
 		<Unit filename="../SaveState.cpp" />
 		<Unit filename="../SaveState.h" />
@@ -231,7 +230,6 @@
 		<Unit filename="../StringUtils.h" />
 		<Unit filename="../System.cpp" />
 		<Unit filename="../System.h" />
-		<Unit filename="../Threading.h" />
 		<Unit filename="../Utilities/AsciiFile.h" />
 		<Unit filename="../Utilities/FileUtils.cpp" />
 		<Unit filename="../Utilities/folderdesc.txt" />
@@ -251,8 +249,6 @@
 		<Unit filename="../Vif.h" />
 		<Unit filename="../VifDma.cpp" />
 		<Unit filename="../VifDma.h" />
-		<Unit filename="../gui/AboutBoxDialog.cpp" />
-		<Unit filename="../gui/AboutBoxDialog.h" />
 		<Unit filename="../gui/AdvancedDialog.cpp" />
 		<Unit filename="../gui/AdvancedDialog.h" />
 		<Unit filename="../gui/App.h" />
@@ -260,16 +256,16 @@
 		<Unit filename="../gui/CheckedStaticBox.cpp" />
 		<Unit filename="../gui/CheckedStaticBox.h" />
 		<Unit filename="../gui/ConsoleLogger.cpp" />
+		<Unit filename="../gui/Dialogs/AboutBoxDialog.cpp" />
 		<Unit filename="../gui/Dialogs/ConfigurationDialog.cpp" />
 		<Unit filename="../gui/Dialogs/ConfigurationDialog.h" />
+		<Unit filename="../gui/Dialogs/LogOptionsDialog.cpp" />
+		<Unit filename="../gui/Dialogs/LogOptionsDialog.h" />
 		<Unit filename="../gui/Dialogs/ModalPopups.h" />
 		<Unit filename="../gui/Dialogs/PickUserModeDialog.cpp" />
-		<Unit filename="../gui/GameFixesDialog.h" />
 		<Unit filename="../gui/HostGui.cpp" />
 		<Unit filename="../gui/IniInterface.cpp" />
 		<Unit filename="../gui/IniInterface.h" />
-		<Unit filename="../gui/LogOptionsDialog.cpp" />
-		<Unit filename="../gui/LogOptionsDialog.h" />
 		<Unit filename="../gui/MainFrame.cpp" />
 		<Unit filename="../gui/MainFrame.h" />
 		<Unit filename="../gui/Panels/AudioPanel.cpp" />
@@ -290,7 +286,6 @@
 		<Unit filename="../gui/Resources/ConfigIcon_Video.h" />
 		<Unit filename="../gui/Resources/EmbeddedImage.h" />
 		<Unit filename="../gui/Resources/ps2_silver.h" />
-		<Unit filename="../gui/SpeedHacksDialog.h" />
 		<Unit filename="../gui/i18n.cpp" />
 		<Unit filename="../gui/i18n.h" />
 		<Unit filename="../gui/main.cpp" />
@@ -339,9 +334,6 @@
 		<Unit filename="../x86/iR5900Shift.h" />
 		<Unit filename="../x86/iVU0micro.cpp" />
 		<Unit filename="../x86/iVU1micro.cpp" />
-		<Unit filename="../x86/iVUmicro.h" />
-		<Unit filename="../x86/iVUops.h" />
-		<Unit filename="../x86/iVUzerorec.h" />
 		<Unit filename="../x86/iVif.cpp" />
 		<Unit filename="../x86/ir5900tables.cpp" />
 		<Unit filename="../x86/ix86-32/aR5900-32.S" />
@@ -357,33 +349,8 @@
 		<Unit filename="../x86/ix86-32/iR5900Shift.cpp" />
 		<Unit filename="../x86/ix86-32/iR5900Templates.cpp" />
 		<Unit filename="../x86/ix86-32/recVTLB.cpp" />
-		<Unit filename="../x86/ix86/implement/dwshift.h" />
-		<Unit filename="../x86/ix86/implement/group1.h" />
-		<Unit filename="../x86/ix86/implement/group2.h" />
-		<Unit filename="../x86/ix86/implement/group3.h" />
-		<Unit filename="../x86/ix86/implement/incdec.h" />
-		<Unit filename="../x86/ix86/implement/jmpcall.h" />
-		<Unit filename="../x86/ix86/implement/movs.h" />
-		<Unit filename="../x86/ix86/implement/test.h" />
-		<Unit filename="../x86/ix86/implement/xchg.h" />
-		<Unit filename="../x86/ix86/implement/xmm/arithmetic.h" />
-		<Unit filename="../x86/ix86/implement/xmm/basehelpers.h" />
-		<Unit filename="../x86/ix86/implement/xmm/comparisons.h" />
-		<Unit filename="../x86/ix86/implement/xmm/moremovs.h" />
-		<Unit filename="../x86/ix86/implement/xmm/shufflepack.h" />
-		<Unit filename="../x86/ix86/ix86.h" />
-		<Unit filename="../x86/ix86/ix86_inlines.inl" />
-		<Unit filename="../x86/ix86/ix86_instructions.h" />
-		<Unit filename="../x86/ix86/ix86_internal.h" />
-		<Unit filename="../x86/ix86/ix86_legacy_instructions.h" />
-		<Unit filename="../x86/ix86/ix86_legacy_internal.h" />
-		<Unit filename="../x86/ix86/ix86_legacy_types.h" />
-		<Unit filename="../x86/ix86/ix86_sse_helpers.h" />
-		<Unit filename="../x86/ix86/ix86_types.h" />
-		<Unit filename="../x86/ix86/ix86_writers.inl" />
 		<Unit filename="../x86/microVU.cpp" />
 		<Unit filename="../x86/microVU.h" />
-		<Unit filename="../x86/microVU_Alloc.h" />
 		<Unit filename="../x86/microVU_Alloc.inl" />
 		<Unit filename="../x86/microVU_Analyze.inl" />
 		<Unit filename="../x86/microVU_Compile.inl" />

pcsx2/gui/ConsoleLogger.cpp

@@ -170,6 +170,7 @@ void ConsoleLogFrame::OnMoveAround( wxMoveEvent& evt )
 		wxRect snapzone( topright - wxSize( 8,8 ), wxSize( 16,16 ) );
 
 		g_Conf->ConLogBox.AutoDock = snapzone.Contains( GetPosition() );
+		Console::WriteLn( "DockCheck: %d", params g_Conf->ConLogBox.AutoDock );
 		if( g_Conf->ConLogBox.AutoDock )
 		{
 			SetPosition( topright + wxSize( 1,0 ) );
@@ -201,9 +202,9 @@ void ConsoleLogFrame::OnOpen(wxMenuEvent& WXUNUSED(event))
 
 void ConsoleLogFrame::OnClose( wxMenuEvent& event )
 {
-	
 	DoClose();
 }
+
 void ConsoleLogFrame::OnCloseWindow(wxCloseEvent& event)
 {
 	if( event.CanVeto() )
@@ -275,6 +276,7 @@ void ConsoleLogFrame::OnSetTitle( wxCommandEvent& event )
 
 void ConsoleLogFrame::OnDockedMove( wxCommandEvent& event )
 {
+	Console::Error( "Dock Message: %d, %d", params g_Conf->ConLogBox.DisplayPosition.x, g_Conf->ConLogBox.DisplayPosition.y );
 	if( g_Conf != NULL )
 		SetPosition( g_Conf->ConLogBox.DisplayPosition );
 }

pcsx2/gui/MainFrame.cpp

@@ -174,17 +174,23 @@ void MainEmuFrame::OnCloseWindow(wxCloseEvent& evt)
 
 void MainEmuFrame::OnMoveAround( wxMoveEvent& evt )
 {
+	// wxGTK note: X sends gratuitous amounts of OnMove messages for various crap actions
+	// like selecting or deselecting a window, which muck up docking logic.  We filter them
+	// out using 'lastpos' here. :)
+
+	static wxPoint lastpos( wxDefaultCoord, wxDefaultCoord );
+
+	if( lastpos == evt.GetPosition() ) return;
+	lastpos = evt.GetPosition();
 	if( g_Conf->ConLogBox.AutoDock )
 	{
 		g_Conf->ConLogBox.DisplayPosition = GetRect().GetTopRight();
-
+		wxCommandEvent conevt( wxEVT_DockConsole );
-		// Send the move event our window ID, which allows the logbox to know that this
+		wxGetApp().ProgramLog_PostEvent( conevt );
-		// move event comes from us, and needs a special handler.
-		wxCommandEvent evt( wxEVT_DockConsole );
-		wxGetApp().ConsoleLog_PostEvent( evt );
 	}
 
-	g_Conf->MainGuiPosition = GetPosition();
+	Console::Error( "XWindows Messages Suck: %d, %d", params GetPosition().x, GetPosition().y );
+	g_Conf->MainGuiPosition = evt.GetPosition();
 
 	//evt.Skip();
 }

pcsx2/x86/microVU_Log.inl

@@ -48,7 +48,9 @@ microVUx(void) __mVUdumpProgram(int progIndex) {
 	int bPC		= iPC;
 	mVUbranch	= 0;
 
-	sprintf(str, "%s\\microVU%d prog - %02d.html", LOGS_DIR, vuIndex, progIndex);
+	// fixme: This needs recdone using wxFile and wxString
+
+	sprintf(str, "%s\\microVU%d prog - %02d.html", "logs", vuIndex, progIndex);
 	mVU->logFile = fopen(str, "w");
 
 	mVUlog("<html>\n");