summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRimas Kudelis <rq@akl.lt>2015-01-06 22:42:31 +0200
committerCaolán McNamara <caolanm@redhat.com>2015-01-08 09:46:39 +0000
commit2abbc6fa577565376910a1b8e5e8931a2202e989 (patch)
tree61d4b4ef0e6fc90762cd327449fe5c95f694d51e
parentd5c3a25aaec6136dda35e7d9904d9aaa2c015ed9 (diff)
Windows cursor improvements. Fixes fdo#53148 and fdo#53151.
* Use stock Windows cursors where possible. Change-Id: Ic5bb308441ad7faf30f6340299653251c99f1cc0 Reviewed-on: https://gerrit.libreoffice.org/13780 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat
-rw-r--r--vcl/WinResTarget_vcl.mk10
-rw-r--r--vcl/inc/win/salids.hrc12
-rw-r--r--vcl/win/source/src/cross.curbin326 -> 0 bytes
-rw-r--r--vcl/win/source/src/hand.curbin326 -> 0 bytes
-rw-r--r--vcl/win/source/src/hsize.curbin326 -> 0 bytes
-rw-r--r--vcl/win/source/src/move.curbin326 -> 0 bytes
-rw-r--r--vcl/win/source/src/neswsize.curbin326 -> 0 bytes
-rw-r--r--vcl/win/source/src/notallow.curbin326 -> 0 bytes
-rw-r--r--vcl/win/source/src/nwsesize.curbin326 -> 0 bytes
-rw-r--r--vcl/win/source/src/pen.curbin326 -> 0 bytes
-rw-r--r--vcl/win/source/src/refhand.curbin326 -> 0 bytes
-rw-r--r--vcl/win/source/src/salsrc.rc12
-rw-r--r--vcl/win/source/src/vsize.curbin326 -> 0 bytes
-rw-r--r--vcl/win/source/window/salframe.cxx15
14 files changed, 9 insertions, 40 deletions
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index fc20e5b75c8c..0416db7ad416 100644
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -55,38 +55,30 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
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 \
vcl/win/source/src/hshear.cur \
- vcl/win/source/src/notallow.cur \
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 \
vcl/win/source/src/hsplit.cur \
- vcl/win/source/src/pen.cur \
vcl/win/source/src/vshear.cur \
vcl/win/source/src/assw.cur \
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 \
@@ -104,12 +96,10 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
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 \
))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc
index a351bba0b907..acc0f4381f38 100644
--- a/vcl/inc/win/salids.hrc
+++ b/vcl/inc/win/salids.hrc
@@ -22,21 +22,10 @@
// Cursor
#define SAL_RESID_POINTER_NULL 10000
-#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_CROSS 10006
-#define SAL_RESID_POINTER_MOVE 10007
#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_PEN 10014
#define SAL_RESID_POINTER_MAGNIFY 10015
#define SAL_RESID_POINTER_FILL 10016
#define SAL_RESID_POINTER_ROTATE 10017
@@ -59,7 +48,6 @@
#define SAL_RESID_POINTER_COPYFILELINK 10034
#define SAL_RESID_POINTER_MOVEFILES 10035
#define SAL_RESID_POINTER_COPYFILES 10036
-#define SAL_RESID_POINTER_NOTALLOWED 10037
#define SAL_RESID_POINTER_DRAW_LINE 10038
#define SAL_RESID_POINTER_DRAW_RECT 10039
#define SAL_RESID_POINTER_DRAW_POLYGON 10040
diff --git a/vcl/win/source/src/cross.cur b/vcl/win/source/src/cross.cur
deleted file mode 100644
index 8fd9762386b1..000000000000
--- a/vcl/win/source/src/cross.cur
+++ /dev/null
Binary files differ
diff --git a/vcl/win/source/src/hand.cur b/vcl/win/source/src/hand.cur
deleted file mode 100644
index fc0e53b474e2..000000000000
--- a/vcl/win/source/src/hand.cur
+++ /dev/null
Binary files differ
diff --git a/vcl/win/source/src/hsize.cur b/vcl/win/source/src/hsize.cur
deleted file mode 100644
index 571dd0ef703c..000000000000
--- a/vcl/win/source/src/hsize.cur
+++ /dev/null
Binary files differ
diff --git a/vcl/win/source/src/move.cur b/vcl/win/source/src/move.cur
deleted file mode 100644
index a407a1298ad5..000000000000
--- a/vcl/win/source/src/move.cur
+++ /dev/null
Binary files differ
diff --git a/vcl/win/source/src/neswsize.cur b/vcl/win/source/src/neswsize.cur
deleted file mode 100644
index c38501ee15a8..000000000000
--- a/vcl/win/source/src/neswsize.cur
+++ /dev/null
Binary files differ
diff --git a/vcl/win/source/src/notallow.cur b/vcl/win/source/src/notallow.cur
deleted file mode 100644
index 90c1dfbb3a97..000000000000
--- a/vcl/win/source/src/notallow.cur
+++ /dev/null
Binary files differ
diff --git a/vcl/win/source/src/nwsesize.cur b/vcl/win/source/src/nwsesize.cur
deleted file mode 100644
index 570cbbb571cc..000000000000
--- a/vcl/win/source/src/nwsesize.cur
+++ /dev/null
Binary files differ
diff --git a/vcl/win/source/src/pen.cur b/vcl/win/source/src/pen.cur
deleted file mode 100644
index 040c5dc703e9..000000000000
--- a/vcl/win/source/src/pen.cur
+++ /dev/null
Binary files differ
diff --git a/vcl/win/source/src/refhand.cur b/vcl/win/source/src/refhand.cur
deleted file mode 100644
index a654974c6f8b..000000000000
--- a/vcl/win/source/src/refhand.cur
+++ /dev/null
Binary files differ
diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc
index 1a59b7ff13a0..5b6ca6551044 100644
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/source/src/salsrc.rc
@@ -20,21 +20,10 @@
#include <win/salids.hrc>
SAL_RESID_POINTER_NULL CURSOR nullptr.cur
-#ifndef WNT
-SAL_RESID_POINTER_HSIZE CURSOR hsize.cur
-SAL_RESID_POINTER_VSIZE 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
@@ -57,7 +46,6 @@ 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
diff --git a/vcl/win/source/src/vsize.cur b/vcl/win/source/src/vsize.cur
deleted file mode 100644
index 76449be89d0a..000000000000
--- a/vcl/win/source/src/vsize.cur
+++ /dev/null
Binary files differ
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index cba75f1b5705..cdffe0fe4c9d 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -112,6 +112,9 @@ using namespace ::com::sun::star::beans;
#ifndef WM_MOUSEHWHEEL
# define WM_MOUSEHWHEEL 0x020E
#endif
+#ifndef IDC_PEN
+# define IDC_PEN MAKEINTRESOURCE(32631)
+#endif
const unsigned int WM_USER_SYSTEM_WINDOW_ACTIVATED = RegisterWindowMessageA("SYSTEM_WINDOW_ACTIVATED");
@@ -2062,8 +2065,8 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ 0, IDC_WAIT, 0 }, // POINTER_WAIT
{ 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_CROSS, 0 }, // POINTER_CROSS
+ { 0, IDC_SIZEALL, 0 }, // POINTER_MOVE
{ 0, IDC_SIZENS, 0 }, // POINTER_NSIZE
{ 0, IDC_SIZENS, 0 }, // POINTER_SSIZE
{ 0, IDC_SIZEWE, 0 }, // POINTER_WSIZE
@@ -2084,9 +2087,9 @@ 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, 0, SAL_RESID_POINTER_PEN }, // POINTER_PEN
+ { 0, IDC_HAND, 0 }, // POINTER_HAND
+ { 0, IDC_HAND, 0 }, // POINTER_REFHAND
+ { 0, IDC_PEN, 0 }, // POINTER_PEN
{ 0, 0, SAL_RESID_POINTER_MAGNIFY }, // POINTER_MAGNIFY
{ 0, 0, SAL_RESID_POINTER_FILL }, // POINTER_FILL
{ 0, 0, SAL_RESID_POINTER_ROTATE }, // POINTER_ROTATE
@@ -2109,7 +2112,7 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ 0, 0, SAL_RESID_POINTER_COPYFILELINK }, // POINTER_COPYFILELINK
{ 0, 0, SAL_RESID_POINTER_MOVEFILES }, // POINTER_MOVEFILES
{ 0, 0, SAL_RESID_POINTER_COPYFILES }, // POINTER_COPYFILES
- { 0, 0, SAL_RESID_POINTER_NOTALLOWED }, // POINTER_NOTALLOWED
+ { 0, IDC_NO, 0 }, // POINTER_NOTALLOWED
{ 0, 0, SAL_RESID_POINTER_DRAW_LINE }, // POINTER_DRAW_LINE
{ 0, 0, SAL_RESID_POINTER_DRAW_RECT }, // POINTER_DRAW_RECT
{ 0, 0, SAL_RESID_POINTER_DRAW_POLYGON }, // POINTER_DRAW_POLYGON
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-20 01:53:45 +0000