diff options
| author | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2009-11-17 14:28:34 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2009-11-17 14:28:34 +0100 |
| commit | c0ef0690c273ca70456418dce4f5c6cdabc42f09 (patch) | |
| tree | 1d83f07361dba977ea0a3227fb7f62803ba7c2bc /vcl/source | |
| parent | d12dff9041a47602e6a655a67dacddcfd9cbe86b (diff) | |
| parent | 24534f00dd8799b3c2b2365ccd8c0009e19cddd5 (diff) | |
#i106541# commit afer merge
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/makefile.mk | 6 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/window/makefile.mk b/vcl/source/window/makefile.mk index cdd4aef73bb0..169cf44b2b13 100644 --- a/vcl/source/window/makefile.mk +++ b/vcl/source/window/makefile.mk @@ -96,10 +96,10 @@ SLOFILES= \ $(INCCOM)$/cuilib.hxx: makefile.mk .IF "$(GUI)"=="UNX" - $(RM) $@ - echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@ + @$(RM) $@ + @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@ .ELSE - echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@ + @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@ .ENDIF $(SLO)$/abstdlg.obj : $(INCCOM)$/cuilib.hxx diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 6aff4779d8b2..63bf407ce49f 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -6514,7 +6514,7 @@ void Window::Show( BOOL bVisible, USHORT nFlags ) // nach vorne, wenn es gewuenscht ist if ( ImplIsOverlapWindow() && !(nFlags & SHOW_NOACTIVATE) ) { - ImplStartToTop( 0 ); + ImplStartToTop(( nFlags & SHOW_FOREGROUNDTASK ) ? TOTOP_FOREGROUNDTASK : 0 ); ImplFocusToTop( 0, FALSE ); } |