diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-07-28 14:18:26 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:44 +0100 |
| commit | 4a7e3482912c90b73d6e12c82bcd9ce31975e3f1 (patch) | |
| tree | 2ffbfc6c706da67e58d186a97f01a24c3b9dbceb /vcl/win | |
| parent | e07157265c56b13c3ad8a61cdcec01a1d3557d66 (diff) | |
re-write gtksys to use the cleaner GdkScreen API avoiding X & Xinerama
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/app/salinfo.cxx | 6 | ||||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index 67b23e9c2b91..03d1810b081a 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -243,11 +243,7 @@ int WinSalSystem::ShowNativeMessageBox(const String& rTitle, const String& rMess nDefaultButton <= SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO) nFlags |= DEFAULT_BTN_MAPPING_TABLE[nButtonCombination][nDefaultButton]; - //#107209 hide the splash screen if active - ImplSVData* pSVData = ImplGetSVData(); - if (pSVData->mpIntroWindow) - pSVData->mpIntroWindow->Hide(); - + ImplHideSplash(); return MessageBoxW( 0, reinterpret_cast<LPCWSTR>(rMessage.GetBuffer()), diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 488ff4749d65..5c6bee5f717f 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -5730,9 +5730,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP if ( WM_USER_SYSTEM_WINDOW_ACTIVATED == nMsg ) { - if (pSVData->mpIntroWindow) - pSVData->mpIntroWindow->Hide(); - + ImplHideSplash(); return 0; } @@ -5918,10 +5916,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP ImplSVData* pSVData = ImplGetSVData(); pSVData->maAppData.mnModalMode++; - // #106431#, hide SplashScreen - if( pSVData->mpIntroWindow ) - pSVData->mpIntroWindow->Hide(); - + ImplHideSplash(); if( pWin ) { pWin->EnableInput( FALSE, TRUE, TRUE, NULL ); |