diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 14:32:53 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 14:32:53 +0000 |
| commit | 74e86de7258d7ee5ea2c7259e885bfa4d1cddfbc (patch) | |
| tree | 401c070945151a9d2fe9ea5e135d2e1d82ef5bbb | |
| parent | d828ca83ebeea4b2aa24ec2f0456d600697bcd05 (diff) | |
INTEGRATION: CWS syswinshape (1.3.4); FILE MERGED
2006/10/20 15:32:14 pl 1.3.4.6: solved a merge problem
2006/10/20 13:33:45 pl 1.3.4.5: RESYNC: (1.3-1.5); FILE MERGED
2006/10/19 14:41:41 pl 1.3.4.4: #i69275# we do not want the bubble window to get the focus
2006/10/16 09:03:46 dv 1.3.4.3: #i69275# Bubble window now a system window
2006/10/13 15:17:07 pl 1.3.4.2: #i69275# use ownerdraw as workaround
2006/10/12 09:45:18 dv 1.3.4.1: #i69275# Bubble window now becomes a system window
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 5f1a42c57..7e869cbda 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -4,9 +4,9 @@ * * $RCSfile: updatecheckui.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2006-11-01 10:13:25 $ + * last change: $Author: vg $ $Date: 2006-11-01 15:32:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -146,7 +146,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void Paint( const Rectangle& rRect ); void Resize(); - void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); + void Show( BOOL bVisible = TRUE, USHORT nFlags = SHOW_NOACTIVATE ); void SetTipPosPixel( const Point& rTipPos ) { maTipPos = rTipPos; } }; @@ -718,7 +718,9 @@ IMPL_LINK( UpdateCheckUI, WaitTimeOutHdl, Timer*, EMPTYARG ) mpBubbleWin = GetBubbleWindow(); if ( mpBubbleWin ) + { mpBubbleWin->Show(); + } return 0; } @@ -779,7 +781,10 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) //------------------------------------------------------------------------------ BubbleWindow::BubbleWindow( Window* pParent, const XubString& rTitle, const XubString& rText, const Image& rImage ) - : FloatingWindow( pParent, 0 ) + : FloatingWindow( pParent, WB_SYSTEMWINDOW + | WB_OWNERDRAWDECORATION + | WB_NOBORDER + ) { maMaxTextSize = Size( TEXT_MAX_WIDTH, TEXT_MAX_HEIGHT ); maBubbleTitle = rTitle; |