ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Linux up again. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2372 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-12-20 21:36:44 +00:00
parent 6c75ee61e5
commit 6b930a9cff
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/gui/AppInit.cpp
View File

@ -482,7 +482,9 @@ void Pcsx2App::CleanupMess()
Console.Indent().Error( ex.FormatDiagnosticMessage() ); Console.Indent().Error( ex.FormatDiagnosticMessage() );
} }
#ifdef __WXMSW__
pxDwm_Unload(); pxDwm_Unload();
#endif
// Notice: deleting the plugin manager (unloading plugins) here causes Lilypad to crash, // Notice: deleting the plugin manager (unloading plugins) here causes Lilypad to crash,
// likely due to some pending message in the queue that references lilypad procs. // likely due to some pending message in the queue that references lilypad procs.
@ -558,4 +560,4 @@ struct CrtDebugBreak
//CrtDebugBreak breakAt( 1175 ); //CrtDebugBreak breakAt( 1175 );
#endif #endif

2
pcsx2/gui/ConsoleLogger.cpp
View File

@ -476,7 +476,7 @@ void ConsoleLogFrame::OnActivate( wxActivateEvent& evt )
// with it. (wxWidgets appears to have no equivalent to this) // with it. (wxWidgets appears to have no equivalent to this)
if( MainEmuFrame* mainframe = GetMainFramePtr() ) if( MainEmuFrame* mainframe = GetMainFramePtr() )
MSW_SetWindowAfter( mainframe->GetHWND(), GetHWND() ); MSW_SetWindowAfter( mainframe->GetHandle(), GetHandle() );
evt.Skip(); evt.Skip();
} }

6
pcsx2/gui/MSWstuff.cpp
View File

@ -21,12 +21,14 @@
# include <wx/msw/wrapwin.h> // needed for OutputDebugString # include <wx/msw/wrapwin.h> // needed for OutputDebugString
#endif #endif
#ifdef __WXMSW__
void MSW_SetWindowAfter( WXHWND hwnd, WXHWND hwndAfter ) void MSW_SetWindowAfter( WXHWND hwnd, WXHWND hwndAfter )
{ {
#ifndef __WXMSW__
SetWindowPos( (HWND)hwnd, (HWND)hwndAfter, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE ); SetWindowPos( (HWND)hwnd, (HWND)hwndAfter, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE );
#endif
} }
#else
void MSW_SetWindowAfter( GtkWidget *widget, GtkWidget *widgetAfter ){}
#endif
// Writes text to the Visual Studio Output window (Microsoft Windows only). // Writes text to the Visual Studio Output window (Microsoft Windows only).
// On all other platforms this pipes to StdErr instead. // On all other platforms this pipes to StdErr instead.

6
pcsx2/gui/MSWstuff.h
View File

@ -15,9 +15,15 @@
#pragma once #pragma once
#ifdef __WXMSW__
extern void MSW_SetWindowAfter( WXWidget hwnd, WXWidget hwndAfter ); extern void MSW_SetWindowAfter( WXWidget hwnd, WXWidget hwndAfter );
#else
extern void MSW_SetWindowAfter( GtkWidget *widget, GtkWidget *widgetAfter );
#endif
extern void MSW_OutputDebugString( const wxString& text ); extern void MSW_OutputDebugString( const wxString& text );
extern void pxDwm_Load(); extern void pxDwm_Load();
extern void pxDwm_Unload(); extern void pxDwm_Unload();
extern void pxDwm_SetPresentParams( WXWidget wnd ); extern void pxDwm_SetPresentParams( WXWidget wnd );

2
pcsx2/gui/MainFrame.cpp
View File

@ -456,7 +456,7 @@ void MainEmuFrame::OnActivate( wxActivateEvent& evt )
// window. When one is clicked, the other is assured to be brought to the foreground // window. When one is clicked, the other is assured to be brought to the foreground
// with it. (wxWidgets appears to have no equivalent to this) // with it. (wxWidgets appears to have no equivalent to this)
if( ConsoleLogFrame* logframe = wxGetApp().GetProgramLog() ) if( ConsoleLogFrame* logframe = wxGetApp().GetProgramLog() )
MSW_SetWindowAfter( logframe->GetHWND(), GetHWND() ); MSW_SetWindowAfter( logframe->GetHandle(), GetHandle() );
evt.Skip(); evt.Skip();
} }