diff --git a/intern/ghost/intern/GHOST_WindowWin32.cc b/intern/ghost/intern/GHOST_WindowWin32.cc index bc07450f18f..021a30032bf 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cc +++ b/intern/ghost/intern/GHOST_WindowWin32.cc @@ -716,7 +716,6 @@ HCURSOR GHOST_WindowWin32::getStandardCursor(GHOST_TStandardCursor shape) const { /* Convert GHOST cursor to Windows OEM cursor. */ HANDLE cursor = nullptr; - HMODULE module = ::GetModuleHandle(0); uint32_t flags = LR_SHARED | LR_DEFAULTSIZE; int cx = 0, cy = 0; @@ -728,57 +727,9 @@ HCURSOR GHOST_WindowWin32::getStandardCursor(GHOST_TStandardCursor shape) const else { return nullptr; } - case GHOST_kStandardCursorRightArrow: - cursor = ::LoadImage(module, "arrowright_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorLeftArrow: - cursor = ::LoadImage(module, "arrowleft_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorUpArrow: - cursor = ::LoadImage(module, "arrowup_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorDownArrow: - cursor = ::LoadImage(module, "arrowdown_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorVerticalSplit: - cursor = ::LoadImage(module, "splitv_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorHorizontalSplit: - cursor = ::LoadImage(module, "splith_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorKnife: - cursor = ::LoadImage(module, "knife_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorEyedropper: - cursor = ::LoadImage(module, "eyedropper_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorZoomIn: - cursor = ::LoadImage(module, "zoomin_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorZoomOut: - cursor = ::LoadImage(module, "zoomout_cursor", IMAGE_CURSOR, cx, cy, flags); - break; case GHOST_kStandardCursorMove: cursor = ::LoadImage(nullptr, IDC_SIZEALL, IMAGE_CURSOR, cx, cy, flags); break; - case GHOST_kStandardCursorHandOpen: - cursor = ::LoadImage(module, "handopen_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorHandClosed: - cursor = ::LoadImage(module, "handclosed_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorHandPoint: - cursor = ::LoadImage(module, "handpoint_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorNSEWScroll: - cursor = ::LoadImage(module, "scrollnsew_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorNSScroll: - cursor = ::LoadImage(module, "scrollns_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorEWScroll: - cursor = ::LoadImage(module, "scrollew_cursor", IMAGE_CURSOR, cx, cy, flags); - break; case GHOST_kStandardCursorHelp: cursor = ::LoadImage(nullptr, IDC_HELP, IMAGE_CURSOR, cx, cy, flags); break; /* Arrow and question mark */ @@ -788,26 +739,6 @@ HCURSOR GHOST_WindowWin32::getStandardCursor(GHOST_TStandardCursor shape) const case GHOST_kStandardCursorText: cursor = ::LoadImage(nullptr, IDC_IBEAM, IMAGE_CURSOR, cx, cy, flags); break; /* I-beam */ - case GHOST_kStandardCursorCrosshair: - cursor = ::LoadImage(module, "cross_cursor", IMAGE_CURSOR, cx, cy, flags); - break; /* Standard Cross */ - case GHOST_kStandardCursorCrosshairA: - cursor = ::LoadImage(module, "crossA_cursor", IMAGE_CURSOR, cx, cy, flags); - break; /* Crosshair A */ - case GHOST_kStandardCursorCrosshairB: - cursor = ::LoadImage(module, "crossB_cursor", IMAGE_CURSOR, cx, cy, flags); - break; /* Diagonal Crosshair B */ - case GHOST_kStandardCursorCrosshairC: - cursor = ::LoadImage(module, "crossC_cursor", IMAGE_CURSOR, cx, cy, flags); - break; /* Minimal Crosshair C */ - case GHOST_kStandardCursorBottomSide: - case GHOST_kStandardCursorUpDown: - cursor = ::LoadImage(module, "movens_cursor", IMAGE_CURSOR, cx, cy, flags); - break; /* Double-pointed arrow pointing north and south */ - case GHOST_kStandardCursorLeftSide: - case GHOST_kStandardCursorLeftRight: - cursor = ::LoadImage(module, "moveew_cursor", IMAGE_CURSOR, cx, cy, flags); - break; /* Double-pointed arrow pointing west and east */ case GHOST_kStandardCursorTopSide: cursor = ::LoadImage(nullptr, IDC_UPARROW, IMAGE_CURSOR, cx, cy, flags); break; /* Vertical arrow */ @@ -823,26 +754,6 @@ HCURSOR GHOST_WindowWin32::getStandardCursor(GHOST_TStandardCursor shape) const case GHOST_kStandardCursorBottomLeftCorner: cursor = ::LoadImage(nullptr, IDC_SIZENESW, IMAGE_CURSOR, cx, cy, flags); break; - case GHOST_kStandardCursorPencil: - cursor = ::LoadImage(module, "pencil_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorEraser: - cursor = ::LoadImage(module, "eraser_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorDestroy: - case GHOST_kStandardCursorStop: - cursor = ::LoadImage(module, "forbidden_cursor", IMAGE_CURSOR, cx, cy, flags); - break; /* Slashed circle */ - case GHOST_kStandardCursorLeftHandle: - cursor = ::LoadImage(module, "handle_left_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorRightHandle: - cursor = ::LoadImage(module, "handle_right_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorBothHandles: - cursor = ::LoadImage(module, "handle_both_cursor", IMAGE_CURSOR, cx, cy, flags); - break; - case GHOST_kStandardCursorDefault: cursor = nullptr; break; diff --git a/release/windows/icons/cursors/arrowdown.cur b/release/windows/icons/cursors/arrowdown.cur deleted file mode 100644 index 251f3453e63..00000000000 Binary files a/release/windows/icons/cursors/arrowdown.cur and /dev/null differ diff --git a/release/windows/icons/cursors/arrowleft.cur b/release/windows/icons/cursors/arrowleft.cur deleted file mode 100644 index 6935e461a05..00000000000 Binary files a/release/windows/icons/cursors/arrowleft.cur and /dev/null differ diff --git a/release/windows/icons/cursors/arrowright.cur b/release/windows/icons/cursors/arrowright.cur deleted file mode 100644 index ae561a54d04..00000000000 Binary files a/release/windows/icons/cursors/arrowright.cur and /dev/null differ diff --git a/release/windows/icons/cursors/arrowup.cur b/release/windows/icons/cursors/arrowup.cur deleted file mode 100644 index 5c29145f16b..00000000000 Binary files a/release/windows/icons/cursors/arrowup.cur and /dev/null differ diff --git a/release/windows/icons/cursors/cross.cur b/release/windows/icons/cursors/cross.cur deleted file mode 100644 index 62c5c322cfb..00000000000 Binary files a/release/windows/icons/cursors/cross.cur and /dev/null differ diff --git a/release/windows/icons/cursors/crossa.cur b/release/windows/icons/cursors/crossa.cur deleted file mode 100644 index 7a2bfa7f406..00000000000 Binary files a/release/windows/icons/cursors/crossa.cur and /dev/null differ diff --git a/release/windows/icons/cursors/crossb.cur b/release/windows/icons/cursors/crossb.cur deleted file mode 100644 index 78bb1a3574b..00000000000 Binary files a/release/windows/icons/cursors/crossb.cur and /dev/null differ diff --git a/release/windows/icons/cursors/crossc.cur b/release/windows/icons/cursors/crossc.cur deleted file mode 100644 index 5c54525b2dc..00000000000 Binary files a/release/windows/icons/cursors/crossc.cur and /dev/null differ diff --git a/release/windows/icons/cursors/eraser.cur b/release/windows/icons/cursors/eraser.cur deleted file mode 100644 index c1e14ef3bae..00000000000 Binary files a/release/windows/icons/cursors/eraser.cur and /dev/null differ diff --git a/release/windows/icons/cursors/eyedropper.cur b/release/windows/icons/cursors/eyedropper.cur deleted file mode 100644 index 2294297b210..00000000000 Binary files a/release/windows/icons/cursors/eyedropper.cur and /dev/null differ diff --git a/release/windows/icons/cursors/forbidden.cur b/release/windows/icons/cursors/forbidden.cur deleted file mode 100644 index 2e45bad168b..00000000000 Binary files a/release/windows/icons/cursors/forbidden.cur and /dev/null differ diff --git a/release/windows/icons/cursors/handclosed.cur b/release/windows/icons/cursors/handclosed.cur deleted file mode 100644 index 1e358d80bc1..00000000000 Binary files a/release/windows/icons/cursors/handclosed.cur and /dev/null differ diff --git a/release/windows/icons/cursors/handle_both.cur b/release/windows/icons/cursors/handle_both.cur deleted file mode 100644 index 6d3e7bd4a11..00000000000 Binary files a/release/windows/icons/cursors/handle_both.cur and /dev/null differ diff --git a/release/windows/icons/cursors/handle_left.cur b/release/windows/icons/cursors/handle_left.cur deleted file mode 100644 index aafd7d2da57..00000000000 Binary files a/release/windows/icons/cursors/handle_left.cur and /dev/null differ diff --git a/release/windows/icons/cursors/handle_right.cur b/release/windows/icons/cursors/handle_right.cur deleted file mode 100644 index c9faa15792a..00000000000 Binary files a/release/windows/icons/cursors/handle_right.cur and /dev/null differ diff --git a/release/windows/icons/cursors/handopen.cur b/release/windows/icons/cursors/handopen.cur deleted file mode 100644 index d63932f0c97..00000000000 Binary files a/release/windows/icons/cursors/handopen.cur and /dev/null differ diff --git a/release/windows/icons/cursors/handpoint.cur b/release/windows/icons/cursors/handpoint.cur deleted file mode 100644 index 92befab2469..00000000000 Binary files a/release/windows/icons/cursors/handpoint.cur and /dev/null differ diff --git a/release/windows/icons/cursors/knife.cur b/release/windows/icons/cursors/knife.cur deleted file mode 100644 index edc97d9e9f2..00000000000 Binary files a/release/windows/icons/cursors/knife.cur and /dev/null differ diff --git a/release/windows/icons/cursors/moveew.cur b/release/windows/icons/cursors/moveew.cur deleted file mode 100644 index c2bef134cca..00000000000 Binary files a/release/windows/icons/cursors/moveew.cur and /dev/null differ diff --git a/release/windows/icons/cursors/movens.cur b/release/windows/icons/cursors/movens.cur deleted file mode 100644 index 409176a23f9..00000000000 Binary files a/release/windows/icons/cursors/movens.cur and /dev/null differ diff --git a/release/windows/icons/cursors/pencil.cur b/release/windows/icons/cursors/pencil.cur deleted file mode 100644 index ac76b367d25..00000000000 Binary files a/release/windows/icons/cursors/pencil.cur and /dev/null differ diff --git a/release/windows/icons/cursors/pointer.cur b/release/windows/icons/cursors/pointer.cur deleted file mode 100644 index d9b1ee8a60b..00000000000 Binary files a/release/windows/icons/cursors/pointer.cur and /dev/null differ diff --git a/release/windows/icons/cursors/scrollew.cur b/release/windows/icons/cursors/scrollew.cur deleted file mode 100644 index c5eab1b9890..00000000000 Binary files a/release/windows/icons/cursors/scrollew.cur and /dev/null differ diff --git a/release/windows/icons/cursors/scrollns.cur b/release/windows/icons/cursors/scrollns.cur deleted file mode 100644 index 4b443220da8..00000000000 Binary files a/release/windows/icons/cursors/scrollns.cur and /dev/null differ diff --git a/release/windows/icons/cursors/scrollnsew.cur b/release/windows/icons/cursors/scrollnsew.cur deleted file mode 100644 index fd0cad49c42..00000000000 Binary files a/release/windows/icons/cursors/scrollnsew.cur and /dev/null differ diff --git a/release/windows/icons/cursors/splith.cur b/release/windows/icons/cursors/splith.cur deleted file mode 100644 index 9b74fca7c6f..00000000000 Binary files a/release/windows/icons/cursors/splith.cur and /dev/null differ diff --git a/release/windows/icons/cursors/splitv.cur b/release/windows/icons/cursors/splitv.cur deleted file mode 100644 index 68a739eb11b..00000000000 Binary files a/release/windows/icons/cursors/splitv.cur and /dev/null differ diff --git a/release/windows/icons/cursors/zoomin.cur b/release/windows/icons/cursors/zoomin.cur deleted file mode 100644 index 8e6930b465a..00000000000 Binary files a/release/windows/icons/cursors/zoomin.cur and /dev/null differ diff --git a/release/windows/icons/cursors/zoomout.cur b/release/windows/icons/cursors/zoomout.cur deleted file mode 100644 index 834686c7ec0..00000000000 Binary files a/release/windows/icons/cursors/zoomout.cur and /dev/null differ diff --git a/release/windows/icons/winblender.rc b/release/windows/icons/winblender.rc index eb78a4d30d4..f56ca3b4f40 100644 --- a/release/windows/icons/winblender.rc +++ b/release/windows/icons/winblender.rc @@ -12,36 +12,6 @@ APPICON ICON DISCARDABLE "winblender.ico" BLENDERFILE ICON DISCARDABLE "winblenderfile.ico" -pointer_cursor CURSOR "cursors/pointer.cur" -moveew_cursor CURSOR "cursors/moveew.cur" -movens_cursor CURSOR "cursors/movens.cur" -arrowdown_cursor CURSOR "cursors/arrowdown.cur" -arrowleft_cursor CURSOR "cursors/arrowleft.cur" -arrowright_cursor CURSOR "cursors/arrowright.cur" -arrowup_cursor CURSOR "cursors/arrowup.cur" -cross_cursor CURSOR "cursors/cross.cur" -crossA_cursor CURSOR "cursors/crossa.cur" -crossB_cursor CURSOR "cursors/crossb.cur" -crossC_cursor CURSOR "cursors/crossc.cur" -eraser_cursor CURSOR "cursors/eraser.cur" -eyedropper_cursor CURSOR "cursors/eyedropper.cur" -handopen_cursor CURSOR "cursors/handopen.cur" -handclosed_cursor CURSOR "cursors/handclosed.cur" -handpoint_cursor CURSOR "cursors/handpoint.cur" -knife_cursor CURSOR "cursors/knife.cur" -pencil_cursor CURSOR "cursors/pencil.cur" -scrollew_cursor CURSOR "cursors/scrollew.cur" -scrollns_cursor CURSOR "cursors/scrollns.cur" -scrollnsew_cursor CURSOR "cursors/scrollnsew.cur" -splith_cursor CURSOR "cursors/splith.cur" -splitv_cursor CURSOR "cursors/splitv.cur" -zoomin_cursor CURSOR "cursors/zoomin.cur" -zoomout_cursor CURSOR "cursors/zoomout.cur" -forbidden_cursor CURSOR "cursors/forbidden.cur" -handle_left_cursor CURSOR "cursors/handle_left.cur" -handle_right_cursor CURSOR "cursors/handle_right.cur" -handle_both_cursor CURSOR "cursors/handle_both.cur" - IDR_VERSION1 VERSIONINFO FILEVERSION BLEN_VER_RC_1, BLEN_VER_RC_2, BLEN_VER_RC_3, BLEN_VER_RC_4 PRODUCTVERSION BLEN_VER_RC_1, BLEN_VER_RC_2, BLEN_VER_RC_3, BLEN_VER_RC_4