diff --git a/source/uCEFLinuxFunctions.pas b/source/uCEFLinuxFunctions.pas index 60c1d3e2..cd5729ea 100644 --- a/source/uCEFLinuxFunctions.pas +++ b/source/uCEFLinuxFunctions.pas @@ -24,10 +24,10 @@ uses {$IFDEF LINUX} procedure GdkEventKeyToCEFKeyEvent(GdkEvent: PGdkEventKey; var aCEFKeyEvent : TCEFKeyEvent); function KeyboardCodeFromXKeysym(keysym : uint32) : integer; -{$IFDEF LINUXFMX or LCLGTK2 or (LCLGTK3 and (LCL_FULLVERSION<3000000))} +{$IF DEFINED(LINUXFMX) or DEFINED(LCLGTK2)} function GetCefStateModifiers(state : uint32) : integer; {$ENDIF} -{$IFDEF LCLGTK3 and (LCL_FULLVERSION>3000000)} +{$IF DEFINED(LCLGTK3)} function GetCefStateModifiers(state : TGdkModifierType) : integer; {$ENDIF} function GdkEventToWindowsKeyCode(Event: PGdkEventKey) : integer; @@ -453,7 +453,7 @@ begin end; end; -{$IFDEF LINUXFMX or LCLGTK2 or (LCLGTK3 and (LCL_FULLVERSION<3000000))} +{$IF DEFINED(LINUXFMX) or DEFINED(LCLGTK2)} function GetCefStateModifiers(state : uint32) : integer; begin Result := EVENTFLAG_NONE; @@ -480,7 +480,7 @@ begin Result := Result or EVENTFLAG_RIGHT_MOUSE_BUTTON; end; {$ENDIF} -{$IFDEF LCLGTK3 and (LCL_FULLVERSION>3000000)} +{$IF DEFINED(LCLGTK3)} function GetCefStateModifiers(state : TGdkModifierType) : integer; begin Result := EVENTFLAG_NONE; @@ -508,8 +508,6 @@ begin end; {$ENDIF} - - function GdkEventToWindowsKeyCode(event: PGdkEventKey) : integer; var windows_key_code, keyval : integer; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 82ee3a32..1c95afeb 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 596, + "InternalVersion" : 597, "Name" : "cef4delphi_lazarus.lpk", "Version" : "124.3.7" }