diff options
Diffstat (limited to 'vcl/win/source')
22 files changed, 180 insertions, 476 deletions
diff --git a/vcl/win/source/app/MAKEFILE.MK b/vcl/win/source/app/MAKEFILE.MK deleted file mode 100644 index 9b3237567eff..000000000000 --- a/vcl/win/source/app/MAKEFILE.MK +++ /dev/null @@ -1,53 +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=salapp -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -CFLAGS += -DWINVER=0x0400 - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/salshl.obj \ - $(SLO)$/saldata.obj \ - $(SLO)$/salinst.obj \ - $(SLO)$/saltimer.obj \ - $(SLO)$/salinfo.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx index 1eb897b55b8d..4faaf7bd4def 100644..100755 --- a/vcl/win/source/app/saldata.cxx +++ b/vcl/win/source/app/saldata.cxx @@ -27,11 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <tools/svwin.h> + +#include "tools/svwin.h" #include "rtl/tencinfo.h" -#include <saldata.hxx> -#include <vcl/svapp.hxx> +#include "vcl/svapp.hxx" +#include "win/saldata.hxx" // ======================================================================= diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index c635fdfc9845..431e9ca9c15f 100644..100755 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -34,28 +34,20 @@ #define WINVER 0x0500 #endif -#define VCL_NEED_BASETSD -#include "tools/presys.h" -#if defined _MSC_VER -#pragma warning(push, 1) -#endif -#include <windows.h> -#include <winuser.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif -#include "tools/postsys.h" +#include "svsys.h" +#include "rtl/ustrbuf.hxx" -#include "tools/string.hxx" -#include "salsys.h" -#include "salframe.h" -#include "salinst.h" -#include "saldata.hxx" #include "tools/debug.hxx" -#include "vcl/svdata.hxx" +#include "tools/string.hxx" + #include "vcl/window.hxx" -#include "rtl/ustrbuf.hxx" +#include "win/salsys.h" +#include "win/salframe.h" +#include "win/salinst.h" +#include "win/saldata.hxx" + +#include "svdata.hxx" #include <hash_map> diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 05cb20750abd..1e5a306d852d 100755 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -36,23 +36,28 @@ #ifdef __MINGW32__ #include <excpt.h> #endif + #include <osl/file.hxx> + #include <vos/mutex.hxx> + +#include <tools/solarmutex.hxx> #include <tools/debug.hxx> -#include <wincomp.hxx> -#include <salids.hrc> -#include <saldata.hxx> -#include <salinst.h> -#include <salframe.h> -#include <salobj.h> -#include <vcl/salsys.hxx> -#include <saltimer.h> -#include <vcl/apptypes.hxx> -#include <salbmp.h> -#include <vcl/salimestatus.hxx> + #include <vcl/timer.hxx> -#include <wincomp.hxx> // CS_DROPSHADOW -#include <tools/solarmutex.hxx> +#include <vcl/apptypes.hxx> + +#include <win/wincomp.hxx> +#include <win/salids.hrc> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salframe.h> +#include <win/salobj.h> +#include <win/saltimer.h> +#include <win/salbmp.h> + +#include <salimestatus.hxx> +#include <salsys.hxx> #ifndef min #define min(a,b) (((a) < (b)) ? (a) : (b)) diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index 578b3cb804bd..427f2092a0dc 100644..100755 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -27,9 +27,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <tools/svwin.h> -#include <saldata.hxx> + #include <tools/debug.hxx> +#include <tools/svwin.h> +#include <win/saldata.hxx> // ======================================================================= diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx index 6026f80e6346..f0b88a8e381c 100644..100755 --- a/vcl/win/source/app/saltimer.cxx +++ b/vcl/win/source/app/saltimer.cxx @@ -31,9 +31,9 @@ #ifdef __MINGW32__ #include <excpt.h> #endif -#include <saldata.hxx> -#include <saltimer.h> -#include <salinst.h> +#include <win/saldata.hxx> +#include <win/saltimer.h> +#include <win/salinst.h> // ======================================================================= diff --git a/vcl/win/source/gdi/MAKEFILE.MK b/vcl/win/source/gdi/MAKEFILE.MK deleted file mode 100644 index 7489be633f2b..000000000000 --- a/vcl/win/source/gdi/MAKEFILE.MK +++ /dev/null @@ -1,69 +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=salgdi - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -.IF "$(COM)"=="GCC" -.ELSE -CFLAGS += -DWINVER=0x0400 -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/salgdi.obj \ - $(SLO)$/salgdi2.obj \ - $(SLO)$/salgdi3.obj \ - $(SLO)$/salgdi_gdiplus.obj \ - $(SLO)$/salvd.obj \ - $(SLO)$/salprn.obj \ - $(SLO)$/salbmp.obj \ - $(SLO)$/winlayout.obj \ - $(SLO)$/wntgdi.obj \ - $(SLO)$/salnativewidgets-luna.obj - - -EXCEPTIONSFILES= $(SLO)$/salprn.obj - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -CFLAGS+=-DENABLE_GRAPHITE -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 8be85d210bd6..3dc176ae23b8 100644..100755 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -27,13 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <vcl/salbtype.hxx> -#include <salgdi.h> -#include <saldata.hxx> -#include <salbmp.h> + #include <vcl/bitmap.hxx> // for BitmapSystemData +#include <vcl/salbtype.hxx> + +#include <win/wincomp.hxx> +#include <win/salgdi.h> +#include <win/saldata.hxx> +#include <win/salbmp.h> + #include <string.h> // ----------- diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 73d93d42dd03..bc2f8ade3ccc 100755..100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -30,17 +30,22 @@ #include <stdio.h> #include <string.h> + +#include <rtl/strbuf.hxx> + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salgdi.h> #include <tools/debug.hxx> -#include <salframe.h> #include <tools/poly.hxx> + #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <rtl/strbuf.hxx> -#include <vcl/region.h> + +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salgdi.h> +#include <win/salframe.h> + +#include <region.h> using namespace rtl; diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index dc3368c26912..5ac117a596d9 100755..100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -30,16 +30,16 @@ #include <string.h> #include <stdlib.h> + #include <tools/svwin.h> #include <tools/debug.hxx> -#include <wincomp.hxx> -#include <salbmp.h> -#include <saldata.hxx> -#ifndef _SV_SALIDS_HRC -#include <salids.hrc> -#endif -#include <salgdi.h> -#include <salframe.h> + +#include <win/wincomp.hxx> +#include <win/salbmp.h> +#include <win/saldata.hxx> +#include <win/salids.hrc> +#include <win/salgdi.h> +#include <win/salframe.h> bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const { diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index eded1a8f7aaf..86f6ad0f4af1 100755 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -31,25 +31,6 @@ #include <string.h> #include <malloc.h> -#include <tools/prewin.h> -#include <windows.h> -#include <tools/postwin.h> -#include <vcl/sysdata.hxx> -#include "tools/svwin.h" - -#include "wincomp.hxx" -#include "saldata.hxx" -#include "salgdi.h" - -#include "vcl/svapp.hxx" -#include "vcl/outfont.hxx" -#include "vcl/font.hxx" -#include "vcl/fontsubset.hxx" -#include "vcl/sallayout.hxx" - -#include "vcl/outdev.h" // for ImplGlyphFallbackFontSubstitution -#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL - #include "rtl/logfile.hxx" #include "rtl/tencinfo.h" #include "rtl/textcvt.h" @@ -62,15 +43,34 @@ #include "osl/thread.hxx" #include "osl/process.h" +#include "basegfx/polygon/b2dpolygon.hxx" +#include "basegfx/polygon/b2dpolypolygon.hxx" +#include "basegfx/matrix/b2dhommatrix.hxx" +#include "basegfx/matrix/b2dhommatrixtools.hxx" + +#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL + +#include "vcl/font.hxx" +#include "vcl/svapp.hxx" + #include "tools/poly.hxx" #include "tools/debug.hxx" #include "tools/stream.hxx" -#include "basegfx/polygon/b2dpolygon.hxx" -#include "basegfx/polygon/b2dpolypolygon.hxx" -#include "basegfx/matrix/b2dhommatrix.hxx" -#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <tools/prewin.h> +#include <windows.h> +#include <tools/postwin.h> + +#include <vcl/sysdata.hxx> + +#include "win/wincomp.hxx" +#include "win/saldata.hxx" +#include "win/salgdi.h" +#include "outfont.hxx" +#include "fontsubset.hxx" +#include "sallayout.hxx" +#include "outdev.h" // for ImplGlyphFallbackFontSubstitution #include "sft.hxx" #ifdef GCP_KERN_HACK diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx index 88efbb29d30a..2b46ce47b82d 100644 --- a/vcl/win/source/gdi/salgdi_gdiplus.cxx +++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx @@ -30,12 +30,14 @@ #include <stdio.h> #include <string.h> + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salgdi.h> #include <tools/debug.hxx> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salgdi.h> + #ifndef min #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 403d6c3780cd..0f1b8151967d 100755 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -30,14 +30,16 @@ #define _SV_SALNATIVEWIDGETS_CXX -#include "svsys.h" -#include "salgdi.h" -#include "saldata.hxx" -#include "vcl/svapp.hxx" - #include "rtl/ustring.h" + #include "osl/module.h" +#include "vcl/svapp.hxx" + +#include "win/svsys.h" +#include "win/salgdi.h" +#include "win/saldata.hxx" + #include "uxtheme.h" #include "vssym32.h" diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index a235d6785706..263d06670584 100755..100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -29,26 +29,26 @@ #include "precompiled_vcl.hxx" #include <string.h> -#include <tools/svwin.h> +#include <osl/module.h> + +#include <tools/urlobj.hxx> +#include <tools/svwin.h> #ifdef __MINGW32__ #include <excpt.h> #endif -#ifndef _OSL_MODULE_H -#include <osl/module.h> -#endif -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salgdi.h> -#include <salframe.h> -#include <vcl/salptype.hxx> -#include <salprn.h> -#include <vcl/print.h> -#include <vcl/jobset.h> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salgdi.h> +#include <win/salframe.h> +#include <win/salprn.h> + +#include <salptype.hxx> +#include <print.h> +#include <jobset.h> -#include <tools/urlobj.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index 3a6e89059a69..94f08a33179c 100644..100755 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -27,14 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salgdi.h> -#include <salvd.h> + #include <vcl/sysdata.hxx> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salgdi.h> +#include <win/salvd.h> + // ======================================================================= static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY, diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 14b9fd5a59c2..dd896059160e 100755 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -28,21 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "tools/svwin.h" - -#include "salgdi.h" -#include "saldata.hxx" -// for GetMirroredChar -#include "sft.hxx" - -#include "vcl/sallayout.hxx" -#include "vcl/svapp.hxx" - #include "rtl/ustring.hxx" #include "osl/module.h" #include "osl/file.h" +#include "tools/svwin.h" + +#include "vcl/svapp.hxx" + +#include "win/salgdi.h" +#include "win/saldata.hxx" + +// for GetMirroredChar +#include "sft.hxx" +#include "sallayout.hxx" #include <cstdio> #include <malloc.h> @@ -74,9 +74,9 @@ typedef std::set<int> IntSet; #include <graphite/GrClient.h> #include <graphite/WinFont.h> #include <graphite/Segment.h> -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_cache.hxx> -#include <vcl/graphite_features.hxx> +#include <graphite_layout.hxx> +#include <graphite_cache.hxx> +#include <graphite_features.hxx> #endif #define DROPPED_OUTGLYPH 0xFFFF diff --git a/vcl/win/source/src/MAKEFILE.MK b/vcl/win/source/src/MAKEFILE.MK deleted file mode 100644 index 7addba363481..000000000000 --- a/vcl/win/source/src/MAKEFILE.MK +++ /dev/null @@ -1,130 +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=salsrc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -CFLAGS += -DWINVER=0x0400 - -# --- Files -------------------------------------------------------- - -RCDEPN= nullptr.cur \ - help.cur \ - hsize.cur \ - vsize.cur \ - neswsize.cur \ - nwsesize.cur \ - cross.cur \ - move.cur \ - hsplit.cur \ - vsplit.cur \ - hsizebar.cur \ - vsizebar.cur \ - hand.cur \ - refhand.cur \ - pen.cur \ - magnify.cur \ - fill.cur \ - rotate.cur \ - hshear.cur \ - vshear.cur \ - mirror.cur \ - crook.cur \ - crop.cur \ - movept.cur \ - movebw.cur \ - movedata.cur \ - copydata.cur \ - linkdata.cur \ - movedlnk.cur \ - copydlnk.cur \ - movef.cur \ - copyf.cur \ - linkf.cur \ - moveflnk.cur \ - copyflnk.cur \ - movef2.cur \ - copyf2.cur \ - notallow.cur \ - dline.cur \ - drect.cur \ - dpolygon.cur \ - dbezier.cur \ - darc.cur \ - dpie.cur \ - dcirccut.cur \ - dellipse.cur \ - dfree.cur \ - dconnect.cur \ - dtext.cur \ - dcapt.cur \ - chart.cur \ - detectiv.cur \ - pivotcol.cur \ - pivotrow.cur \ - pivotfld.cur \ - pivotdel.cur \ - chain.cur \ - chainnot.cur \ - timemove.cur \ - timesize.cur \ - asn.cur \ - ass.cur \ - asw.cur \ - ase.cur \ - asnw.cur \ - asne.cur \ - assw.cur \ - asse.cur \ - asns.cur \ - aswe.cur \ - asnswe.cur \ - airbrush.cur \ - vtext.cur \ - tblsels.cur \ - tblsele.cur \ - tblselse.cur \ - tblselw.cur \ - tblselsw.cur \ - pntbrsh.cur \ - 50.bmp \ - sd.ico - -RCFILES= salsrc.rc - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 1db1bfc910cf..11b967ff475b 100644..100755 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -29,7 +29,7 @@ #include <windows.h> #ifndef _SV_SALIDS_HRC -#include <salids.hrc> +#include <win/salids.hrc> #endif SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR diff --git a/vcl/win/source/window/MAKEFILE.MK b/vcl/win/source/window/MAKEFILE.MK deleted file mode 100644 index cecfbcf5b2e5..000000000000 --- a/vcl/win/source/window/MAKEFILE.MK +++ /dev/null @@ -1,60 +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=salwin -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -CDEFS +=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/salframe.obj \ - $(SLO)$/salmenu.obj \ - $(SLO)$/salobj.obj - -.IF "$(COM)"=="GCC" -EXCEPTIONSFILES= $(SLO)$/salframe.obj -.ENDIF - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -CFLAGS+=-DENABLE_GRAPHITE -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index c1b3a632556e..bcbaee6d8b6c 100755 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -46,51 +46,48 @@ #include <stdio.h> -#ifndef _SVWIN_HXX #include <tools/svwin.h> -#endif #ifdef __MINGW32__ #include <excpt.h> #endif + #include <rtl/string.h> #include <rtl/ustring.h> #include <osl/module.h> + #include <tools/debug.hxx> -// Warning in SDK header -#if defined(_MSC_VER) && (_MSC_VER > 1400) -#pragma warning( disable: 4242 4244 ) -#endif -#include <wincomp.hxx> -#ifndef _SV_SALIDS_HRC -#include <salids.hrc> -#endif #include <vcl/sysdata.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salbmp.h> -#include <salgdi.h> -#include <salsys.h> -#include <salframe.h> -#include <salvd.h> -#include <salmenu.h> -#include <salobj.h> -#include <vcl/impbmp.hxx> #include <vcl/timer.hxx> -#include <saltimer.h> #include <vcl/settings.hxx> -#ifndef _SV_KEYCOES_HXX #include <vcl/keycodes.hxx> -#endif -#include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/sallayout.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_IMPDEL_HXX -#include <impdel.hxx> +#include <vcl/impdel.hxx> + +// Warning in SDK header +#if defined(_MSC_VER) && (_MSC_VER > 1400) +#pragma warning( disable: 4242 4244 ) #endif +#include <win/wincomp.hxx> +#include <win/salids.hrc> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salbmp.h> +#include <win/salgdi.h> +#include <win/salsys.h> +#include <win/salframe.h> +#include <win/salvd.h> +#include <win/salmenu.h> +#include <win/salobj.h> +#include <win/saltimer.h> + +#include <impbmp.hxx> +#include <window.h> +#include <sallayout.hxx> + #define COMPILE_MULTIMON_STUBS #include <multimon.h> #include <vector> diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 23295838bfc9..ce7c6064f790 100755 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -27,16 +27,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <vcl/salgdi.hxx> -#include <salmenu.h> + #include <vcl/menu.hxx> #include <vcl/sysdata.hxx> -#include <salframe.h> -#include <vcl/impbmp.hxx> + +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salframe.h> +#include <win/salmenu.h> + +#include <impbmp.hxx> +#include <salgdi.hxx> // uncomment the following line to have ownerdrawn menues, ie, with bitmaps // however, this is incompatible with OLE inplace editing diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 00ee39092aff..51712f07e709 100644..100755 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -30,17 +30,17 @@ #include <string.h> -#ifndef _SVWIN_HXX -#include <tools/svwin.h> -#endif -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salframe.h> -#include <salobj.h> #include <tools/debug.hxx> +#include <tools/svwin.h> + #include <vcl/svapp.hxx> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salframe.h> +#include <win/salobj.h> + // ======================================================================= static sal_Bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) |