This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 235024eb2d Replace Move cursor with system cursor on Windows (#449)
235024eb2d is described below
commit 235024eb2df3b22fd04affd75fce4e5399657918
Author: Matthias Seidel <[email protected]>
AuthorDate: Sat Dec 6 22:07:06 2025 +0100
Replace Move cursor with system cursor on Windows (#449)
* Replace Move cursor with system cursor on Windows
* Additional files
* Also replace Hand cursors
(cherry picked from commit a88d79fc62d55c8fa87928394b753f48c7f07b76)
---
main/vcl/WinResTarget_vcl.mk | 8 --
main/vcl/inc/win/salids.hrc | 18 ++--
main/vcl/win/source/src/50.png | Bin 125 -> 0 bytes
main/vcl/win/source/src/hand.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/hsize.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/move.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/neswsize.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/nwsesize.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/refhand.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/salsrc.rc | 155 +++++++++++++++-----------------
main/vcl/win/source/src/vsize.cur | Bin 326 -> 0 bytes
main/vcl/win/source/window/salframe.cxx | 132 +++++++++++++--------------
12 files changed, 145 insertions(+), 168 deletions(-)
diff --git a/main/vcl/WinResTarget_vcl.mk b/main/vcl/WinResTarget_vcl.mk
index 84d3bbf214..7b62cc22f2 100644
--- a/main/vcl/WinResTarget_vcl.mk
+++ b/main/vcl/WinResTarget_vcl.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/dpie.cur \
vcl/win/source/src/movedata.cur \
vcl/win/source/src/rotate.cur \
- vcl/win/source/src/50.png \
vcl/win/source/src/copydlnk.cur \
vcl/win/source/src/dpolygon.cur \
vcl/win/source/src/movedlnk.cur \
@@ -60,12 +59,10 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/tblsels.cur \
vcl/win/source/src/asne.cur \
vcl/win/source/src/crook.cur \
- vcl/win/source/src/hand.cur \
vcl/win/source/src/movept.cur \
vcl/win/source/src/tblselse.cur \
vcl/win/source/src/asns.cur \
vcl/win/source/src/crop.cur \
- vcl/win/source/src/neswsize.cur \
vcl/win/source/src/tblselsw.cur \
vcl/win/source/src/asnswe.cur \
vcl/win/source/src/cross.cur \
@@ -74,13 +71,11 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/tblselw.cur \
vcl/win/source/src/asnw.cur \
vcl/win/source/src/darc.cur \
- vcl/win/source/src/hsize.cur \
vcl/win/source/src/nullptr.cur \
vcl/win/source/src/timemove.cur \
vcl/win/source/src/ass.cur \
vcl/win/source/src/dbezier.cur \
vcl/win/source/src/hsizebar.cur \
- vcl/win/source/src/nwsesize.cur \
vcl/win/source/src/timesize.cur \
vcl/win/source/src/asse.cur \
vcl/win/source/src/dcapt.cur \
@@ -91,7 +86,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/dcirccut.cur \
vcl/win/source/src/linkdata.cur \
vcl/win/source/src/pivotcol.cur \
- vcl/win/source/src/vsize.cur \
vcl/win/source/src/asw.cur \
vcl/win/source/src/dconnect.cur \
vcl/win/source/src/linkf.cur \
@@ -109,12 +103,10 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/vtext.cur \
vcl/win/source/src/chainnot.cur \
vcl/win/source/src/dfree.cur \
- vcl/win/source/src/move.cur \
vcl/win/source/src/pntbrsh.cur \
vcl/win/source/src/chart.cur \
vcl/win/source/src/dline.cur \
vcl/win/source/src/movebw.cur \
- vcl/win/source/src/refhand.cur \
))
else
diff --git a/main/vcl/inc/win/salids.hrc b/main/vcl/inc/win/salids.hrc
index e8b0d203a8..b7b893ee69 100644
--- a/main/vcl/inc/win/salids.hrc
+++ b/main/vcl/inc/win/salids.hrc
@@ -24,21 +24,19 @@
// Cursor
#define SAL_RESID_POINTER_NULL 10000
-//#define SAL_RESID_POINTER_HELP 10001 // Help
Cursor only needed for older Windows versions was removed in December 2025
-#ifndef WNT
-#define SAL_RESID_POINTER_HSIZE 10002
-#define SAL_RESID_POINTER_VSIZE 10003
-#define SAL_RESID_POINTER_NESWSIZE 10004
-#define SAL_RESID_POINTER_NWSESIZE 10005
-#endif
+//#define SAL_RESID_POINTER_HELP 10001 // "Help"
cursor only needed for older Windows versions was removed in December 2025
+//#define SAL_RESID_POINTER_HSIZE 10002 //
"Horizontal resize" cursor only needed for older Windows versions was removed
in December 2025
+//#define SAL_RESID_POINTER_VSIZE 10003 //
"Vertical resize" cursor only needed for older Windows versions was removed in
December 2025
+//#define SAL_RESID_POINTER_NESWSIZE 10004 // "Diagonal
resize NESW" cursor only needed for older Windows versions was removed in
December 2025
+//#define SAL_RESID_POINTER_NWSESIZE 10005 // "Diagonal
resize NWSE" cursor only needed for older Windows versions was removed in
December 2025
#define SAL_RESID_POINTER_CROSS 10006
-#define SAL_RESID_POINTER_MOVE 10007
+//#define SAL_RESID_POINTER_MOVE 10007 // "Move"
cursor for older Windows versions was replaced in December 2025
#define SAL_RESID_POINTER_HSPLIT 10008
#define SAL_RESID_POINTER_VSPLIT 10009
#define SAL_RESID_POINTER_HSIZEBAR 10010
#define SAL_RESID_POINTER_VSIZEBAR 10011
-#define SAL_RESID_POINTER_HAND 10012
-#define SAL_RESID_POINTER_REFHAND 10013
+//#define SAL_RESID_POINTER_HAND 10012 // "Hand"
cursor for older Windows versions was replaced in December 2025
+//#define SAL_RESID_POINTER_REFHAND 10013 //
"Refhand" cursor for older Windows versions was replaced in December 2025
#define SAL_RESID_POINTER_PEN 10014
#define SAL_RESID_POINTER_MAGNIFY 10015
#define SAL_RESID_POINTER_FILL 10016
diff --git a/main/vcl/win/source/src/50.png b/main/vcl/win/source/src/50.png
deleted file mode 100644
index 8517d965f0..0000000000
Binary files a/main/vcl/win/source/src/50.png and /dev/null differ
diff --git a/main/vcl/win/source/src/hand.cur b/main/vcl/win/source/src/hand.cur
deleted file mode 100644
index fc0e53b474..0000000000
Binary files a/main/vcl/win/source/src/hand.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/hsize.cur
b/main/vcl/win/source/src/hsize.cur
deleted file mode 100644
index 571dd0ef70..0000000000
Binary files a/main/vcl/win/source/src/hsize.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/move.cur b/main/vcl/win/source/src/move.cur
deleted file mode 100644
index a407a1298a..0000000000
Binary files a/main/vcl/win/source/src/move.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/neswsize.cur
b/main/vcl/win/source/src/neswsize.cur
deleted file mode 100644
index c38501ee15..0000000000
Binary files a/main/vcl/win/source/src/neswsize.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/nwsesize.cur
b/main/vcl/win/source/src/nwsesize.cur
deleted file mode 100644
index 570cbbb571..0000000000
Binary files a/main/vcl/win/source/src/nwsesize.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/refhand.cur
b/main/vcl/win/source/src/refhand.cur
deleted file mode 100644
index a654974c6f..0000000000
Binary files a/main/vcl/win/source/src/refhand.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/salsrc.rc
b/main/vcl/win/source/src/salsrc.rc
index 720a88f8a6..6bb991fa24 100644
--- a/main/vcl/win/source/src/salsrc.rc
+++ b/main/vcl/win/source/src/salsrc.rc
@@ -23,87 +23,78 @@
#include <win/salids.hrc>
#endif
-SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR
-#ifndef WNT
-SAL_RESID_POINTER_HSIZE CURSOR
HSIZE.CUR
-SAL_RESID_POINTER_VSIZ CURSOR VSIZE.CUR
-SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR
-SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR
-#endif
-SAL_RESID_POINTER_CROSS CURSOR
CROSS.CUR
-SAL_RESID_POINTER_MOVE CURSOR MOVE.CUR
-SAL_RESID_POINTER_HSPLIT CURSOR HSPLIT.CUR
-SAL_RESID_POINTER_VSPLIT CURSOR VSPLIT.CUR
-SAL_RESID_POINTER_HSIZEBAR CURSOR HSIZEBAR.CUR
-SAL_RESID_POINTER_VSIZEBAR CURSOR VSIZEBAR.CUR
-SAL_RESID_POINTER_HAND CURSOR HAND.CUR
-SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR
-SAL_RESID_POINTER_PEN CURSOR PEN.CUR
-SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR
-SAL_RESID_POINTER_FILL CURSOR FILL.CUR
-SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR
-SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR
-SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR
-SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR
-SAL_RESID_POINTER_CROOK CURSOR
CROOK.CUR
-SAL_RESID_POINTER_CROP CURSOR CROP.CUR
-SAL_RESID_POINTER_MOVEPOINT CURSOR MOVEPT.CUR
-SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR MOVEBW.CUR
-SAL_RESID_POINTER_MOVEDATA CURSOR MOVEDATA.CUR
-SAL_RESID_POINTER_COPYDATA CURSOR COPYDATA.CUR
-SAL_RESID_POINTER_LINKDATA CURSOR LINKDATA.CUR
-SAL_RESID_POINTER_MOVEDATALINK CURSOR MOVEDLNK.CUR
-SAL_RESID_POINTER_COPYDATALINK CURSOR COPYDLNK.CUR
-SAL_RESID_POINTER_MOVEFILE CURSOR MOVEF.CUR
-SAL_RESID_POINTER_COPYFILE CURSOR COPYF.CUR
-SAL_RESID_POINTER_LINKFILE CURSOR LINKF.CUR
-SAL_RESID_POINTER_MOVEFILELINK CURSOR MOVEFLNK.CUR
-SAL_RESID_POINTER_COPYFILELINK CURSOR COPYFLNK.CUR
-SAL_RESID_POINTER_MOVEFILES CURSOR MOVEF2.CUR
-SAL_RESID_POINTER_COPYFILES CURSOR COPYF2.CUR
-SAL_RESID_POINTER_NOTALLOWED CURSOR NOTALLOW.CUR
-SAL_RESID_POINTER_DRAW_LINE CURSOR DLINE.CUR
-SAL_RESID_POINTER_DRAW_RECT CURSOR DRECT.CUR
-SAL_RESID_POINTER_DRAW_POLYGON CURSOR DPOLYGON.CUR
-SAL_RESID_POINTER_DRAW_BEZIER CURSOR DBEZIER.CUR
-SAL_RESID_POINTER_DRAW_ARC CURSOR DARC.CUR
-SAL_RESID_POINTER_DRAW_PIE CURSOR DPIE.CUR
-SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR DCIRCCUT.CUR
-SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR DELLIPSE.CUR
-SAL_RESID_POINTER_DRAW_FREEHAND CURSOR DFREE.CUR
-SAL_RESID_POINTER_DRAW_CONNECT CURSOR DCONNECT.CUR
-SAL_RESID_POINTER_DRAW_TEXT CURSOR DTEXT.CUR
-SAL_RESID_POINTER_DRAW_CAPTION CURSOR DCAPT.CUR
-SAL_RESID_POINTER_CHART CURSOR
CHART.CUR
-SAL_RESID_POINTER_DETECTIVE CURSOR DETECTIV.CUR
-SAL_RESID_POINTER_PIVOT_COL CURSOR PIVOTCOL.CUR
-SAL_RESID_POINTER_PIVOT_ROW CURSOR PIVOTROW.CUR
-SAL_RESID_POINTER_PIVOT_FIELD CURSOR PIVOTFLD.CUR
-SAL_RESID_POINTER_PIVOT_DELETE CURSOR PIVOTDEL.CUR
-SAL_RESID_POINTER_CHAIN CURSOR
CHAIN.CUR
-SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR CHAINNOT.CUR
-SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR TIMEMOVE.CUR
-SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR TIMESIZE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_N CURSOR ASN.CUR
-SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ASS.CUR
-SAL_RESID_POINTER_AUTOSCROLL_W CURSOR ASW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ASE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR ASNW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR ASNE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR ASSW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR ASSE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR ASNS.CUR
-SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR ASWE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR ASNSWE.CUR
-SAL_RESID_POINTER_AIRBRUSH CURSOR AIRBRUSH.CUR
-SAL_RESID_POINTER_TEXT_VERTICAL CURSOR VTEXT.CUR
-SAL_RESID_POINTER_TAB_SELECT_S CURSOR TBLSELS.CUR
-SAL_RESID_POINTER_TAB_SELECT_E CURSOR TBLSELE.CUR
-SAL_RESID_POINTER_TAB_SELECT_SE CURSOR TBLSELSE.CUR
-SAL_RESID_POINTER_TAB_SELECT_W CURSOR TBLSELW.CUR
-SAL_RESID_POINTER_TAB_SELECT_SW CURSOR TBLSELSW.CUR
-SAL_RESID_POINTER_PAINTBRUSH CURSOR PNTBRSH.CUR
+SAL_RESID_POINTER_NULL CURSOR nullptr.cur
+SAL_RESID_POINTER_CROSS CURSOR
cross.cur
+SAL_RESID_POINTER_HSPLIT CURSOR hsplit.cur
+SAL_RESID_POINTER_VSPLIT CURSOR vsplit.cur
+SAL_RESID_POINTER_HSIZEBAR CURSOR hsizebar.cur
+SAL_RESID_POINTER_VSIZEBAR CURSOR vsizebar.cur
+SAL_RESID_POINTER_PEN CURSOR pen.cur
+SAL_RESID_POINTER_MAGNIFY CURSOR magnify.cur
+SAL_RESID_POINTER_FILL CURSOR fill.cur
+SAL_RESID_POINTER_ROTATE CURSOR rotate.cur
+SAL_RESID_POINTER_HSHEAR CURSOR hshear.cur
+SAL_RESID_POINTER_VSHEAR CURSOR vshear.cur
+SAL_RESID_POINTER_MIRROR CURSOR mirror.cur
+SAL_RESID_POINTER_CROOK CURSOR
crook.cur
+SAL_RESID_POINTER_CROP CURSOR crop.cur
+SAL_RESID_POINTER_MOVEPOINT CURSOR movept.cur
+SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR movebw.cur
+SAL_RESID_POINTER_MOVEDATA CURSOR movedata.cur
+SAL_RESID_POINTER_COPYDATA CURSOR copydata.cur
+SAL_RESID_POINTER_LINKDATA CURSOR linkdata.cur
+SAL_RESID_POINTER_MOVEDATALINK CURSOR movedlnk.cur
+SAL_RESID_POINTER_COPYDATALINK CURSOR copydlnk.cur
+SAL_RESID_POINTER_MOVEFILE CURSOR movef.cur
+SAL_RESID_POINTER_COPYFILE CURSOR copyf.cur
+SAL_RESID_POINTER_LINKFILE CURSOR linkf.cur
+SAL_RESID_POINTER_MOVEFILELINK CURSOR moveflnk.cur
+SAL_RESID_POINTER_COPYFILELINK CURSOR copyflnk.cur
+SAL_RESID_POINTER_MOVEFILES CURSOR movef2.cur
+SAL_RESID_POINTER_COPYFILES CURSOR copyf2.cur
+SAL_RESID_POINTER_NOTALLOWED CURSOR notallow.cur
+SAL_RESID_POINTER_DRAW_LINE CURSOR dline.cur
+SAL_RESID_POINTER_DRAW_RECT CURSOR drect.cur
+SAL_RESID_POINTER_DRAW_POLYGON CURSOR dpolygon.cur
+SAL_RESID_POINTER_DRAW_BEZIER CURSOR dbezier.cur
+SAL_RESID_POINTER_DRAW_ARC CURSOR darc.cur
+SAL_RESID_POINTER_DRAW_PIE CURSOR dpie.cur
+SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR dcirccut.cur
+SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR dellipse.cur
+SAL_RESID_POINTER_DRAW_FREEHAND CURSOR dfree.cur
+SAL_RESID_POINTER_DRAW_CONNECT CURSOR dconnect.cur
+SAL_RESID_POINTER_DRAW_TEXT CURSOR dtext.cur
+SAL_RESID_POINTER_DRAW_CAPTION CURSOR dcapt.cur
+SAL_RESID_POINTER_CHART CURSOR
chart.cur
+SAL_RESID_POINTER_DETECTIVE CURSOR detectiv.cur
+SAL_RESID_POINTER_PIVOT_COL CURSOR pivotcol.cur
+SAL_RESID_POINTER_PIVOT_ROW CURSOR pivotrow.cur
+SAL_RESID_POINTER_PIVOT_FIELD CURSOR pivotfld.cur
+SAL_RESID_POINTER_PIVOT_DELETE CURSOR pivotdel.cur
+SAL_RESID_POINTER_CHAIN CURSOR
chain.cur
+SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR chainnot.cur
+SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR timemove.cur
+SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR timesize.cur
+SAL_RESID_POINTER_AUTOSCROLL_N CURSOR asn.cur
+SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ass.cur
+SAL_RESID_POINTER_AUTOSCROLL_W CURSOR asw.cur
+SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ase.cur
+SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR asnw.cur
+SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR asne.cur
+SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR assw.cur
+SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR asse.cur
+SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR asns.cur
+SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR aswe.cur
+SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR asnswe.cur
+SAL_RESID_POINTER_AIRBRUSH CURSOR airbrush.cur
+SAL_RESID_POINTER_TEXT_VERTICAL CURSOR vtext.cur
+SAL_RESID_POINTER_TAB_SELECT_S CURSOR tblsels.cur
+SAL_RESID_POINTER_TAB_SELECT_E CURSOR tblsele.cur
+SAL_RESID_POINTER_TAB_SELECT_SE CURSOR tblselse.cur
+SAL_RESID_POINTER_TAB_SELECT_W CURSOR tblselw.cur
+SAL_RESID_POINTER_TAB_SELECT_SW CURSOR tblselsw.cur
+SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur
-SAL_RESID_BITMAP_50 BITMAP 50.BMP
+SAL_RESID_BITMAP_50 BITMAP 50.bmp
-SAL_RESID_ICON_DEFAULT ICON SD.ICO
+SAL_RESID_ICON_DEFAULT ICON sd.ico
diff --git a/main/vcl/win/source/src/vsize.cur
b/main/vcl/win/source/src/vsize.cur
deleted file mode 100644
index 76449be89d..0000000000
Binary files a/main/vcl/win/source/src/vsize.cur and /dev/null differ
diff --git a/main/vcl/win/source/window/salframe.cxx
b/main/vcl/win/source/window/salframe.cxx
index ef036cbd14..f940f20254 100644
--- a/main/vcl/win/source/window/salframe.cxx
+++ b/main/vcl/win/source/window/salframe.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
@@ -122,8 +120,6 @@ using namespace ::com::sun::star::beans;
# define SPI_SETWHEELSCROLLCHARS 0x006D
#endif
-
-
#if OSL_DEBUG_LEVEL > 1
void MyOutputDebugString( char *s) { OutputDebugString( s ); }
#endif
@@ -170,7 +166,7 @@ static void SetMaximizedFrameGeometry( HWND hWnd,
WinSalFrame* pFrame, RECT* pPa
static void ImplSaveFrameState( WinSalFrame* pFrame )
{
- // Position, Groesse und Status fuer GetWindowState() merken
+ // Position, Größe und Status für GetWindowState() merken
if ( !pFrame->mbFullScreen )
{
sal_Bool bVisible = (GetWindowStyle( pFrame->mhWnd ) & WS_VISIBLE) !=
0;
@@ -195,7 +191,7 @@ static void ImplSaveFrameState( WinSalFrame* pFrame )
RECT aRect = aPlacement.rcNormalPosition;
RECT aRect2 = aRect;
AdjustWindowRectEx( &aRect2, GetWindowStyle( pFrame->mhWnd ),
- FALSE, GetWindowExStyle( pFrame->mhWnd )
);
+ FALSE, GetWindowExStyle( pFrame->mhWnd ) );
long nTopDeco = abs( aRect.top - aRect2.top );
long nLeftDeco = abs( aRect.left - aRect2.left );
long nBottomDeco = abs( aRect.bottom - aRect2.bottom );
@@ -261,7 +257,7 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT
*pParentRect )
}
}
- if( !winVerChecked )
+ if( !winVerChecked )
{
winVerChecked = 1;
winVerOk = 1;
@@ -365,7 +361,7 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst,
DWORD nExSysStyle = 0;
sal_Bool bSubFrame = FALSE;
- if( getenv( "SAL_SYNCHRONIZE" ) ) // no buffering of drawing commands
+ if( getenv( "SAL_SYNCHRONIZE" ) ) // no buffering of drawing commands
GdiSetBatchLimit( 1 );
static int bLayeredAPI = -1;
@@ -418,7 +414,7 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst,
{
nSysStyle |= WS_POPUP;
if ( !(nSalFrameStyle & SAL_FRAME_STYLE_MOVEABLE) )
- nExSysStyle |= WS_EX_TOOLWINDOW; // avoid taskbar
appearance, for e.g. splash screen
+ nExSysStyle |= WS_EX_TOOLWINDOW; // avoid taskbar
appearance, for e.g. splash screen
}
}
@@ -464,7 +460,7 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst,
nExSysStyle |= WS_EX_TOOLWINDOW;
pFrame->mbFloatWin = TRUE;
- if ( (bLayeredAPI == 1) && (pEnvTransparentFloats /* does not work
remote! || (nSalFrameStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) */ ) )
+ if ( (bLayeredAPI == 1) && (pEnvTransparentFloats /* does not work
remote! || (nSalFrameStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) */ ) )
nExSysStyle |= WS_EX_LAYERED;
}
@@ -520,7 +516,7 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst,
if ( nSalFrameStyle &
(SAL_FRAME_STYLE_MOVEABLE|SAL_FRAME_STYLE_NOSHADOW) ) // check if shadow not
wanted
pClassName = SAL_SUBFRAME_CLASSNAMEW;
else
- pClassName = SAL_TMPSUBFRAME_CLASSNAMEW; // undecorated
floaters will get shadow on XP
+ pClassName = SAL_TMPSUBFRAME_CLASSNAMEW; // undecorated
floaters will get shadow on XP
}
else
{
@@ -585,15 +581,15 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst,
UpdateFrameGeometry( hWnd, pFrame );
- if( pFrame->mnShowState == SW_SHOWMAXIMIZED )
+ if( pFrame->mnShowState == SW_SHOWMAXIMIZED )
{
// #96084 set a useful internal window size because
// the window will not be maximized (and the size updated)
before show()
- SetMaximizedFrameGeometry( hWnd, pFrame );
+ SetMaximizedFrameGeometry( hWnd, pFrame );
}
- return pFrame;
+ return pFrame;
}
// helper that only creates the HWND
@@ -879,12 +875,12 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame*
pFrame,
try
{
- uno::Reference< XMultiServiceFactory > xFactory(
::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
- uno::Reference< XIndexAccess > xMultiMon(
xFactory->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.awt.DisplayAccess" ) ) ), UNO_QUERY_THROW );
- sal_Int32 nMonitors = xMultiMon->getCount();
+ uno::Reference< XMultiServiceFactory > xFactory(
::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
+ uno::Reference< XIndexAccess > xMultiMon(
xFactory->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.awt.DisplayAccess" ) ) ), UNO_QUERY_THROW );
+ sal_Int32 nMonitors = xMultiMon->getCount();
if( (pFrame->mnDisplay >= 0) && (pFrame->mnDisplay < nMonitors)
)
{
- uno::Reference< XPropertySet > xMonitor(
xMultiMon->getByIndex( pFrame->mnDisplay ), UNO_QUERY_THROW );
+ uno::Reference< XPropertySet > xMonitor(
xMultiMon->getByIndex( pFrame->mnDisplay ), UNO_QUERY_THROW );
com::sun::star::awt::Rectangle aRect;
if( xMonitor->getPropertyValue( OUString(
RTL_CONSTASCII_USTRINGPARAM( "ScreenArea" ) ) ) >>= aRect )
{
@@ -896,8 +892,8 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame*
pFrame,
}
else
{
- Rectangle aCombined;
- uno::Reference< XPropertySet > xMonitor( xMultiMon->getByIndex( 0
), UNO_QUERY_THROW );
+ Rectangle aCombined;
+ uno::Reference< XPropertySet > xMonitor(
xMultiMon->getByIndex( 0 ), UNO_QUERY_THROW );
com::sun::star::awt::Rectangle aRect;
if( xMonitor->getPropertyValue( OUString(
RTL_CONSTASCII_USTRINGPARAM( "ScreenArea" ) ) ) >>= aRect )
{
@@ -926,14 +922,14 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame*
pFrame,
if( !nScreenDX || !nScreenDY )
{
- nScreenDX = GetSystemMetrics( SM_CXSCREEN );
+ nScreenDX = GetSystemMetrics( SM_CXSCREEN );
nScreenDY = GetSystemMetrics( SM_CYSCREEN );
}
- rX = nScreenX -nFrameX;
- rY = nScreenY -(nFrameY+nCaptionY);
- rDX = nScreenDX+(nFrameX*2);
- rDY = nScreenDY+(nFrameY*2)+nCaptionY;
+ rX = nScreenX -nFrameX;
+ rY = nScreenY -(nFrameY+nCaptionY);
+ rDX = nScreenDX+(nFrameX*2);
+ rDY = nScreenDY+(nFrameY*2)+nCaptionY;
}
// -----------------------------------------------------------------------
@@ -1255,13 +1251,13 @@ void WinSalFrame::SetMenu( SalMenu* pSalMenu )
void WinSalFrame::DrawMenuBar()
{
- ::DrawMenuBar( mhWnd );
+ ::DrawMenuBar( mhWnd );
}
// -----------------------------------------------------------------------
HWND ImplGetParentHwnd( HWND hWnd )
{
- WinSalFrame* pFrame = GetWindowPtr( hWnd );
+ WinSalFrame* pFrame = GetWindowPtr( hWnd );
if( !pFrame || !pFrame->GetWindow())
return ::GetParent( hWnd );
Window *pRealParent =
pFrame->GetWindow()->ImplGetWindowImpl()->mpRealParent;
@@ -1276,7 +1272,7 @@ HWND ImplGetParentHwnd( HWND hWnd )
SalFrame* WinSalFrame::GetParent() const
{
- return GetWindowPtr( ImplGetParentHwnd( mhWnd ) );
+ return GetWindowPtr( ImplGetParentHwnd( mhWnd ) );
}
// -----------------------------------------------------------------------
@@ -1323,7 +1319,7 @@ static void ImplSalShow( HWND hWnd, sal_Bool bVisible,
sal_Bool bNoActivate )
if( (GetWindowStyle( hWnd ) & WS_POPUP) &&
!pFrame->mbCaption &&
(aRectPreMatrox.left != aRectPostMatrox.left || aRectPreMatrox.top
!= aRectPostMatrox.top) )
- SetWindowPos( hWnd, 0, aRectPreMatrox.left, aRectPreMatrox.top, 0,
0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE );
+ SetWindowPos( hWnd, 0, aRectPreMatrox.left, aRectPreMatrox.top, 0,
0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE );
if( aDogTag.isDeleted() )
return;
@@ -1361,10 +1357,10 @@ static void ImplSalShow( HWND hWnd, sal_Bool bVisible,
sal_Bool bNoActivate )
{
// Damit im Impress-Player in der Taskleiste nicht durch
// einen Windows-Fehler hin- und wieder mal ein leerer
- // Button stehen bleibt, muessen wir hier die Taskleiste
+ // Button stehen bleibt, müssen wir hier die Taskleiste
// etwas austricksen. Denn wenn wir im FullScreenMode sind
// und das Fenster hiden kommt Windows anscheinend etwas aus
- // dem tritt und somit minimieren wir das Fenster damit es
+ // dem Tritt und somit minimieren wir das Fenster damit es
// nicht flackert
ANIMATIONINFO aInfo;
aInfo.cbSize = sizeof( aInfo );
@@ -1632,13 +1628,13 @@ void WinSalFrame::SetPosSize( long nX, long nY, long
nWidth, long nHeight,
if( !(mnStyle & SAL_FRAME_STYLE_FLOAT) )
nPosFlags |= SWP_NOZORDER; // do not change z-order
- SetWindowPos( mhWnd, HWND_TOP, nX, nY, (int)nWidth, (int)nHeight,
nPosFlags );
+ SetWindowPos( mhWnd, HWND_TOP, nX, nY, (int)nWidth, (int)nHeight,
nPosFlags );
UpdateFrameGeometry( mhWnd, this );
- // Notification -- really ???
- if( nEvent )
- CallCallback( nEvent, NULL );
+ // Notification -- really ???
+ if( nEvent )
+ CallCallback( nEvent, NULL );
}
// -----------------------------------------------------------------------
@@ -1839,8 +1835,8 @@ void WinSalFrame::GetClientSize( long& rWidth, long&
rHeight )
void WinSalFrame::SetWindowState( const SalFrameState* pState )
{
- // Wir testen, ob das Fenster ueberhaupt auf den Bildschirm passt, damit
- // nicht wenn die Bildschirm-Aufloesung geaendert wurde, das Fenster aus
+ // Wir testen, ob das Fenster überhaupt auf den Bildschirm passt, damit
+ // nicht wenn die Bildschirm-Auflösung geändert wurde, das Fenster aus
// diesem herausragt
int nX;
int nY;
@@ -1873,7 +1869,7 @@ void WinSalFrame::SetWindowState( const SalFrameState*
pState )
long nBottomDeco = abs( aWinRect.bottom - aRect2.bottom );
long nRightDeco = abs( aWinRect.right - aRect2.right );
- // Fenster-Position/Groesse in den Bildschirm einpassen
+ // Fenster-Position/Größe in den Bildschirm einpassen
if ( !(pState->mnMask & (SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_Y)) )
nPosSize |= SWP_NOMOVE;
if ( !(pState->mnMask & (SAL_FRAMESTATE_MASK_WIDTH |
SAL_FRAMESTATE_MASK_HEIGHT)) )
@@ -2148,7 +2144,7 @@ void WinSalFrame::StartPresentation( sal_Bool bStart )
pSalData->mpSageEnableProc( DISABLE_AGENT );
}
- // Bildschirmschoner ausschalten, wenn Praesentation laueft
+ // Bildschirmschoner ausschalten, wenn Präsentation läuft
SystemParametersInfo( SPI_GETSCREENSAVEACTIVE, 0,
&(pSalData->mbScrSvrEnabled), 0 );
if ( pSalData->mbScrSvrEnabled )
@@ -2226,7 +2222,7 @@ static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags )
{
SetFocus( hWnd );
- // Windows behauptet oefters mal, das man den Focus hat, obwohl
+ // Windows behauptet öfters mal, das man den Focus hat, obwohl
// man diesen nicht hat. Wenn dies der Fall ist, dann versuchen
// wir diesen auch ganz richtig zu bekommen.
if ( ::GetFocus() == hWnd )
@@ -2267,7 +2263,7 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ 0, IDC_IBEAM, 0 }, // POINTER_TEXT
{ 0, IDC_HELP, 0 }, // POINTER_HELP
{ 0, 0, SAL_RESID_POINTER_CROSS }, // POINTER_CROSS
- { 0, 0, SAL_RESID_POINTER_MOVE }, // POINTER_MOVE
+ { 0, IDC_SIZEALL, 0 }, // POINTER_MOVE
{ 0, IDC_SIZENS, 0 }, // POINTER_NSIZE
{ 0, IDC_SIZENS, 0 }, // POINTER_SSIZE
{ 0, IDC_SIZEWE, 0 }, // POINTER_WSIZE
@@ -2288,8 +2284,8 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ 0, 0, SAL_RESID_POINTER_VSPLIT }, // POINTER_VSPLIT
{ 0, 0, SAL_RESID_POINTER_HSIZEBAR }, // POINTER_HSIZEBAR
{ 0, 0, SAL_RESID_POINTER_VSIZEBAR }, // POINTER_VSIZEBAR
- { 0, 0, SAL_RESID_POINTER_HAND }, // POINTER_HAND
- { 0, 0, SAL_RESID_POINTER_REFHAND }, // POINTER_REFHAND
+ { 0, IDC_HAND, 0 }, // POINTER_HAND
+ { 0, IDC_HAND, 0 }, // POINTER_REFHAND
{ 0, 0, SAL_RESID_POINTER_PEN }, // POINTER_PEN
{ 0, 0, SAL_RESID_POINTER_MAGNIFY }, // POINTER_MAGNIFY
{ 0, 0, SAL_RESID_POINTER_FILL }, // POINTER_FILL
@@ -3359,9 +3355,9 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
aMouseEvt.mnCode = 0;
aMouseEvt.mnTime = GetMessageTime();
- // Wegen (Logitech-)MouseTreiber ueber GetKeyState() gehen, die auf
+ // Wegen (Logitech-)MouseTreiber über GetKeyState() gehen, die auf
// mittlerer Maustaste Doppelklick simulieren und den KeyStatus nicht
- // beruecksichtigen
+ // berücksichtigen
if ( GetKeyState( VK_LBUTTON ) & 0x8000 )
aMouseEvt.mnCode |= MOUSE_LEFT;
@@ -3380,7 +3376,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
{
case WM_MOUSEMOVE:
{
- // Da bei Druecken von Modifier-Tasten die MouseEvents
+ // Da bei Drücken von Modifier-Tasten die MouseEvents
// nicht zusammengefast werden (da diese durch KeyEvents
// unterbrochen werden), machen wir dieses hier selber
if ( aMouseEvt.mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2) )
@@ -3768,7 +3764,7 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
return 1;
}
- // Backspace ignorieren wir als eigenstaendige Taste,
+ // Backspace ignorieren wir als eigenständige Taste,
// damit wir keine Probleme in Kombination mit einem
// DeadKey bekommen
if ( wParam == 0x08 ) // BACKSPACE
@@ -3900,7 +3896,7 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
{
// check for charcode
// Mit Hilfe von PeekMessage holen wir uns jetzt die
- // zugehoerige WM_CHAR Message, wenn vorhanden.
+ // zugehörige WM_CHAR Message, wenn vorhanden.
// Diese WM_CHAR Message steht immer am Anfang der
// Messagequeue. Ausserdem ist sichergestellt, dass immer
// nur eine WM_CHAR Message in der Queue steht.
@@ -4099,12 +4095,12 @@ static bool ImplHandlePaintMsg( HWND hWnd )
WinSalFrame* pFrame = GetWindowPtr( hWnd );
if ( pFrame )
{
- // Clip-Region muss zurueckgesetzt werden, da wir sonst kein
+ // Clip-Region muss zurückgesetzt werden, da wir sonst kein
// ordentliches Bounding-Rectangle bekommen
if ( pFrame->mpGraphics && pFrame->mpGraphics->mhRegion )
SelectClipRgn( pFrame->mpGraphics->getHDC(), 0 );
- // Laut Window-Doku soll man erst abfragen, ob ueberhaupt eine
+ // Laut Window-Doku soll man erst abfragen, ob überhaupt eine
// Paint-Region anliegt
if ( GetUpdateRect( hWnd, NULL, FALSE ) )
{
@@ -4298,7 +4294,7 @@ static void ImplHandleMoveMsg( HWND hWnd )
if ( GetWindowStyle( hWnd ) & WS_VISIBLE )
pFrame->mbDefPos = FALSE;
- // Gegen moegliche Rekursionen sichern
+ // Gegen mögliche Rekursionen sichern
if ( !pFrame->mbInMoveMsg )
{
// Fenster im FullScreenModus wieder einpassen
@@ -4328,7 +4324,7 @@ static void ImplHandleMoveMsg( HWND hWnd )
static void ImplCallSizeHdl( HWND hWnd )
{
// Da Windows diese Messages auch senden kann, muss hier auch die
- // Solar-Semaphore beruecksichtigt werden
+ // Solar-Semaphore berücksichtigt werden
if ( ImplSalYieldMutexTryToAcquire() )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -4382,7 +4378,7 @@ static void ImplHandleFocusMsg( HWND hWnd )
if ( IsWindowVisible( hWnd ) && !pFrame->mbInShow )
UpdateWindow( hWnd );
- // Feststellen, ob wir IME unterstuetzen
+ // Feststellen, ob wir IME unterstützen
if ( pFrame->mbIME && pFrame->mhDefIMEContext )
{
UINT nImeProps = ImmGetProperty( GetKeyboardLayout( 0 ),
IGP_PROPERTY );
@@ -4562,7 +4558,7 @@ static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND
hWnd, UINT nMsg,
if ( (nMsg == WM_QUERYNEWPALETTE) || (nMsg == WM_PALETTECHANGED) )
{
// Da Windows diese Messages auch sendet, muss hier auch die
- // Solar-Semaphore beruecksichtigt werden
+ // Solar-Semaphore berücksichtigt werden
if ( ImplSalYieldMutexTryToAcquire() )
bReleaseMutex = TRUE;
else if ( nMsg == WM_QUERYNEWPALETTE )
@@ -4582,7 +4578,7 @@ static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND
hWnd, UINT nMsg,
pSalData->mbInPalChange = TRUE;
- // Alle Paletten in VirDevs und Frames zuruecksetzen
+ // Alle Paletten in VirDevs und Frames zurücksetzen
pTempVD = pSalData->mpFirstVD;
while ( pTempVD )
{
@@ -4660,7 +4656,7 @@ static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND
hWnd, UINT nMsg,
pTempFrame = pTempFrame->mpNextFrame;
}
- // Wenn sich Farben geaendert haben, dann die Fenster updaten
+ // Wenn sich Farben geändert haben, dann die Fenster updaten
if ( bUpdate )
{
pTempFrame = pSalData->mpFirstFrame;
@@ -5226,16 +5222,16 @@ static int ImplHandleSysCommand( HWND hWnd, WPARAM
wParam, LPARAM lParam )
if( GetMenu( hWnd ) )
return FALSE;
- // Hier verarbeiten wir nur KeyMenu-Events fuer Alt um
+ // Hier verarbeiten wir nur KeyMenu-Events für Alt um
// den MenuBar zu aktivieren, oder wenn ein SysChild-Fenster
// den Focus hat, da diese Alt+Tasten-Kombinationen nur
- // ueber diesen Event verarbeitet werden
+ // über diesen Event verarbeitet werden
if ( !LOWORD( lParam ) )
{
- // Nur ausloesen, wenn keine weitere Taste gedrueckt ist. Im
+ // Nur auslösen, wenn keine weitere Taste gedrückt ist. Im
// Gegensatz zur Doku wird in der X-Koordinaate der CharCode
- // geliefert, der zusaetzlich gedrueckt ist
- // Also 32 fuer Space, 99 fuer c, 100 fuer d, ...
+ // geliefert, der zusätzlich gedrückt ist
+ // Also 32 für Space, 99 für c, 100 für d, ...
// Da dies nicht dokumentiert ist, fragen wir vorsichtshalber
// auch den Status der Space-Taste ab
if ( GetKeyState( VK_SPACE ) & 0x8000 )
@@ -5267,7 +5263,7 @@ static int ImplHandleSysCommand( HWND hWnd, WPARAM
wParam, LPARAM lParam )
// LowerCase
if ( (cKeyCode >= 65) && (cKeyCode <= 90) )
cKeyCode += 32;
- // Wir nehmen nur 0-9 und A-Z, alle anderen Tasten muessen
durch
+ // Wir nehmen nur 0-9 und A-Z, alle anderen Tasten müssen durch
// den Hook vom SalObj verarbeitet werden
if ( ((cKeyCode >= 48) && (cKeyCode <= 57)) ||
((cKeyCode >= 97) && (cKeyCode <= 122)) )
@@ -5305,7 +5301,7 @@ static void ImplHandleInputLangChange( HWND hWnd, WPARAM,
LPARAM lParam )
{
ImplSalYieldMutexAcquireWithWait();
- // Feststellen, ob wir IME unterstuetzen
+ // Feststellen, ob wir IME unterstützen
WinSalFrame* pFrame = GetWindowPtr( hWnd );
if ( pFrame && pFrame->mbIME && pFrame->mhDefIMEContext )
{
@@ -5335,7 +5331,7 @@ static void ImplUpdateIMECursorPos( WinSalFrame* pFrame,
HIMC hIMC )
COMPOSITIONFORM aForm;
memset( &aForm, 0, sizeof( aForm ) );
- // Cursor-Position ermitteln und aus der die Default-Position fuer
+ // Cursor-Position ermitteln und aus der die Default-Position für
// das Composition-Fenster berechnen
SalExtTextInputPosEvent aPosEvt;
pFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void*)&aPosEvt );
@@ -5842,7 +5838,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lP
{
SetWindowPtr( hWnd, pFrame );
// HWND schon hier setzen, da schon auf den Instanzdaten
- // gearbeitet werden kann, wenn Messages waehrend
+ // gearbeitet werden kann, wenn Messages während
// CreateWindow() gesendet werden
pFrame->mhWnd = hWnd;
pFrame->maSysData.hWnd = hWnd;
@@ -5921,7 +5917,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lP
// FALLTHROUGH intended
case WM_MOUSEHWHEEL:
// Gegen Rekursion absichern, falls wir vom IE oder dem externen
- // Fenster die Message wieder zurueckbekommen
+ // Fenster die Message wieder zurückbekommen
if ( !bInWheelMsg )
{
bInWheelMsg++;
@@ -6026,7 +6022,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lP
// Wenn wir aktiviert werden, dann wollen wir auch unsere
// Palette setzen. Wir machen dieses in Activate,
// damit andere externe Child-Fenster auch unsere Palette
- // ueberschreiben koennen. So wird unsere jedenfalls nur einmal
+ // überschreiben können. So wird unsere jedenfalls nur einmal
// gesetzt und nicht immer rekursiv, da an allen anderen Stellen
// diese nur als Background-Palette gesetzt wird
if ( LOWORD( wParam ) != WA_INACTIVE )
@@ -6273,7 +6269,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lP
if ( rDef && (nMsg == aSalShlData.mnWheelMsgId) &&
aSalShlData.mnWheelMsgId )
{
// Gegen Rekursion absichern, falls wir vom IE oder dem externen
- // Fenster die Message wieder zurueckbekommen
+ // Fenster die Message wieder zurückbekommen
if ( !bInWheelMsg )
{
bInWheelMsg++;
