paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-19 14:00:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

- crNone cursor for gtk and carbon (issue #8962)

Browse Source 
git-svn-id: trunk@11400 -
This commit is contained in:
paul 2007-06-29 08:22:12 +00:00
parent 6044c936f7
commit 962d6f164c
8 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -2318,6 +2318,7 @@ lcl/images/buttons/btn_retry.png -text svneol=unset#image/png
lcl/images/buttons/btn_yes.png -text svneol=unset#image/png lcl/images/buttons/btn_yes.png -text svneol=unset#image/png
lcl/images/buttons/build.bat -text lcl/images/buttons/build.bat -text
lcl/images/cursors/build.bat -text svneol=CRLF#application/x-bat lcl/images/cursors/build.bat -text svneol=CRLF#application/x-bat
lcl/images/cursors/cur_1.cur -text svneol=unset#image/x-cursor
lcl/images/cursors/cur_10.cur -text svneol=unset#image/x-cursor lcl/images/cursors/cur_10.cur -text svneol=unset#image/x-cursor
lcl/images/cursors/cur_12.cur -text svneol=unset#image/x-cursor lcl/images/cursors/cur_12.cur -text svneol=unset#image/x-cursor
lcl/images/cursors/cur_13.cur -text svneol=unset#image/x-cursor lcl/images/cursors/cur_13.cur -text svneol=unset#image/x-cursor

15
lcl/cursors.lrs
View File

@ -1,3 +1,18 @@
LazarusResources.Add('cur_1','CUR',[
#0#0#2#0#1#0' '#0#0#0#0#0#0'0'#1#0#0#22#0#0#0'('#0#0#0' '#0#0#0'@'#0#0#0#1#0
+#1#0#0#0#0#0#0#1#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#255#255#0#0
+#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+#0#0#0#0#0#0#0#0#0#0#0#0#0#255#255#255#255#255#255#255#255#255#255#255#255
+#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+#255#255
]);
LazarusResources.Add('cur_10','CUR',[ LazarusResources.Add('cur_10','CUR',[
#0#0#2#0#1#0' '#0#0#5#0#0#0'0'#1#0#0#22#0#0#0'('#0#0#0' '#0#0#0'@'#0#0#0#1#0 #0#0#2#0#1#0' '#0#0#5#0#0#0'0'#1#0#0#22#0#0#0'('#0#0#0' '#0#0#0'@'#0#0#0#1#0
+#1#0#0#0#0#0#0#1#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#255#255#0#0 +#1#0#0#0#0#0#0#1#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#255#255#0#0

2
lcl/images/cursors/build.bat
View File

@ -1 +1 @@
lazres cursors.lrs cur_10.cur cur_12.cur cur_13.cur cur_14.cur cur_15.cur cur_16.cur cur_17.cur cur_18.cur cur_20.cur cur_21.cur cur_22.cur lazres cursors.lrs cur_1.cur cur_10.cur cur_12.cur cur_13.cur cur_14.cur cur_15.cur cur_16.cur cur_17.cur cur_18.cur cur_20.cur cur_21.cur cur_22.cur

BIN
lcl/images/cursors/cur_1.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 326 B

15
lcl/include/screen.inc
View File

@ -312,7 +312,7 @@ end;
function TScreen.GetCursors(AIndex: Integer): HCURSOR; function TScreen.GetCursors(AIndex: Integer): HCURSOR;
begin begin
Result := 0; Result := 0;
if AIndex = crNone then Exit; //if AIndex = crNone then Exit;
if FCursorMap.GetData(AIndex, Result) then Exit; if FCursorMap.GetData(AIndex, Result) then Exit;
Result := FDefaultCursor; Result := FDefaultCursor;
@ -320,10 +320,13 @@ begin
if AIndex < crLow then Exit; if AIndex < crLow then Exit;
// not yet loaded // not yet loaded
if AIndex = crNone then
Result := Result;
Result := WidgetSet.CreateStandardCursor(AIndex); Result := WidgetSet.CreateStandardCursor(AIndex);
if Result = 0 if Result = 0 then
then Result := LoadCursorFromLazarusResource('cur_' + IntToStr(-AIndex)); Result := LoadCursorFromLazarusResource('cur_' + IntToStr(-AIndex));
if Result = 0 then Exit; if Result = 0 then
Exit;
FCursorMap.Add(AIndex, Result); FCursorMap.Add(AIndex, Result);
end; end;
@ -488,8 +491,8 @@ begin
else else
FDefaultCursor := AValue FDefaultCursor := AValue
end; end;
crNone: begin { crNone: begin
end; end;}
else else
DeleteCursor(AIndex); DeleteCursor(AIndex);
if AValue <> 0 then if AValue <> 0 then

2
lcl/interfaces/carbon/carbongdiobjects.pp
View File

@ -194,7 +194,7 @@ const
{crIBeam } kThemeIBeamCursor, {crIBeam } kThemeIBeamCursor,
{crCross } kThemeCrossCursor, {crCross } kThemeCrossCursor,
{crArrow } kThemeArrowCursor, {crArrow } kThemeArrowCursor,
{crNone } kThemeArrowCursor, {crNone } kThemeUndefCursor,
{crDefault } kThemeArrowCursor); {crDefault } kThemeArrowCursor);
type type

2
lcl/interfaces/gtk/gtkobject.inc
View File

@ -4851,11 +4851,9 @@ begin
case TCursor(ACursor) of case TCursor(ACursor) of
crDefault: CursorValue := GDK_LEFT_PTR; crDefault: CursorValue := GDK_LEFT_PTR;
crNone: CursorValue := GDK_LEFT_PTR;
crArrow: CursorValue := GDK_Arrow; crArrow: CursorValue := GDK_Arrow;
crCross: CursorValue := GDK_Cross; crCross: CursorValue := GDK_Cross;
crIBeam: CursorValue := GDK_XTerm; crIBeam: CursorValue := GDK_XTerm;
// crSize: CursorValue := GDK_FLEUR;
crSizeNESW: CursorValue := GDK_BOTTOM_LEFT_CORNER; crSizeNESW: CursorValue := GDK_BOTTOM_LEFT_CORNER;
crSizeNS: CursorValue := GDK_SB_V_DOUBLE_ARROW; crSizeNS: CursorValue := GDK_SB_V_DOUBLE_ARROW;
crSizeNWSE: CursorValue := GDK_TOP_LEFT_CORNER; crSizeNWSE: CursorValue := GDK_TOP_LEFT_CORNER;

2
lcl/interfaces/win32/win32lclintf.inc
View File

@ -162,7 +162,7 @@ begin
case ACursor of case ACursor of
crSqlWait..crDrag, crSqlWait..crDrag,
crHandPoint: begin crHandPoint, crNone: begin
// TODO: load custom cursors here not in the LCL // TODO: load custom cursors here not in the LCL
end; end;
else else