From 99c9aac6e53c439a756ad0f87257a18623c1ae0f Mon Sep 17 00:00:00 2001 From: Matthias Seidel Date: Sun, 21 Dec 2025 23:35:50 +0100 Subject: [PATCH 1/3] Remove unused cursors --- main/vcl/WinResTarget_vcl.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/main/vcl/WinResTarget_vcl.mk b/main/vcl/WinResTarget_vcl.mk index 8ef66b052e..65c570642e 100644 --- a/main/vcl/WinResTarget_vcl.mk +++ b/main/vcl/WinResTarget_vcl.mk @@ -71,10 +71,8 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ vcl/win/source/src/asnw.cur \ vcl/win/source/src/darc.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/timesize.cur \ vcl/win/source/src/asse.cur \ vcl/win/source/src/dcapt.cur \ vcl/win/source/src/pen.cur \ @@ -181,8 +179,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ vcl/os2/source/src/tblselse.ptr \ vcl/os2/source/src/tblselsw.ptr \ vcl/os2/source/src/tblselw.ptr \ - vcl/os2/source/src/timemove.ptr \ - vcl/os2/source/src/timesize.ptr \ vcl/os2/source/src/vshear.ptr \ vcl/os2/source/src/vsizebar.ptr \ vcl/os2/source/src/vsplit.ptr \ From 5aeac9ebbb9d143ce873e160e73ab827e7ad50ec Mon Sep 17 00:00:00 2001 From: mseidel Date: Sun, 21 Dec 2025 23:45:42 +0100 Subject: [PATCH 2/3] Additional files --- main/vcl/aqua/source/app/saldata.cxx | 2 - main/vcl/aqua/source/res/cursors/timemove.png | Bin 249 -> 0 bytes main/vcl/aqua/source/res/cursors/timesize.png | Bin 241 -> 0 bytes main/vcl/inc/unx/x11_cursors/salcursors.h | 5 -- main/vcl/inc/unx/x11_cursors/timemove_curs.h | 60 ------------------ main/vcl/inc/unx/x11_cursors/timemove_mask.h | 60 ------------------ main/vcl/inc/unx/x11_cursors/timesize_curs.h | 60 ------------------ main/vcl/inc/unx/x11_cursors/timesize_mask.h | 60 ------------------ main/vcl/os2/source/src/makefile.mk | 2 - main/vcl/os2/source/src/salsrc.rc | 2 - main/vcl/os2/source/src/timemove.ptr | Bin 1190 -> 0 bytes main/vcl/os2/source/src/timesize.ptr | Bin 1190 -> 0 bytes main/vcl/unx/generic/app/saldisp.cxx | 6 -- main/vcl/unx/gtk/app/gtkdata.cxx | 2 - main/vcl/win/source/src/salsrc.rc | 2 - main/vcl/win/source/src/timemove.cur | Bin 326 -> 0 bytes main/vcl/win/source/src/timesize.cur | Bin 326 -> 0 bytes 17 files changed, 261 deletions(-) delete mode 100644 main/vcl/aqua/source/res/cursors/timemove.png delete mode 100644 main/vcl/aqua/source/res/cursors/timesize.png delete mode 100644 main/vcl/inc/unx/x11_cursors/timemove_curs.h delete mode 100644 main/vcl/inc/unx/x11_cursors/timemove_mask.h delete mode 100644 main/vcl/inc/unx/x11_cursors/timesize_curs.h delete mode 100644 main/vcl/inc/unx/x11_cursors/timesize_mask.h delete mode 100644 main/vcl/os2/source/src/timemove.ptr delete mode 100644 main/vcl/os2/source/src/timesize.ptr delete mode 100644 main/vcl/win/source/src/timemove.cur delete mode 100644 main/vcl/win/source/src/timesize.cur diff --git a/main/vcl/aqua/source/app/saldata.cxx b/main/vcl/aqua/source/app/saldata.cxx index 158e114da4..33a5ecc411 100644 --- a/main/vcl/aqua/source/app/saldata.cxx +++ b/main/vcl/aqua/source/app/saldata.cxx @@ -212,8 +212,6 @@ const aCursorTab[ POINTER_COUNT ] = { "pivotfld", { 8, 7 } }, // POINTER_PIVOT_FIELD { "chain", { 0, 2 } }, // POINTER_CHAIN { "chainnot", { 2, 2 } }, // POINTER_CHAIN_NOTALLOWED -{ "timemove", { 16, 16 } }, // POINTER_TIMEEVENT_MOVE -{ "timesize", { 16, 17 } }, // POINTER_TIMEEVENT_SIZE { "asn", { 16, 12 } }, // POINTER_AUTOSCROLL_N { "ass", { 15, 19 } }, // POINTER_AUTOSCROLL_S { "asw", { 12, 15 } }, // POINTER_AUTOSCROLL_W diff --git a/main/vcl/aqua/source/res/cursors/timemove.png b/main/vcl/aqua/source/res/cursors/timemove.png deleted file mode 100644 index 3dae038a20119f189dff4cf1ab38467853fc4f71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kweONdub*VO-b2T-WZ)5S3);_%yP2e}R?@Hh*<{QtkG z{FBldtJh(&ycL^%1oea{O!bt>@1ntM!b^NnuAis!xEKdCX4%Uq$kv;29=t%k1xYj|?(xx0krj77uG oH5o5|DE7Zmx6Wnd75x%Mv11iy-Sj480bRu4>FVdQ&MBb@0O|r**#H0l diff --git a/main/vcl/aqua/source/res/cursors/timesize.png b/main/vcl/aqua/source/res/cursors/timesize.png deleted file mode 100644 index 22178c9b8d0e296cf96274281865145bcf9d28da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kweONdv`YTFzqf1psEr;B4q#NoG74ssn(;Bj92<$t~9 z?lavUh29%DY89+cOe?X=S*y{NqH~LdA#%b^qtoVbOAar#ob#8#+TncJ0`7BW>kn|G zdzD;$Qtxe%y=`XTqbj=#RJA#I>qBmR zu2L?$pMLJV>pPs=@m}S9zcf*$a84C;w!M8(lI`%K6m6<-+jslg^a?ZknEbW&08gb8YcQakpAmf79RK;e3m4_ETlQg~9r|>HS-RyEifkC@Nr9 p0*fUu|Mj?FJnDj0MU4MyvGUG0p7E{D>izP{O^BWCxWuRY|9@MDAg2HT diff --git a/main/vcl/os2/source/src/timesize.ptr b/main/vcl/os2/source/src/timesize.ptr deleted file mode 100644 index e543c1ff790c0783c738126b7b50ad4c1ec01f63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1190 zcmd5*J5s|i6kL&%3`$KCm)yc8Tp$Gp;20?~NT=Z(Ie-u2k|L93pX8q=2?GTap66-3 zZ{J7q$eZUU06V$a%l1+03J>@Y-peaAaC&4UXSzaJucR(bkI7?#C>G7ywx!}!wSmz3 zkef7Dp=8_FaqeR1JD)q`-3rr|uP%W+)#Pzae)^2!C!qd~Uu`epR_E@@!QPj=Ly;i0 zOrS4x% r1Kd@>as@2j5_b#-{iKZxVe1I(lmdcR-i=pYD=-nH1heZFa0afX zS7b9>4WF@#-X(SM^;#W}VM=hE;c#y{R347YQA%gk-Zy{sRe!y!_pIg^{=)!8+7{_` Sk)Ef0T5qt7_{%Rj=MUaO!*cHc diff --git a/main/vcl/win/source/src/timesize.cur b/main/vcl/win/source/src/timesize.cur deleted file mode 100644 index 1ec23de05b716bb0fb7c89027542f6bd9eabd302..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmb7;F%H5o5CrD}J)xmZN=klUKP3-An5X4g6e!D*L~?^Hv8VBRPu88GBN#{MIdcoR z09WG{*@SD=Zd<6Qq#AzSo*t5+8{yc)VOn#j%pRGel*)a`@ko1?-F)9jGY$C<4Haog R(tD6zr_G%gNdM4SpbxXdZ*Twr From 9dff61d09e7ac3b4ce74e1bec02906474b2f9f3f Mon Sep 17 00:00:00 2001 From: mseidel Date: Sun, 28 Dec 2025 22:41:48 +0100 Subject: [PATCH 3/3] Some forgotten changes --- main/vcl/inc/os2/salids.hrc | 4 +- main/vcl/inc/win/salids.hrc | 4 +- main/vcl/os2/source/window/salframe.cxx | 60 ++++++++++++------------- main/vcl/win/source/window/salframe.cxx | 2 - 4 files changed, 32 insertions(+), 38 deletions(-) diff --git a/main/vcl/inc/os2/salids.hrc b/main/vcl/inc/os2/salids.hrc index 75c7fd7642..fec188b6d4 100644 --- a/main/vcl/inc/os2/salids.hrc +++ b/main/vcl/inc/os2/salids.hrc @@ -75,8 +75,8 @@ #define SAL_RESID_POINTER_PIVOT_FIELD 10049 #define SAL_RESID_POINTER_CHAIN 10050 #define SAL_RESID_POINTER_CHAIN_NOTALLOWED 10051 -#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10052 -#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10053 +//#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10052 // Removed in December 2025 +//#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10053 // Removed in December 2025 #define SAL_RESID_POINTER_AUTOSCROLL_N 10054 #define SAL_RESID_POINTER_AUTOSCROLL_S 10055 #define SAL_RESID_POINTER_AUTOSCROLL_W 10056 diff --git a/main/vcl/inc/win/salids.hrc b/main/vcl/inc/win/salids.hrc index 25ee4dad46..9ddcf9abd0 100644 --- a/main/vcl/inc/win/salids.hrc +++ b/main/vcl/inc/win/salids.hrc @@ -80,8 +80,8 @@ #define SAL_RESID_POINTER_PIVOT_FIELD 10054 #define SAL_RESID_POINTER_CHAIN 10055 #define SAL_RESID_POINTER_CHAIN_NOTALLOWED 10056 -#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10057 -#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10058 +//#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10057 // Removed in December 2025 +//#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10058 // Removed in December 2025 #define SAL_RESID_POINTER_AUTOSCROLL_N 10059 #define SAL_RESID_POINTER_AUTOSCROLL_S 10060 #define SAL_RESID_POINTER_AUTOSCROLL_W 10061 diff --git a/main/vcl/os2/source/window/salframe.cxx b/main/vcl/os2/source/window/salframe.cxx index c38097ec7e..19733c1513 100644 --- a/main/vcl/os2/source/window/salframe.cxx +++ b/main/vcl/os2/source/window/salframe.cxx @@ -19,8 +19,6 @@ * *************************************************************/ - - #define INCL_DOS #define INCL_PM #define INCL_WIN @@ -159,7 +157,7 @@ sal_Bool APIENTRY _WinQueryWindowPos( Os2SalFrame* pFrame, PSWP pswp) } sal_Bool APIENTRY _WinSetWindowPos( Os2SalFrame* pFrame, HWND hwndInsertBehind, LONG x, LONG y, - LONG cx, LONG cy, ULONG fl) + LONG cx, LONG cy, ULONG fl) { SWP swpOwner = {0}; POINTL ptlOwner = {0}; @@ -344,20 +342,20 @@ static SalIMEData* GetSalIMEData() } } - return pSalData->mpIMEData; + return pSalData->mpIMEData; } // ----------------------------------------------------------------------- void ImplReleaseSALIMEData() { - SalData* pSalData = GetSalData(); + SalData* pSalData = GetSalData(); - if ( pSalData->mpIMEData ) - { - DosFreeModule( pSalData->mpIMEData->mhModIME ); - delete pSalData->mpIMEData; - } + if ( pSalData->mpIMEData ) + { + DosFreeModule( pSalData->mpIMEData->mhModIME ); + delete pSalData->mpIMEData; + } } #endif @@ -366,11 +364,11 @@ void ImplReleaseSALIMEData() static void ImplSaveFrameState( Os2SalFrame* pFrame ) { - // Position, Groesse und Status fuer GetWindowState() merken - if ( !pFrame->mbFullScreen ) - { - SWP aSWP; - sal_Bool bVisible = WinIsWindowVisible( pFrame->mhWndFrame); + // Position, Groesse und Status fuer GetWindowState() merken + if ( !pFrame->mbFullScreen ) + { + SWP aSWP; + sal_Bool bVisible = WinIsWindowVisible( pFrame->mhWndFrame); // Query actual state (maState uses screen coords) WinQueryWindowPos( pFrame->mhWndFrame, &aSWP ); @@ -521,7 +519,7 @@ static void ImplSalFrameFullScreenPos( Os2SalFrame* pFrame, sal_Bool bAlways = F // ----------------------------------------------------------------------- -// Uebersetzungstabelle von System-Keycodes in StarView-Keycodes +// Übersetzungstabelle von System-Keycodes in StarView-Keycodes #define KEY_TAB_SIZE (VK_ENDDRAG+1) static USHORT aImplTranslateKeyTab[KEY_TAB_SIZE] = @@ -600,7 +598,7 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSal sal_Bool bSubFrame = FALSE; #if OSL_DEBUG_LEVEL>0 - debug_printf(">ImplSalCreateFrame hWndParent 0x%x, nSalFrameStyle 0x%x\n", hWndParent, nSalFrameStyle); + debug_printf(">ImplSalCreateFrame hWndParent 0x%x, nSalFrameStyle 0x%x\n", hWndParent, nSalFrameStyle); #endif if ( hWndParent ) @@ -609,10 +607,10 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSal pFrame->mbNoIcon = TRUE; } - // determine creation data (bei Moveable nehmen wir DLG-Border, damit - // es besser aussieht) - if ( nSalFrameStyle & SAL_FRAME_STYLE_CLOSEABLE ) - nFrameFlags |= FCF_CLOSEBUTTON; + // determine creation data (bei Moveable nehmen wir DLG-Border, damit + // es besser aussieht) + if ( nSalFrameStyle & SAL_FRAME_STYLE_CLOSEABLE ) + nFrameFlags |= FCF_CLOSEBUTTON; if ( nSalFrameStyle & SAL_FRAME_STYLE_MOVEABLE ) { pFrame->mbCaption = TRUE; @@ -1613,8 +1611,6 @@ void Os2SalFrame::SetPointer( PointerStyle ePointerStyle ) { 0, 0, SAL_RESID_POINTER_PIVOT_FIELD }, // POINTER_PIVOT_FIELD { 0, 0, SAL_RESID_POINTER_CHAIN }, // POINTER_CHAIN { 0, 0, SAL_RESID_POINTER_CHAIN_NOTALLOWED }, // POINTER_CHAIN_NOTALLOWED - { 0, 0, SAL_RESID_POINTER_TIMEEVENT_MOVE }, // POINTER_TIMEEVENT_MOVE - { 0, 0, SAL_RESID_POINTER_TIMEEVENT_SIZE }, // POINTER_TIMEEVENT_SIZE { 0, 0, SAL_RESID_POINTER_AUTOSCROLL_N }, // POINTER_AUTOSCROLL_N { 0, 0, SAL_RESID_POINTER_AUTOSCROLL_S }, // POINTER_AUTOSCROLL_S { 0, 0, SAL_RESID_POINTER_AUTOSCROLL_W }, // POINTER_AUTOSCROLL_W @@ -3715,10 +3711,10 @@ MRESULT EXPENTRY SalFrameWndProc( HWND hWnd, ULONG nMsg, } } - if ( bDef ) - nRet = WinDefWindowProc( hWnd, nMsg, nMP1, nMP2 ); + if ( bDef ) + nRet = WinDefWindowProc( hWnd, nMsg, nMP1, nMP2 ); - return nRet; + return nRet; } // ----------------------------------------------------------------------- @@ -3744,10 +3740,10 @@ void Os2SalFrame::EndSetClipRegion() MRESULT EXPENTRY SalFrameSubClassWndProc( HWND hWnd, ULONG nMsg, MPARAM nMP1, MPARAM nMP2 ) { - MRESULT mReturn = 0L; + MRESULT mReturn = 0L; - // ticket#124 min size of 132 px is too much - if (nMsg == WM_QUERYTRACKINFO) { + // ticket#124 min size of 132 px is too much + if (nMsg == WM_QUERYTRACKINFO) { PTRACKINFO pti; // first, let PM initialize TRACKINFO mReturn = aSalShlData.mpFrameProc( hWnd, nMsg, nMP1, nMP2 ); @@ -3756,9 +3752,9 @@ MRESULT EXPENTRY SalFrameSubClassWndProc( HWND hWnd, ULONG nMsg, pti->ptlMinTrackSize.x = 64L; // now return to PM return mReturn; - } + } - return aSalShlData.mpFrameProc( hWnd, nMsg, nMP1, nMP2 ); + return aSalShlData.mpFrameProc( hWnd, nMsg, nMP1, nMP2 ); } -// ----------------------------------------------------------------------- +/* vim: set noet sw=4 ts=4: */ diff --git a/main/vcl/win/source/window/salframe.cxx b/main/vcl/win/source/window/salframe.cxx index 2e5f1adbf8..c5c708a1e1 100644 --- a/main/vcl/win/source/window/salframe.cxx +++ b/main/vcl/win/source/window/salframe.cxx @@ -2329,8 +2329,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { 0, 0, SAL_RESID_POINTER_PIVOT_FIELD }, // POINTER_PIVOT_FIELD { 0, 0, SAL_RESID_POINTER_CHAIN }, // POINTER_CHAIN { 0, 0, SAL_RESID_POINTER_CHAIN_NOTALLOWED }, // POINTER_CHAIN_NOTALLOWED - { 0, 0, SAL_RESID_POINTER_TIMEEVENT_MOVE }, // POINTER_TIMEEVENT_MOVE - { 0, 0, SAL_RESID_POINTER_TIMEEVENT_SIZE }, // POINTER_TIMEEVENT_SIZE { 0, 0, SAL_RESID_POINTER_AUTOSCROLL_N }, // POINTER_AUTOSCROLL_N { 0, 0, SAL_RESID_POINTER_AUTOSCROLL_S }, // POINTER_AUTOSCROLL_S { 0, 0, SAL_RESID_POINTER_AUTOSCROLL_W }, // POINTER_AUTOSCROLL_W