diff options
Diffstat (limited to 'vcl/source/window')
38 files changed, 245 insertions, 375 deletions
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 7f00b73b0808..58f235bea25e 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -29,7 +29,6 @@ #include "precompiled_vcl.hxx" #include <vcl/abstdlg.hxx> -#include "cuilib.hxx" #include <osl/module.hxx> #include <tools/string.hxx> @@ -42,7 +41,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() { FuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; - if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) ) + if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( CUI_DLL_NAME ) ) ) ) fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") ); if ( fp ) diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index be71aa3e02e6..29f6cc16a176 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -28,16 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" #include <tools/list.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif #include <tools/debug.hxx> +#include <tools/rc.h> + #include <vcl/svapp.hxx> -#include <vcl/accel.h> +#include <accel.h> #include <vcl/accel.hxx> -#ifndef _RC_H -#include <tools/rc.h> -#endif diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index 6b30dd3a3c23..0781b50eb37b 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -29,9 +29,10 @@ #include "precompiled_vcl.hxx" #include <tools/list.hxx> #include <tools/debug.hxx> -#include <vcl/accel.h> + +#include <accel.h> #include <vcl/accel.hxx> -#include <vcl/accmgr.hxx> +#include <accmgr.hxx> diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx index f016ef2c053b..90f8bc9a4c1e 100644 --- a/vcl/source/window/arrange.cxx +++ b/vcl/source/window/arrange.cxx @@ -27,9 +27,10 @@ #include "precompiled_vcl.hxx" +#include "svdata.hxx" + #include "vcl/arrange.hxx" #include "vcl/edit.hxx" -#include "vcl/svdata.hxx" #include "vcl/svapp.hxx" #include "com/sun/star/beans/PropertyValue.hpp" diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 79454d8b1fe5..3a00b522952e 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -27,10 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> + +#include <svids.hrc> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> + #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/syswin.hxx> @@ -42,9 +44,8 @@ #include <vcl/virdev.hxx> #include <vcl/help.hxx> #include <vcl/edit.hxx> -#include <vcl/brdwin.hxx> -#include <vcl/window.h> #include <vcl/metric.hxx> + #include <tools/debug.hxx> using namespace ::com::sun::star::uno; diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 4ce3c34d65e4..08132496dc36 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -30,14 +30,13 @@ #include <tools/ref.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> +#include <tools/rc.h> + +#include <svdata.hxx> + #include <vcl/button.hxx> #include <vcl/btndlg.hxx> -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif - // ======================================================================= diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index c59978077412..03648a078193 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -27,14 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <vcl/svapp.hxx> #include <vcl/timer.hxx> #include <vcl/settings.hxx> #include <vcl/window.hxx> -#include <vcl/window.h> -#include <tools/poly.hxx> #include <vcl/cursor.hxx> +#include <window.h> + +#include <tools/poly.hxx> + // ======================================================================= @@ -216,7 +219,7 @@ void Cursor::ImplShow( bool bDrawDirect, bool bRestore ) // ----------------------------------------------------------------------- -bool Cursor::ImplHide() +bool Cursor::ImplHide( bool i_bStopTimer ) { bool bWasCurVisible = false; if ( mpData && mpData->mpWindow ) @@ -225,6 +228,13 @@ bool Cursor::ImplHide() if ( mpData->mbCurVisible ) ImplRestore(); } + + if( mpData && i_bStopTimer ) + { + mpData->maTimer.Stop(); + mpData->mpWindow = NULL; + } + return bWasCurVisible; } @@ -328,13 +338,7 @@ void Cursor::Hide() if ( mbVisible ) { mbVisible = sal_False; - ImplHide(); - - if( mpData ) - { - mpData->maTimer.Stop(); - mpData->mpWindow = NULL; - } + ImplHide( true ); } } diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 73a3bc7eb981..031e947cbf13 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -29,14 +29,14 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + +#include <svdata.hxx> +#include <window.h> +#include <brdwin.hxx> + #include <vcl/svapp.hxx> -#include <vcl/window.h> #include <vcl/event.hxx> -#include <vcl/brdwin.hxx> #include <vcl/wrkwin.hxx> #include <vcl/button.hxx> #include <vcl/mnemonic.hxx> diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 32fc4755a62d..cf49dad4173a 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -27,15 +27,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> -#include <vcl/svdata.hxx> + +#include <svdata.hxx> +#include <window.h> + #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabdlg.hxx> #include <vcl/button.hxx> -#include <vcl/window.h> #include <vcl/unohelp.hxx> #include <com/sun/star/i18n/XCharacterClassification.hpp> diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index e4d5a8c4c0eb..70453d6c4f9a 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -28,13 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/dndevdis.hxx> -#include <vcl/dndlcon.hxx> -#include <vcl/window.h> +#include <dndevdis.hxx> +#include <dndlcon.hxx> +#include <window.h> +#include <svdata.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> + using namespace ::osl; using namespace ::vos; using namespace ::cppu; diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx index 07819e76f957..9d768ad49ac9 100644 --- a/vcl/source/window/dndlcon.cxx +++ b/vcl/source/window/dndlcon.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/dndlcon.hxx> +#include <dndlcon.hxx> using namespace ::cppu; using namespace ::com::sun::star::uno; diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index 6c8519b68a1e..4d1c77ab09b5 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -27,11 +27,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> + #include <vcl/dockingarea.hxx> #include <vcl/syswin.hxx> #include <vcl/menu.hxx> -#include <vcl/svdata.hxx> + +#include <svdata.hxx> #include <map> diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index c59cb4da5dc8..314aa67597b2 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -28,25 +28,24 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <tools/time.hxx> #ifndef _SV_RC_H #include <tools/rc.h> #endif + +#include <brdwin.hxx> +#include <svdata.hxx> +#include <salframe.hxx> +#include <window.h> + #include <vcl/event.hxx> -#include <vcl/brdwin.hxx> #include <vcl/floatwin.hxx> #include <vcl/dockwin.hxx> #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> #include <vcl/timer.hxx> #include <vcl/lineinfo.hxx> -#include <vcl/window.h> #include <vcl/unowrap.hxx> -#include <vcl/salframe.hxx> // ======================================================================= diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index eb16832e5c00..a3caabce0c5c 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -28,23 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <tools/time.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif + #include <vcl/event.hxx> -#include <vcl/brdwin.hxx> #include <vcl/floatwin.hxx> #include <vcl/dockwin.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> #include <vcl/timer.hxx> -#include <vcl/window.h> #include <vcl/unowrap.hxx> -#include <vcl/salframe.hxx> + +#include <svdata.hxx> +#include <window.h> +#include <brdwin.hxx> +#include <salframe.hxx> diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 170fcbd65cee..f8bf9a97d6dd 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -28,21 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/svdata.hxx> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> +#include <salframe.hxx> + #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/brdwin.hxx> #include <vcl/event.hxx> #include <vcl/toolbox.hxx> #include <vcl/floatwin.hxx> -#include <vcl/window.h> -#ifndef _SV_RC_H + #include <tools/rc.h> -#endif -#include <vcl/salframe.hxx> #include <tools/debug.hxx> diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index 03f88adc3566..4ed808852336 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -28,18 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> -#include <vcl/wrkwin.hxx> +#include <vcl/wrkwin.hxx> #include <vcl/bitmap.hxx> -#include <vcl/impbmp.hxx> #include <vcl/introwin.hxx> +#include <impbmp.hxx> +#include <svdata.hxx> +#include <salframe.hxx> diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 968c72abd383..44c0a8b79d0b 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -28,21 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salinst.hxx> -#include <vcl/salframe.hxx> -#include <vcl/svdata.hxx> +#include <salinst.hxx> +#include <salframe.hxx> +#include <svdata.hxx> + #include <vcl/window.hxx> -#ifndef _SV_KEYCOD_HXX #include <vcl/keycod.hxx> -#endif -#ifndef _RC_H #include <tools/rc.h> -#endif - // ======================================================================= diff --git a/vcl/source/window/makefile.mk b/vcl/source/window/makefile.mk deleted file mode 100644 index 1c63376dfda5..000000000000 --- a/vcl/source/window/makefile.mk +++ /dev/null @@ -1,106 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=win -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/arrange.obj \ - $(SLO)$/abstdlg.obj \ - $(SLO)$/accel.obj \ - $(SLO)$/accmgr.obj \ - $(SLO)$/brdwin.obj \ - $(SLO)$/btndlg.obj \ - $(SLO)$/cmdevt.obj \ - $(SLO)$/cursor.obj \ - $(SLO)$/decoview.obj \ - $(SLO)$/dialog.obj \ - $(SLO)$/dlgctrl.obj \ - $(SLO)$/dndevdis.obj \ - $(SLO)$/dndlcon.obj \ - $(SLO)$/dockingarea.obj \ - $(SLO)$/dockmgr.obj \ - $(SLO)$/dockwin.obj \ - $(SLO)$/floatwin.obj \ - $(SLO)$/introwin.obj \ - $(SLO)$/keycod.obj \ - $(SLO)$/keyevent.obj \ - $(SLO)$/mouseevent.obj \ - $(SLO)$/menu.obj \ - $(SLO)$/mnemonic.obj \ - $(SLO)$/mnemonicengine.obj \ - $(SLO)$/msgbox.obj \ - $(SLO)$/popupmenuwindow.obj \ - $(SLO)$/scrwnd.obj \ - $(SLO)$/printdlg.obj \ - $(SLO)$/seleng.obj \ - $(SLO)$/split.obj \ - $(SLO)$/splitwin.obj \ - $(SLO)$/status.obj \ - $(SLO)$/syschild.obj \ - $(SLO)$/javachild.obj \ - $(SLO)$/syswin.obj \ - $(SLO)$/tabdlg.obj \ - $(SLO)$/tabpage.obj \ - $(SLO)$/taskpanelist.obj \ - $(SLO)$/toolbox.obj \ - $(SLO)$/toolbox2.obj \ - $(SLO)$/window.obj \ - $(SLO)$/winproc.obj \ - $(SLO)$/window2.obj \ - $(SLO)$/window3.obj \ - $(SLO)$/window4.obj \ - $(SLO)$/wpropset.obj \ - $(SLO)$/wrkwin.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - -$(INCCOM)$/cuilib.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - @$(RM) $@ - @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE - @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@ -.ENDIF - -$(SLO)$/abstdlg.obj : $(INCCOM)$/cuilib.hxx diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index dda796ba41e4..72715139f699 100755 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -28,38 +28,39 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "svsys.h" -#include "vcl/salinst.hxx" #include "tools/list.hxx" #include "tools/debug.hxx" #include "tools/diagnose_ex.h" -#include "vcl/svdata.hxx" +#include "tools/rc.h" +#include "tools/stream.hxx" + #include "vcl/svapp.hxx" #include "vcl/mnemonic.hxx" #include "vcl/image.hxx" #include "vcl/event.hxx" #include "vcl/help.hxx" -#include "vcl/svids.hrc" #include "vcl/floatwin.hxx" #include "vcl/wrkwin.hxx" #include "vcl/timer.hxx" #include "vcl/sound.hxx" #include "vcl/decoview.hxx" #include "vcl/bitmap.hxx" -#include "tools/rc.h" #include "vcl/menu.hxx" #include "vcl/button.hxx" #include "vcl/gradient.hxx" #include "vcl/i18nhelp.hxx" #include "vcl/taskpanelist.hxx" -#include "vcl/window.h" #include "vcl/controllayout.hxx" #include "vcl/toolbox.hxx" -#include "tools/stream.hxx" -#include "vcl/salmenu.hxx" -#include "vcl/salframe.hxx" #include "vcl/dockingarea.hxx" +#include "salinst.hxx" +#include "svdata.hxx" +#include "svids.hrc" +#include "window.h" +#include "salmenu.hxx" +#include "salframe.hxx" + #include <com/sun/star/uno/Reference.h> #include <com/sun/star/i18n/XCharacterClassification.hpp> diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 6e0c109a564d..9f36b9ed5109 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -28,23 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> +#include <tools/rc.h> + +#include <svids.hrc> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> + #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <vcl/fixed.hxx> #include <vcl/sound.hxx> -#include <vcl/brdwin.hxx> #include <vcl/msgbox.hxx> #include <vcl/button.hxx> -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif #include <vcl/mnemonic.hxx> -#include <vcl/window.h> diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index d38128e04f1e..094567c7f15c 100755 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -27,14 +27,15 @@ #include "precompiled_vcl.hxx" +#include "printdlg.hxx" +#include "svdata.hxx" +#include "svids.hrc" +#include "jobset.h" + #include "vcl/print.hxx" -#include "vcl/prndlg.hxx" #include "vcl/dialog.hxx" #include "vcl/button.hxx" -#include "vcl/svdata.hxx" -#include "vcl/svids.hrc" #include "vcl/wall.hxx" -#include "vcl/jobset.h" #include "vcl/status.hxx" #include "vcl/decoview.hxx" #include "vcl/arrange.hxx" diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 31740214532b..178692ff45c2 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -33,19 +33,12 @@ #include <tools/time.hxx> #include <tools/debug.hxx> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> -#ifndef _VCL_TIMER_HXX +#include <svids.hrc> +#include <svdata.hxx> +#include <scrwnd.hxx> + #include <vcl/timer.hxx> -#endif -#ifndef _VCL_EVENT_HXX #include <vcl/event.hxx> -#endif -#ifndef _VCL_SCRWND_HXX -#include <scrwnd.hxx> -#endif #include <math.h> #include <limits.h> diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 9d7727493490..c92d9dd4130a 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -200,11 +200,7 @@ void SelectionEngine::CursorPosChanging( sal_Bool bShift, sal_Bool bMod1 ) sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { nFlags &= (~SELENG_CMDEVT); - if ( !pFunctionSet || !pWin ) - return sal_False; - const bool bRightClickCursorPositioning = - rMEvt.IsRight() && rMEvt.GetClicks() == 1 && !IsInSelection(); - if ( (rMEvt.GetClicks() > 1 || rMEvt.IsRight()) && !bRightClickCursorPositioning ) + if ( !pFunctionSet || !pWin || rMEvt.GetClicks() > 1 || rMEvt.IsRight() ) return sal_False; sal_uInt16 nModifier = rMEvt.GetModifier() | nLockedMods; diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index face35a179d8..976c56cfea56 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -28,19 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif +#include <tools/poly.hxx> + #include <vcl/event.hxx> #include <vcl/split.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/gradient.hxx> -#include <tools/poly.hxx> #include <vcl/lineinfo.hxx> + #include <rtl/instance.hxx> -#include <vcl/window.h> + +#include <window.h> namespace { diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 3a66ead3944c..1d701752389c 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -29,22 +29,22 @@ #include "precompiled_vcl.hxx" #include <string.h> + #include <tools/list.hxx> #include <tools/debug.hxx> #include <tools/rcid.h> + #include <vcl/event.hxx> #include <vcl/wall.hxx> #include <vcl/bitmap.hxx> #include <vcl/decoview.hxx> #include <vcl/symbol.hxx> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif #include <vcl/image.hxx> -#include <vcl/svdata.hxx> #include <vcl/help.hxx> #include <vcl/splitwin.hxx> +#include <svdata.hxx> +#include <svids.hrc> // ======================================================================= diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index a261b6bd96a7..ee673e87c4b5 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -27,20 +27,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/list.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <vcl/status.hxx> #include <vcl/virdev.hxx> -#include <vcl/window.h> + +#include <svdata.hxx> +#include <window.h> // ======================================================================= diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 9e7a30e983cb..25e693ae72a2 100644..100755 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -28,21 +28,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <svsys.h> #include <rtl/process.h> #include <rtl/ref.hxx> + #include <tools/rc.h> -#include <vcl/window.h> -#include <vcl/salinst.hxx> -#include <vcl/salframe.hxx> + +// declare system types in sysdata.hxx +#include <svsys.h> + #include <vcl/window.hxx> -#include <vcl/salobj.hxx> -#include <vcl/svdata.hxx> #include <vcl/sysdata.hxx> #include <vcl/svapp.hxx> #include <vcl/syschild.hxx> #include <vcl/unohelp.hxx> +#include <window.h> +#include <salinst.hxx> +#include <salframe.hxx> +#include <salobj.hxx> +#include <svdata.hxx> + #ifdef SOLAR_JAVA #include <jni.h> #endif @@ -53,8 +58,6 @@ #include <com/sun/star/java/XJavaThreadRegister_11.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <vcl/syschild.hxx> - using namespace ::com::sun::star; // ======================================================================= @@ -240,6 +243,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) { sal_IntPtr nRet = 0; + (void)bUseJava; #if defined WNT nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd ); #elif defined QUARTZ diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 48c7629c2026..3313402dfef6 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -29,16 +29,8 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> -#include <vcl/svdata.hxx> #include <vcl/svapp.hxx> -#include <vcl/brdwin.hxx> #include <vcl/menu.hxx> -#include <vcl/window.h> -#include <vcl/brdwin.hxx> #include <vcl/sound.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> @@ -46,6 +38,10 @@ #include <vcl/taskpanelist.hxx> #include <vcl/unowrap.hxx> +#include <salframe.hxx> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index dcb95b9b52a2..459e07f97042 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -29,20 +29,17 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/event.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> #include <vcl/bitmapex.hxx> -#include <com/sun/star/accessibility/XAccessible.hpp> - +#include <svdata.hxx> +#include <com/sun/star/accessibility/XAccessible.hpp> // ======================================================================= diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 71a8f2ec2a30..f4f40f6722bf 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -27,11 +27,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/svdata.hxx> + #include <tools/rcid.h> -#include <vcl/dockwin.hxx> +#include <vcl/dockwin.hxx> #include <vcl/taskpanelist.hxx> + +#include <svdata.hxx> + #include <functional> #include <algorithm> diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 105cf18bb43a..682c65e47a6f 100644..100755 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <rtl/logfile.hxx> + #include <tools/list.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> +#include <tools/poly.hxx> + #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/accel.hxx> @@ -48,14 +44,18 @@ #include <vcl/virdev.hxx> #include <vcl/spin.h> #include <vcl/toolbox.hxx> -#include <vcl/toolbox.h> #include <vcl/bitmap.hxx> -#include <tools/poly.hxx> -#include <vcl/salframe.hxx> #include <vcl/mnemonic.hxx> #include <vcl/gradient.hxx> #include <vcl/menu.hxx> -#include <vcl/window.h> + +#include <svdata.hxx> +#include <window.h> +#include <toolbox.h> +#include <salframe.hxx> +#if defined WNT +#include <svsys.h> +#endif #include <string.h> #include <vector> diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index c993c9143a2c..fd6fb5dffb6b 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -27,26 +27,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/list.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <vcl/bitmap.hxx> #include <vcl/toolbox.hxx> -#include <vcl/toolbox.h> #include <vcl/mnemonic.hxx> #include <vcl/menu.hxx> -#include <vcl/brdwin.hxx> - #include <vcl/unohelp.hxx> +#include <vcl/ImageListProvider.hxx> + +#include <svdata.hxx> +#include <brdwin.hxx> +#include <toolbox.h> + #include <unotools/confignode.hxx> -#include <vcl/ImageListProvider.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> using namespace vcl; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 96e787928772..ac7101f079c0 100644..100755 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -27,48 +27,58 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include "svsys.h" -#endif -#include "vcl/salframe.hxx" -#include "vcl/salobj.hxx" -#include "vcl/salinst.hxx" -#include "vcl/salgtype.hxx" -#include "vcl/salgdi.hxx" -#include "vcl/unohelp.hxx" #include "tools/time.hxx" #include "tools/debug.hxx" -#ifndef _SV_RC_H #include "tools/rc.h" -#endif -#include "vcl/svdata.hxx" -#include "vcl/dbggui.hxx" -#include "vcl/outfont.hxx" -#include "vcl/outdev.h" -#include "vcl/region.h" + +#include "unotools/fontcfg.hxx" +#include "unotools/confignode.hxx" + +#include "vcl/unohelp.hxx" +#include "vcl/salgtype.hxx" #include "vcl/event.hxx" #include "vcl/help.hxx" #include "vcl/cursor.hxx" #include "vcl/svapp.hxx" -#include "vcl/window.h" #include "vcl/window.hxx" #include "vcl/syswin.hxx" #include "vcl/syschild.hxx" -#include "vcl/brdwin.hxx" -#include "vcl/helpwin.hxx" #include "vcl/dockwin.hxx" #include "vcl/menu.hxx" #include "vcl/wrkwin.hxx" #include "vcl/wall.hxx" #include "vcl/gradient.hxx" -#include "vcl/toolbox.h" -#include "unotools/fontcfg.hxx" -#include "vcl/sysdata.hxx" -#include "vcl/sallayout.hxx" #include "vcl/salctype.hxx" -#include "vcl/button.hxx" // Button::GetStandardText +#include "vcl/button.hxx" #include "vcl/taskpanelist.hxx" +#include "vcl/dialog.hxx" +#include "vcl/unowrap.hxx" +#include "vcl/gdimtf.hxx" +#include "vcl/pdfextoutdevdata.hxx" +#include "vcl/lazydelete.hxx" + +// declare system types in sysdata.hxx +#include "svsys.h" +#include "vcl/sysdata.hxx" + +#include "salframe.hxx" +#include "salobj.hxx" +#include "salinst.hxx" +#include "salgdi.hxx" +#include "svdata.hxx" +#include "dbggui.hxx" +#include "outfont.hxx" +#include "window.h" +#include "toolbox.h" +#include "outdev.h" +#include "region.h" +#include "brdwin.hxx" +#include "helpwin.hxx" +#include "sallayout.hxx" +#include "dndlcon.hxx" +#include "dndevdis.hxx" + #include "com/sun/star/awt/XWindowPeer.hpp" #include "com/sun/star/rendering/XCanvas.hpp" #include "com/sun/star/rendering/XSpriteCanvas.hpp" @@ -85,16 +95,6 @@ #include "com/sun/star/accessibility/XAccessible.hpp" #include "com/sun/star/accessibility/AccessibleRole.hpp" -#include "vcl/dialog.hxx" -#include "vcl/unowrap.hxx" -#include "vcl/dndlcon.hxx" -#include "vcl/dndevdis.hxx" -#include "unotools/confignode.hxx" -#include "vcl/gdimtf.hxx" - -#include "vcl/pdfextoutdevdata.hxx" -#include "vcl/lazydelete.hxx" - #include <set> #include <typeinfo> @@ -2407,7 +2407,7 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) { bool bRestoreCursor = false; if ( mpWindowImpl->mpCursor ) - bRestoreCursor = mpWindowImpl->mpCursor->ImplHide(); + bRestoreCursor = mpWindowImpl->mpCursor->ImplHide( false ); mbInitClipRegion = sal_True; mpWindowImpl->mbInPaint = sal_True; @@ -2896,7 +2896,7 @@ void Window::ImplScroll( const Rectangle& rRect, ImplInvalidateAllOverlapBackgrounds(); if ( mpWindowImpl->mpCursor ) - mpWindowImpl->mpCursor->ImplHide(); + mpWindowImpl->mpCursor->ImplHide( false ); sal_uInt16 nOrgFlags = nFlags; if ( !(nFlags & (SCROLL_CHILDREN | SCROLL_NOCHILDREN)) ) @@ -4073,7 +4073,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) { // Cursor hiden if ( pOldFocusWindow->mpWindowImpl->mpCursor ) - pOldFocusWindow->mpWindowImpl->mpCursor->ImplHide(); + pOldFocusWindow->mpWindowImpl->mpCursor->ImplHide( true ); } // !!!!! Wegen altem SV-Office Activate/Deavtivate Handling @@ -8054,7 +8054,7 @@ void Window::SetCursor( Cursor* pCursor ) if ( mpWindowImpl->mpCursor != pCursor ) { if ( mpWindowImpl->mpCursor ) - mpWindowImpl->mpCursor->ImplHide(); + mpWindowImpl->mpCursor->ImplHide( true ); mpWindowImpl->mpCursor = pCursor; if ( pCursor ) pCursor->ImplShow(); @@ -9703,7 +9703,7 @@ sal_Bool Window::IsNativeWidgetEnabled() const } #ifdef WNT // see #140456# -#include <salframe.h> +#include <win/salframe.h> #endif uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscreenSize, diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 669fce05a791..2513170a4d25 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -29,31 +29,28 @@ #include "precompiled_vcl.hxx" #include <limits.h> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salbmp.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/salframe.hxx> + #include <tools/debug.hxx> -#include <vcl/svdata.hxx> -#include <vcl/impbmp.hxx> +#include <tools/poly.hxx> + #include <vcl/bitmap.hxx> #include <vcl/event.hxx> #include <vcl/timer.hxx> #include <vcl/metric.hxx> -#include <vcl/outfont.hxx> -#include <vcl/outdev.h> -#include <tools/poly.hxx> #include <vcl/virdev.hxx> -#include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/scrbar.hxx> -#ifndef _SV_SCRWND_HXX -#include <scrwnd.hxx> -#endif #include <vcl/dockwin.hxx> +#include <window.h> +#include <outfont.hxx> +#include <outdev.h> +#include <svdata.hxx> +#include <impbmp.hxx> +#include <salbmp.hxx> +#include <salgdi.hxx> +#include <salframe.hxx> +#include <scrwnd.hxx> // ======================================================================= diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx index 577a573c2015..775249c450ee 100644 --- a/vcl/source/window/window4.cxx +++ b/vcl/source/window/window4.cxx @@ -28,10 +28,11 @@ #include "precompiled_vcl.hxx" #include "vcl/window.hxx" -#include "vcl/window.h" -#include "vcl/svdata.hxx" #include "vcl/arrange.hxx" +#include "window.h" +#include "svdata.hxx" + #include "com/sun/star/beans/PropertyValue.hpp" #include <map> diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 795bea17a3b9..6522856bb05d 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -28,40 +28,37 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salwtype.hxx> -#include <vcl/salframe.hxx> #include <tools/debug.hxx> -#ifndef _INTN_HXX -//#include <tools/intn.hxx> -#endif + +#include <unotools/localedatawrapper.hxx> + #include <vcl/i18nhelp.hxx> #include <vcl/unohelp.hxx> -#include <unotools/localedatawrapper.hxx> -#include <vcl/svdata.hxx> -#include <vcl/dbggui.hxx> #include <vcl/timer.hxx> #include <vcl/event.hxx> #include <vcl/sound.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/cursor.hxx> -#include <vcl/accmgr.hxx> -#include <vcl/print.h> -#include <vcl/window.h> #include <vcl/wrkwin.hxx> #include <vcl/floatwin.hxx> #include <vcl/dialog.hxx> #include <vcl/help.hxx> -#include <vcl/helpwin.hxx> -#include <vcl/brdwin.hxx> #include <vcl/dockwin.hxx> -#include <vcl/salgdi.hxx> #include <vcl/menu.hxx> -#include <vcl/dndlcon.hxx> +#include <svdata.hxx> +#include <dbggui.hxx> +#include <salwtype.hxx> +#include <salframe.hxx> +#include <accmgr.hxx> +#include <print.h> +#include <window.h> +#include <helpwin.hxx> +#include <brdwin.hxx> +#include <salgdi.hxx> +#include <dndlcon.hxx> + #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> #include <com/sun/star/awt/MouseEvent.hpp> @@ -1799,7 +1796,7 @@ IMPL_LINK( Window, ImplAsyncFocusHdl, void*, EMPTYARG ) pSVData->maWinData.mpFocusWin = NULL; if ( pFocusWin->ImplGetWindowImpl()->mpCursor ) - pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide(); + pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true ); // Deaktivate rufen Window* pOldFocusWindow = pFocusWin; @@ -1906,7 +1903,7 @@ static void ImplHandleLoseFocus( Window* pWindow ) Window* pFocusWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; if ( pFocusWin && pFocusWin->ImplGetWindowImpl()->mpCursor ) - pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide(); + pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true ); if( bCallDirect ) pWindow->ImplAsyncFocusHdl( NULL ); } diff --git a/vcl/source/window/wpropset.cxx b/vcl/source/window/wpropset.cxx index fcb0c560291e..10e3e8fa5e2f 100644 --- a/vcl/source/window/wpropset.cxx +++ b/vcl/source/window/wpropset.cxx @@ -30,7 +30,8 @@ #include "vcl/wpropset.hxx" #include "vcl/window.hxx" #include "vcl/vclevent.hxx" -#include "vcl/svdata.hxx" + +#include "svdata.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/beans/PropertyValue.hpp" diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 81c2b36345eb..0e667de73067 100644..100755 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -28,22 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> -#include <vcl/brdwin.hxx> -#include <vcl/window.h> #include <vcl/wrkwin.hxx> +// declare system types in sysdata.hxx +#include <svsys.h> #include <vcl/sysdata.hxx> +#include <svdata.hxx> +#include <salframe.hxx> +#include <brdwin.hxx> +#include <window.h> + // ======================================================================= #define WORKWIN_WINDOWSTATE_FULLSCREEN ((sal_uLong)0x00010000) |