mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-11-17 03:24:19 +01:00
Fix Linux up again.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2372 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
1 parent
6c75ee61e5
commit
6b930a9cff
5 files changed
+15
-5
No files matched your search
@@ -482,7 +482,9 @@ void Pcsx2App::CleanupMess()
|
||||
Console.Indent().Error( ex.FormatDiagnosticMessage() );
|
||||
}
|
||||
|
||||
#ifdef __WXMSW__
|
||||
pxDwm_Unload();
|
||||
#endif
|
||||
|
||||
// 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.
|
||||
@@ -558,4 +560,4 @@ struct CrtDebugBreak
|
||||
|
||||
//CrtDebugBreak breakAt( 1175 );
|
||||
|
||||
#endif
|
||||
#endif
|
||||
@@ -476,7 +476,7 @@ void ConsoleLogFrame::OnActivate( wxActivateEvent& evt )
|
||||
// with it. (wxWidgets appears to have no equivalent to this)
|
||||
|
||||
if( MainEmuFrame* mainframe = GetMainFramePtr() )
|
||||
MSW_SetWindowAfter( mainframe->GetHWND(), GetHWND() );
|
||||
MSW_SetWindowAfter( mainframe->GetHandle(), GetHandle() );
|
||||
|
||||
evt.Skip();
|
||||
}
|
||||
|
||||
@@ -21,12 +21,14 @@
|
||||
# include <wx/msw/wrapwin.h> // needed for OutputDebugString
|
||||
#endif
|
||||
|
||||
#ifdef __WXMSW__
|
||||
void MSW_SetWindowAfter( WXHWND hwnd, WXHWND hwndAfter )
|
||||
{
|
||||
#ifndef __WXMSW__
|
||||
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).
|
||||
// On all other platforms this pipes to StdErr instead.
|
||||
|
||||
@@ -15,9 +15,15 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifdef __WXMSW__
|
||||
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 pxDwm_Load();
|
||||
extern void pxDwm_Unload();
|
||||
extern void pxDwm_SetPresentParams( WXWidget wnd );
|
||||
|
||||
@@ -456,7 +456,7 @@ void MainEmuFrame::OnActivate( wxActivateEvent& evt )
|
||||
// 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)
|
||||
if( ConsoleLogFrame* logframe = wxGetApp().GetProgramLog() )
|
||||
MSW_SetWindowAfter( logframe->GetHWND(), GetHWND() );
|
||||
MSW_SetWindowAfter( logframe->GetHandle(), GetHandle() );
|
||||
|
||||
evt.Skip();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user