From 5e5c1122a7a636e599ac5d8bb409a7b1599e82bd Mon Sep 17 00:00:00 2001 From: mattias Date: Thu, 18 Sep 2003 09:21:03 +0000 Subject: [PATCH] renamed LCLLinux to LCLIntf git-svn-id: trunk@4637 - --- .gitattributes | 2 +- components/htmllite/htmllite.pas | 2 +- components/htmllite/litesbs1.pas | 2 +- components/htmllite/litesubs.pas | 2 +- components/htmllite/liteun2.pas | 2 +- components/synedit/syncompletion.pas | 3 +- components/synedit/synedit.pp | 31 ++++++++-------- components/synedit/syneditautocomplete.pp | 2 +- components/synedit/syneditexport.pas | 2 +- components/synedit/synedithighlighter.pp | 2 +- components/synedit/syneditkeycmds.pp | 2 +- components/synedit/syneditmiscclasses.pp | 2 +- components/synedit/syneditmiscprocs.pp | 3 +- components/synedit/syneditplugins.pas | 2 +- components/synedit/syneditsearch.pp | 2 +- components/synedit/synedittextbuffer.pp | 2 +- components/synedit/synexporthtml.pas | 2 +- components/synedit/synhighlightercpp.pp | 2 +- components/synedit/synhighlighterhtml.pp | 2 +- components/synedit/synhighlighterjava.pas | 2 +- components/synedit/synhighlighterlfm.pas | 3 +- components/synedit/synhighlighterpas.pp | 2 +- components/synedit/synhighlighterperl.pas | 3 +- components/synedit/synhighlighterxml.pas | 3 +- components/synedit/synmacrorecorder.pas | 2 +- components/synedit/synmemo.pas | 2 +- components/synedit/synregexpr.pas | 2 +- components/synedit/syntextdrawer.pp | 24 ++++++------ components/turbopower_ipro/ipanim.pas | 2 +- components/turbopower_ipro/ipmsg.pas | 5 ++- components/turbopower_ipro/ipstrms.pas | 5 ++- components/turbopower_ipro/iputils.pas | 2 +- designer/aligncompsdlg.pp | 2 +- designer/controlselection.pp | 2 +- designer/designer.pp | 2 +- designer/designerprocs.pas | 2 +- designer/graphpropedits.pas | 2 +- designer/jitforms.pp | 2 +- designer/objectinspector.pp | 2 +- designer/propedits.pp | 2 +- designer/scalecompsdlg.pp | 2 +- designer/sizecompsdlg.pp | 2 +- examples/checkbox.pp | 5 ++- examples/speedtest.pp | 2 +- examples/testallform.pp | 7 +++- ide/buildlazdialog.pas | 2 +- ide/codetemplatedialog.pp | 2 +- ide/codetoolsdefines.pas | 2 +- ide/editoroptions.pp | 2 +- ide/findinfilesdlg.pas | 2 +- ide/keymapping.pp | 2 +- ide/main.pp | 9 +++-- ide/mainbar.pas | 2 +- ide/project.pp | 5 ++- ide/projectopts.pp | 2 +- ide/splash.pp | 5 ++- ide/todolist.pp | 2 +- ide/uniteditor.pp | 4 +- lcl/Makefile | 2 +- lcl/Makefile.fpc | 2 +- lcl/allunits.pp | 5 ++- lcl/buttons.pp | 5 ++- lcl/clipbrd.pp | 5 ++- lcl/comctrls.pp | 5 ++- lcl/controls.pp | 5 ++- lcl/dialogs.pp | 5 ++- lcl/extctrls.pp | 5 ++- lcl/forms.pp | 2 +- lcl/graphics.pp | 5 ++- lcl/grids.pas | 8 ++-- lcl/include/canvas.inc | 45 ++++++++++++----------- lcl/include/controlscrollbar.inc | 2 +- lcl/include/customform.inc | 13 ++++--- lcl/include/customnotebook.inc | 5 ++- lcl/include/messagedialogs.inc | 5 ++- lcl/include/mouse.inc | 2 +- lcl/include/promptdialog.inc | 5 ++- lcl/include/screen.inc | 2 +- lcl/include/wincontrol.inc | 21 ++++++----- lcl/interfaces/gnome/gnomeint.pp | 5 ++- lcl/interfaces/gtk/gtkdef.pp | 5 ++- lcl/interfaces/gtk/gtkglobals.pp | 2 +- lcl/interfaces/gtk/gtkint.pp | 5 ++- lcl/interfaces/gtk/gtkproc.pp | 2 +- lcl/interfaces/gtk/gtkwinapi.inc | 17 +++++---- lcl/interfaces/gtk2/gtk2int.pas | 9 +++-- lcl/interfaces/qt/qtint.pp | 2 +- lcl/interfaces/win32/win32int.pp | 5 ++- lcl/intfgraphics.pas | 2 +- lcl/{lcllinux.pp => lclintf.pas} | 10 +++-- lcl/menus.pp | 5 ++- lcl/pairsplitter.pas | 2 +- lcl/postscriptprinter.pas | 2 +- lcl/stdctrls.pp | 5 ++- lcl/toolwin.pp | 2 +- 95 files changed, 259 insertions(+), 176 deletions(-) rename lcl/{lcllinux.pp => lclintf.pas} (97%) diff --git a/.gitattributes b/.gitattributes index 7bc679a085..dcab749d35 100644 --- a/.gitattributes +++ b/.gitattributes @@ -951,7 +951,7 @@ lcl/languages/lcl.pl.po svneol=native#text/plain lcl/languages/lcl.po svneol=native#text/plain lcl/languages/lcl.ru.po svneol=native#text/plain lcl/lazlinkedlist.pas svneol=native#text/pascal -lcl/lcllinux.pp svneol=native#text/pascal +lcl/lclintf.pas svneol=native#text/pascal lcl/lclmemmanager.pas svneol=native#text/pascal lcl/lclproc.pas svneol=native#text/pascal lcl/lclstrconsts.pas svneol=native#text/pascal diff --git a/components/htmllite/htmllite.pas b/components/htmllite/htmllite.pas index d0332be9e6..1cdc4912d1 100644 --- a/components/htmllite/htmllite.pas +++ b/components/htmllite/htmllite.pas @@ -14,7 +14,7 @@ interface {$IFDEF HL_LAZARUS} uses - Classes, SysUtils, LCLLinux, LMessages, Messages, LCLType, VCLGlobals, + Classes, SysUtils, LCLIntf, LMessages, Messages, LCLType, VCLGlobals, GraphType, Graphics, Controls, StdCtrls, Forms, Dialogs, ExtCtrls, Menus, Clipbrd, LiteUn2, LiteSubs, LiteSbs1, LitePars, LiteReadThd; {$ELSE not HL_LAZARUS} diff --git a/components/htmllite/litesbs1.pas b/components/htmllite/litesbs1.pas index 3d2519cc59..8119cbce4b 100644 --- a/components/htmllite/litesbs1.pas +++ b/components/htmllite/litesbs1.pas @@ -13,7 +13,7 @@ unit LiteSbs1; interface uses {$IFDEF HL_LAZARUS} - Classes, SysUtils, LCLType, LCLLinux, Messages, GraphType, Graphics, Controls, + Classes, SysUtils, LCLType, LCLIntf, Messages, GraphType, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, LiteUn2, LiteSubs; {$ELSE} SysUtils, WinTypes, WinProcs, Messages, Classes, Graphics, Controls, diff --git a/components/htmllite/litesubs.pas b/components/htmllite/litesubs.pas index 0ec2211aad..6063eefba1 100644 --- a/components/htmllite/litesubs.pas +++ b/components/htmllite/litesubs.pas @@ -43,7 +43,7 @@ unit LiteSubs; interface uses {$IFDEF HL_LAZARUS} - Classes, SysUtils, VCLGlobals, LCLType, LCLLinux, Messages, + Classes, SysUtils, VCLGlobals, LCLType, LCLIntf, Messages, GraphType, Graphics, Controls, Forms, Dialogs, Buttons, StdCtrls, ExtCtrls, LiteUn2, LiteGif2; {$ELSE} diff --git a/components/htmllite/liteun2.pas b/components/htmllite/liteun2.pas index 258e82e8f3..81966e1485 100644 --- a/components/htmllite/liteun2.pas +++ b/components/htmllite/liteun2.pas @@ -13,7 +13,7 @@ unit LiteUn2; interface uses {$IFDEF HL_LAZARUS} - LCLLinux, LCLType, VCLGlobals, SysUtils, Messages, Classes, GraphType, + LCLIntf, LCLType, VCLGlobals, SysUtils, Messages, Classes, GraphType, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls; {$ELSE} Windows, SysUtils, Messages, Classes, Graphics, Controls, diff --git a/components/synedit/syncompletion.pas b/components/synedit/syncompletion.pas index f4e59711ac..9f4f2e49f7 100644 --- a/components/synedit/syncompletion.pas +++ b/components/synedit/syncompletion.pas @@ -42,8 +42,7 @@ interface uses {$IFDEF SYN_LAZARUS} - LCLLinux, LMessages, - LCLType, GraphType, + LCLIntf, LMessages, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp index ade0ac28e2..048ecbbe6a 100644 --- a/components/synedit/synedit.pp +++ b/components/synedit/synedit.pp @@ -62,8 +62,7 @@ interface uses {$IFDEF SYN_LAZARUS} - LCLLinux, - LCLType, GraphType, LMessages, + LCLIntf, LCLType, LMessages, {$ELSE} Windows, {$ENDIF} @@ -1253,7 +1252,7 @@ var begin //writeln('[TCustomSynEdit.Destroy]'); {$IFDEF SYN_LAZARUS} - if HandleAllocated then LCLLinux.DestroyCaret(Handle); + if HandleAllocated then LCLIntf.DestroyCaret(Handle); {$ENDIF} Highlighter := nil; // free listeners while other fields are still valid @@ -1552,7 +1551,7 @@ procedure TCustomSynEdit.HideCaret; begin //writeln('[TCustomSynEdit.HideCaret] ',Name,' ',sfCaretVisible in fStateFlags,' ',eoPersistentCaret in Options); if sfCaretVisible in fStateFlags then begin - if {$IFDEF SYN_LAZARUS}LCLLinux{$ELSE}Windows{$ENDIF}.HideCaret(Handle) then + if {$IFDEF SYN_LAZARUS}LCLIntf{$ELSE}Windows{$ENDIF}.HideCaret(Handle) then Exclude(fStateFlags, sfCaretVisible); end; end; @@ -1934,7 +1933,7 @@ begin {$IFDEF SYN_LAZARUS} if (X < fGutterWidth) then Include(fStateFlags, sfPossibleGutterClick); - LCLLinux.SetFocus(Handle); + LCLIntf.SetFocus(Handle); UpdateCaret; {$ELSE} if (fMouseDownX < fGutterWidth) then @@ -2277,7 +2276,7 @@ begin // and fill only the area after the last visible line. dc := Canvas.Handle; {$IFDEF SYN_LAZARUS} - LCLLinux.SetBkColor(dc,Canvas.Brush.Color); + LCLIntf.SetBkColor(dc,Canvas.Brush.Color); {$ENDIF} if fGutter.ShowLineNumbers then begin fTextDrawer.BeginDrawing(dc); @@ -2301,9 +2300,9 @@ begin s := fGutter.FormatLineNumber(iLine); {$IFDEF SYN_LAZARUS} InternalFillRect(DC, rcLine); - LCLLinux.DrawText(DC, PChar(S), Length(S), rcLine, + LCLIntf.DrawText(DC, PChar(S), Length(S), rcLine, DT_RIGHT or DT_Center or DT_SINGLELINE or DT_NOPREFIX); - //LCLLinux.ExtTextOut(DC, fGutter.LeftOffset, rcLine.Top, ETO_OPAQUE, + //LCLIntf.ExtTextOut(DC, fGutter.LeftOffset, rcLine.Top, ETO_OPAQUE, // @rcLine, PChar(s), Length(s), nil); {$ELSE} Windows.ExtTextOut(DC, fGutter.LeftOffset, rcLine.Top, ETO_OPAQUE, @@ -2509,8 +2508,8 @@ var // draw background InternalFillRect(dc,rcToken); // draw edge - LCLLinux.MoveToEx(dc, nRightEdge, rcToken.Top, nil); - LCLLinux.LineTo(dc, nRightEdge, rcToken.Bottom + 1); + LCLIntf.MoveToEx(dc, nRightEdge, rcToken.Top, nil); + LCLIntf.LineTo(dc, nRightEdge, rcToken.Bottom + 1); // draw text fTextDrawer.ExtTextOut(nX, rcToken.Top, ETOOptions-ETO_OPAQUE, rcToken, pszText, nCharsToPaint); @@ -2614,8 +2613,8 @@ var // Draw the right edge if necessary. if bDoRightEdge and (not (eoHideRightMargin in Options)) and (nRightEdge>=rcToken.Left) then begin - LCLLinux.MoveToEx(dc, nRightEdge, rcToken.Top, nil); - LCLLinux.LineTo(dc, nRightEdge, rcToken.Bottom + 1); + LCLIntf.MoveToEx(dc, nRightEdge, rcToken.Top, nil); + LCLIntf.LineTo(dc, nRightEdge, rcToken.Bottom + 1); end; {$ENDIF} end; @@ -3189,8 +3188,8 @@ begin // Draw the right edge if necessary. if bDoRightEdge and (not (eoHideRightMargin in Options)) then begin {$IFDEF SYN_LAZARUS} - LCLLinux.MoveToEx(dc, nRightEdge, rcToken.Top, nil); - LCLLinux.LineTo(dc, nRightEdge, rcToken.Bottom + 1); + LCLIntf.MoveToEx(dc, nRightEdge, rcToken.Top, nil); + LCLIntf.LineTo(dc, nRightEdge, rcToken.Bottom + 1); {$ELSE} Windows.MoveToEx(dc, nRightEdge, rcToken.Top, nil); Windows.LineTo(dc, nRightEdge, rcToken.Bottom + 1); @@ -3988,7 +3987,7 @@ begin {$IFDEF SYN_LAZARUS} SetCaretRespondToFocus(Handle,not (eoPersistentCaret in fOptions)); {$ENDIF} - if {$IFDEF SYN_LAZARUS}LCLLinux{$ELSE}Windows{$ENDIF}.ShowCaret(Handle) then + if {$IFDEF SYN_LAZARUS}LCLIntf{$ELSE}Windows{$ENDIF}.ShowCaret(Handle) then begin //writeln('[TCustomSynEdit.ShowCaret] A ',Name); Include(fStateFlags, sfCaretVisible); @@ -4201,7 +4200,7 @@ begin LastMouseCaret:=Point(-1,-1); if not (eoPersistentCaret in fOptions) then begin HideCaret; - LCLLinux.DestroyCaret(Handle); + LCLIntf.DestroyCaret(Handle); end; {$ELSE} HideCaret; diff --git a/components/synedit/syneditautocomplete.pp b/components/synedit/syneditautocomplete.pp index c268520f26..67554d0bce 100644 --- a/components/synedit/syneditautocomplete.pp +++ b/components/synedit/syneditautocomplete.pp @@ -45,7 +45,7 @@ interface uses {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/syneditexport.pas b/components/synedit/syneditexport.pas index 096fc30de2..63953ca8bf 100644 --- a/components/synedit/syneditexport.pas +++ b/components/synedit/syneditexport.pas @@ -60,7 +60,7 @@ uses QClipbrd {$ELSE} {$IFDEF SYN_LAZARUS} - LCLLinux, GraphType, LCLType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synedithighlighter.pp b/components/synedit/synedithighlighter.pp index 3820212cf6..f9f4d6aeaa 100644 --- a/components/synedit/synedithighlighter.pp +++ b/components/synedit/synedithighlighter.pp @@ -40,7 +40,7 @@ uses {$ELSE} Graphics, {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, GraphType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/syneditkeycmds.pp b/components/synedit/syneditkeycmds.pp index 0eda20ba27..b96cac0cb5 100644 --- a/components/synedit/syneditkeycmds.pp +++ b/components/synedit/syneditkeycmds.pp @@ -43,7 +43,7 @@ interface uses {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/syneditmiscclasses.pp b/components/synedit/syneditmiscclasses.pp index cda5ba6c5b..f9f992d25f 100644 --- a/components/synedit/syneditmiscclasses.pp +++ b/components/synedit/syneditmiscclasses.pp @@ -43,7 +43,7 @@ interface uses {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, GraphType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/syneditmiscprocs.pp b/components/synedit/syneditmiscprocs.pp index fb832cf530..b15b48c592 100644 --- a/components/synedit/syneditmiscprocs.pp +++ b/components/synedit/syneditmiscprocs.pp @@ -43,8 +43,7 @@ interface uses {$IFDEF SYN_LAZARUS} - LCLLinux, - LCLType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/syneditplugins.pas b/components/synedit/syneditplugins.pas index 6ac7787bd5..b912e592a8 100644 --- a/components/synedit/syneditplugins.pas +++ b/components/synedit/syneditplugins.pas @@ -48,7 +48,7 @@ uses QMenus, {$ELSE} {$IFDEF SYN_LAZARUS} - LCLLinux, + LCLIntf, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/syneditsearch.pp b/components/synedit/syneditsearch.pp index fffe0ea902..fdcad261a5 100644 --- a/components/synedit/syneditsearch.pp +++ b/components/synedit/syneditsearch.pp @@ -124,7 +124,7 @@ implementation uses {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synedittextbuffer.pp b/components/synedit/synedittextbuffer.pp index 9dfc9a75b7..ec5daf3fe2 100644 --- a/components/synedit/synedittextbuffer.pp +++ b/components/synedit/synedittextbuffer.pp @@ -44,7 +44,7 @@ interface uses Classes, SysUtils, {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synexporthtml.pas b/components/synedit/synexporthtml.pas index cb152508ce..5b1cc5935b 100644 --- a/components/synedit/synexporthtml.pas +++ b/components/synedit/synexporthtml.pas @@ -50,7 +50,7 @@ uses QGraphics, {$ELSE} {$IFDEF SYN_LAZARUS} - LCLLinux, Graphics, GraphType, ClipBrd, + LCLIntf, Graphics, ClipBrd, {$ELSE} Windows, Graphics, diff --git a/components/synedit/synhighlightercpp.pp b/components/synedit/synhighlightercpp.pp index ca6a2020f1..024bd1ac51 100644 --- a/components/synedit/synhighlightercpp.pp +++ b/components/synedit/synhighlightercpp.pp @@ -52,7 +52,7 @@ interface uses SysUtils, {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, GraphType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synhighlighterhtml.pp b/components/synedit/synhighlighterhtml.pp index bf9f4519f2..73e5c25ac6 100644 --- a/components/synedit/synhighlighterhtml.pp +++ b/components/synedit/synhighlighterhtml.pp @@ -50,7 +50,7 @@ interface uses SysUtils, {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, GraphType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synhighlighterjava.pas b/components/synedit/synhighlighterjava.pas index 399d6290f6..640f866554 100644 --- a/components/synedit/synhighlighterjava.pas +++ b/components/synedit/synhighlighterjava.pas @@ -50,7 +50,7 @@ interface uses SysUtils, Classes, {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, GraphType, Graphics, + LCLIntf, LCLType, Graphics, {$ELSE} {$IFDEF SYN_CLX} Qt, QControls, QGraphics, diff --git a/components/synedit/synhighlighterlfm.pas b/components/synedit/synhighlighterlfm.pas index b225626ed7..7d6685565a 100644 --- a/components/synedit/synhighlighterlfm.pas +++ b/components/synedit/synhighlighterlfm.pas @@ -54,8 +54,7 @@ uses Qt, QControls, QGraphics, {$ELSE} {$IFDEF SYN_LAZARUS} - LCLLinux, - LCLType, GraphType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synhighlighterpas.pp b/components/synedit/synhighlighterpas.pp index 1793f8d992..660e83b176 100644 --- a/components/synedit/synhighlighterpas.pp +++ b/components/synedit/synhighlighterpas.pp @@ -53,7 +53,7 @@ interface uses SysUtils, {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, GraphType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synhighlighterperl.pas b/components/synedit/synhighlighterperl.pas index 70783f166b..d25b407bf4 100644 --- a/components/synedit/synhighlighterperl.pas +++ b/components/synedit/synhighlighterperl.pas @@ -56,8 +56,7 @@ uses Qt, QControls, QGraphics, {$ELSE} {$IFDEF SYN_LAZARUS} - LCLLinux, - LCLType, GraphType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synhighlighterxml.pas b/components/synedit/synhighlighterxml.pas index d34cb9f778..6a642d9609 100644 --- a/components/synedit/synhighlighterxml.pas +++ b/components/synedit/synhighlighterxml.pas @@ -61,8 +61,7 @@ uses Qt, QControls, QGraphics, {$ELSE} {$IFDEF SYN_LAZARUS} - LCLLinux, - LCLType, GraphType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synmacrorecorder.pas b/components/synedit/synmacrorecorder.pas index 3e399a6daa..29aea22412 100644 --- a/components/synedit/synmacrorecorder.pas +++ b/components/synedit/synmacrorecorder.pas @@ -56,7 +56,7 @@ uses StdCtrls, Controls, {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, + LCLIntf, LCLType, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synmemo.pas b/components/synedit/synmemo.pas index 427eb406ce..e5ba8791cb 100644 --- a/components/synedit/synmemo.pas +++ b/components/synedit/synmemo.pas @@ -50,7 +50,7 @@ uses Types, {$ELSE} {$IFDEF SYN_LAZARUS} - LCLLinux, Controls, + LCLIntf, Controls, {$ELSE} Windows, {$ENDIF} diff --git a/components/synedit/synregexpr.pas b/components/synedit/synregexpr.pas index f194ee3114..497a33adeb 100644 --- a/components/synedit/synregexpr.pas +++ b/components/synedit/synregexpr.pas @@ -986,7 +986,7 @@ implementation {$IFDEF SYN_LAZARUS} uses - LCLLinux; + LCLIntf; {$ELSE} {$IFNDEF LINUX} //js 07-04-2002 only use windows in non-CLX-envirolment -- SYN_CLX doesn't work, why? uses diff --git a/components/synedit/syntextdrawer.pp b/components/synedit/syntextdrawer.pp index c80897d7e3..24cf0b14ab 100644 --- a/components/synedit/syntextdrawer.pp +++ b/components/synedit/syntextdrawer.pp @@ -71,7 +71,7 @@ interface uses {$IFDEF SYN_LAZARUS} - LCLLinux, LCLType, GraphType, + LCLIntf, LCLType, GraphType, {$ELSE} Windows, {$ENDIF} @@ -913,8 +913,8 @@ begin Windows.SetBkColor(DC, ColorToRGB(FBkColor)); {$ELSE} FSavedFont := SelectObject(DC, FCrntFont); - LCLLinux.SetTextColor(DC, FColor); - LCLLinux.SetBkColor(DC, FBkColor); + LCLIntf.SetTextColor(DC, FColor); + LCLIntf.SetBkColor(DC, FBkColor); {$ENDIF} DoSetCharExtra(FCharExtra); end; @@ -1020,7 +1020,7 @@ begin FBkColor := Value; if FDC <> 0 then {$IFDEF SYN_LAZARUS} - LCLLinux.SetBkColor(FDC, Value); + LCLIntf.SetBkColor(FDC, Value); {$ELSE} Windows.SetBkColor(FDC, ColorToRGB(Value)); {$ENDIF} @@ -1046,7 +1046,7 @@ procedure TheTextDrawer.TextOut(X, Y: Integer; Text: PChar; Length: Integer); begin {$IFDEF SYN_LAZARUS} - LCLLinux.TextOut(FDC, X, Y, Text, Length); + LCLIntf.TextOut(FDC, X, Y, Text, Length); {$ELSE} Windows.TextOut(FDC, X, Y, Text, Length); {$ENDIF} @@ -1080,7 +1080,7 @@ begin if FETOSizeInChar < Length then InitETODist(GetCharWidth); {$IFDEF SYN_LAZARUS} - LCLLinux.ExtTextOut(FDC, X, Y, fuOptions, @ARect, Text, + LCLIntf.ExtTextOut(FDC, X, Y, fuOptions, @ARect, Text, Length, PInteger(FETODist)); {$ELSE} Windows.ExtTextOut(FDC, X, Y, fuOptions, @ARect, Text, @@ -1172,7 +1172,7 @@ procedure TheTextDrawerEx.ExtTextOutFixed(X, Y: Integer; fuOptions: UINT; const ARect: TRect; Text: PChar; Length: Integer); begin {$IFDEF SYN_LAZARUS} - LCLLinux.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil); + LCLIntf.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil); {$ELSE} Windows.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil); {$ENDIF} @@ -1218,7 +1218,7 @@ begin n := GetCharWidth * Len; Right := Min(Left + n + GetCharWidth, ARect.Right); {$IFDEF SYN_LAZARUS} - LCLLinux.ExtTextOut(StockDC, X, Y, fuOptions, @TmpRect, pCrnt, Len, nil); + LCLIntf.ExtTextOut(StockDC, X, Y, fuOptions, @TmpRect, pCrnt, Len, nil); {$ELSE} Windows.ExtTextOut(StockDC, X, Y, fuOptions, @TmpRect, pCrnt, Len, nil); {$ENDIF} @@ -1238,7 +1238,7 @@ begin n := GetCharWidth * Len; Right := Min(Left + n + GetCharWidth, ARect.Right); {$IFDEF SYN_LAZARUS} - LCLLinux.ExtTextOut(StockDC, X, Y, fuOptions, @TmpRect, pCrnt, Len, nil); + LCLIntf.ExtTextOut(StockDC, X, Y, fuOptions, @TmpRect, pCrnt, Len, nil); {$ELSE} Windows.ExtTextOut(StockDC, X, Y, fuOptions, @TmpRect, pCrnt, Len, nil); {$ENDIF} @@ -1253,7 +1253,7 @@ begin begin SetTextCharacterExtra(StockDC, FCharExtra + FCrntDx); {$IFDEF SYN_LAZARUS} - LCLLinux.ExtTextOut(StockDC, X, Y, fuOptions, @TmpRect, nil, 0, nil); + LCLIntf.ExtTextOut(StockDC, X, Y, fuOptions, @TmpRect, nil, 0, nil); {$ELSE} Windows.ExtTextOut(StockDC, X, Y, fuOptions, @TmpRect, nil, 0, nil); {$ENDIF} @@ -1282,13 +1282,13 @@ begin (Left + GetCharWidth * (Length + 1) > Right) then {$IFDEF SYN_LAZARUS} - LCLLinux.TextOut(StockDC, X, Y, Text, Length) + LCLIntf.TextOut(StockDC, X, Y, Text, Length) {$ELSE} Windows.TextOut(StockDC, X, Y, Text, Length) {$ENDIF} else {$IFDEF SYN_LAZARUS} - LCLLinux.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil) + LCLIntf.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil) {$ELSE} Windows.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil) {$ENDIF} diff --git a/components/turbopower_ipro/ipanim.pas b/components/turbopower_ipro/ipanim.pas index 68918ea2ba..cb5da94389 100644 --- a/components/turbopower_ipro/ipanim.pas +++ b/components/turbopower_ipro/ipanim.pas @@ -40,7 +40,7 @@ uses {$IFDEF IP_LAZARUS} LCLType, GraphType, - LCLLinux, + LCLIntf, {$ELSE} Windows, Messages, diff --git a/components/turbopower_ipro/ipmsg.pas b/components/turbopower_ipro/ipmsg.pas index e84961238f..b13824c323 100644 --- a/components/turbopower_ipro/ipmsg.pas +++ b/components/turbopower_ipro/ipmsg.pas @@ -42,7 +42,7 @@ interface uses {$IFDEF IP_LAZARUS} LCLType, - LCLLinux, + LCLIntf, {$ELSE} Windows, {$ENDIF} @@ -3909,6 +3909,9 @@ end; { $Log$ + Revision 1.2 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.1 2003/03/27 18:25:35 mattias added ipro html components, compilable but not yet working diff --git a/components/turbopower_ipro/ipstrms.pas b/components/turbopower_ipro/ipstrms.pas index 9880fa8d9e..8fd6b612f4 100644 --- a/components/turbopower_ipro/ipstrms.pas +++ b/components/turbopower_ipro/ipstrms.pas @@ -44,7 +44,7 @@ uses {$IFDEF IP_LAZARUS} LCLType, GraphType, - LCLLinux, + LCLIntf, {$ELSE} Windows, {$ENDIF} @@ -1779,6 +1779,9 @@ end; { $Log$ + Revision 1.2 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.1 2003/03/27 18:25:35 mattias added ipro html components, compilable but not yet working diff --git a/components/turbopower_ipro/iputils.pas b/components/turbopower_ipro/iputils.pas index 714bcebc6f..e9c617927c 100644 --- a/components/turbopower_ipro/iputils.pas +++ b/components/turbopower_ipro/iputils.pas @@ -40,7 +40,7 @@ uses {$IFDEF IP_LAZARUS} LCLType, GraphType, - LCLLinux, + LCLIntf, LMessages, FileCtrl, {$ELSE} diff --git a/designer/aligncompsdlg.pp b/designer/aligncompsdlg.pp index aa23a6c91c..74e40560fe 100644 --- a/designer/aligncompsdlg.pp +++ b/designer/aligncompsdlg.pp @@ -30,7 +30,7 @@ unit AlignCompsDlg; interface uses - Classes, LCLLinux, Forms, Controls, Buttons, ExtCtrls, LResources; + Classes, LCLIntf, Forms, Controls, Buttons, ExtCtrls, LResources; type TAlignComponentsDialog = class(TForm) diff --git a/designer/controlselection.pp b/designer/controlselection.pp index 95f7a2774c..71b6735f6b 100644 --- a/designer/controlselection.pp +++ b/designer/controlselection.pp @@ -37,7 +37,7 @@ interface { $DEFINE VerboseDesigner} uses - Classes, LCLLinux, LCLType, Controls, Forms, GraphType, Graphics, SysUtils, + Classes, LCLIntf, LCLType, Controls, Forms, GraphType, Graphics, SysUtils, Menus, EnvironmentOpts, PropEdits, DesignerProcs; type diff --git a/designer/designer.pp b/designer/designer.pp index 50902eaa6d..40a2769b50 100644 --- a/designer/designer.pp +++ b/designer/designer.pp @@ -36,7 +36,7 @@ interface { $DEFINE VerboseDesignerDraw} uses - Classes, LCLType, LCLLinux, Forms, Controls, LMessages, GraphType, Graphics, + Classes, LCLType, LCLIntf, Forms, Controls, LMessages, GraphType, Graphics, Dialogs, ExtCtrls, Menus, ClipBrd, IDEProcs, LazarusIDEStrConsts, EnvironmentOpts, KeyMapping, ComponentReg, NonControlForms, AlignCompsDlg, SizeCompsDlg, ScaleCompsDlg, TabOrderDlg, diff --git a/designer/designerprocs.pas b/designer/designerprocs.pas index a3478ae46c..bbf3c93be8 100644 --- a/designer/designerprocs.pas +++ b/designer/designerprocs.pas @@ -33,7 +33,7 @@ unit DesignerProcs; interface uses - Classes, SysUtils, LCLLinux, Forms, Controls, LCLType, Graphics, VCLGlobals, + Classes, SysUtils, LCLIntf, Forms, Controls, LCLType, Graphics, VCLGlobals, Menus; type diff --git a/designer/graphpropedits.pas b/designer/graphpropedits.pas index e97971fd47..b9c7ef6121 100644 --- a/designer/graphpropedits.pas +++ b/designer/graphpropedits.pas @@ -23,7 +23,7 @@ interface uses Classes, TypInfo, SysUtils, Forms, Controls, LCLType, GraphType, Graphics, - StdCtrls, Buttons, ComCtrls, Menus, ExtCtrls, Dialogs, LCLLinux, PropEdits; + StdCtrls, Buttons, ComCtrls, Menus, ExtCtrls, Dialogs, LCLIntf, PropEdits; type {TGraphicPropertyEditor diff --git a/designer/jitforms.pp b/designer/jitforms.pp index e841644d76..67019fea3d 100644 --- a/designer/jitforms.pp +++ b/designer/jitforms.pp @@ -47,7 +47,7 @@ uses {$IFDEF IDE_MEM_CHECK} MemCheck, {$ENDIF} - Classes, SysUtils, TypInfo, Forms, Controls, LCLLinux, Dialogs, JITForm, + Classes, SysUtils, TypInfo, Forms, Controls, LCLIntf, Dialogs, JITForm, ComponentReg, IDEProcs; type diff --git a/designer/objectinspector.pp b/designer/objectinspector.pp index 5dcdb365a6..a6dedb303a 100644 --- a/designer/objectinspector.pp +++ b/designer/objectinspector.pp @@ -39,7 +39,7 @@ interface uses Forms, SysUtils, Buttons, Classes, Graphics, GraphType, StdCtrls, LCLType, - LCLLinux, LCLProc, LMessages, Controls, ComCtrls, ExtCtrls, TypInfo, Messages, + LCLIntf, LCLProc, LMessages, Controls, ComCtrls, ExtCtrls, TypInfo, Messages, LResources, PairSplitter, Laz_XMLCfg, Menus, Dialogs, ObjInspStrConsts, PropEdits, GraphPropEdits, ListViewPropEdit, ImageListEditor, ComponentTreeView; diff --git a/designer/propedits.pp b/designer/propedits.pp index 1f1da2ae99..94603b6643 100644 --- a/designer/propedits.pp +++ b/designer/propedits.pp @@ -40,7 +40,7 @@ interface uses Classes, TypInfo, SysUtils, LCLProc, Forms, Controls, GraphType, Graphics, - StdCtrls, Buttons, ComCtrls, Menus, LCLType, ExtCtrls, LCLLinux, Dialogs, + StdCtrls, Buttons, ComCtrls, Menus, LCLType, ExtCtrls, LCLIntf, Dialogs, ColumnDlg, ObjInspStrConsts; const diff --git a/designer/scalecompsdlg.pp b/designer/scalecompsdlg.pp index 39ac92844b..dfc4ff44b8 100644 --- a/designer/scalecompsdlg.pp +++ b/designer/scalecompsdlg.pp @@ -30,7 +30,7 @@ unit ScaleCompsDlg; interface uses - Classes, LCLLinux, Forms, Controls, Buttons, StdCtrls, ExtCtrls, LResources; + Classes, LCLIntf, Forms, Controls, Buttons, StdCtrls, ExtCtrls, LResources; type TScaleComponentsDialog = class(TForm) diff --git a/designer/sizecompsdlg.pp b/designer/sizecompsdlg.pp index 17524f33b7..a7ce3a46f7 100644 --- a/designer/sizecompsdlg.pp +++ b/designer/sizecompsdlg.pp @@ -30,7 +30,7 @@ unit SizeCompsDlg; interface uses - Classes, LCLLinux, Forms, Controls, Buttons, ExtCtrls, StdCtrls, LResources; + Classes, LCLIntf, Forms, Controls, Buttons, ExtCtrls, StdCtrls, LResources; type TSizeComponentsDialog = class(TForm) diff --git a/examples/checkbox.pp b/examples/checkbox.pp index b14ec04021..07db111544 100644 --- a/examples/checkbox.pp +++ b/examples/checkbox.pp @@ -413,6 +413,9 @@ end. { $Log$ + Revision 1.7 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.6 2002/10/30 13:44:29 lazarus MG: fixed examples @@ -433,7 +436,7 @@ end. reference it from interface (GTK, Win32) units. New Frame3d canvas method that uses native (themed) drawing (GTK only). New overloaded Canvas.TextRect method. - LCLLinux and Graphics was split, so a bunch of files had to be modified. + LCLIntf and Graphics was split, so a bunch of files had to be modified. Revision 1.1 2000/07/13 10:28:20 michael + Initial import diff --git a/examples/speedtest.pp b/examples/speedtest.pp index 8d8beca6d1..78929264a7 100644 --- a/examples/speedtest.pp +++ b/examples/speedtest.pp @@ -24,7 +24,7 @@ program SpeedTest; uses Interfaces, Forms, SysUtils, Buttons, Classes, StdCtrls, LCLType, - LCLLinux, Graphics; + LCLIntf, Graphics; type TForm1 = class(TForm) diff --git a/examples/testallform.pp b/examples/testallform.pp index f053991513..b7806020f6 100644 --- a/examples/testallform.pp +++ b/examples/testallform.pp @@ -41,8 +41,8 @@ interface uses classes, forms, buttons, StdCtrls, controls, menus, ExtCtrls, CListBox, - ComCtrls, SysUtils, GraphType, Graphics, Dialogs, Inifiles, Spin, clipbrd, lclLinux, - registry, lresources; + ComCtrls, SysUtils, GraphType, Graphics, Dialogs, Inifiles, Spin, clipbrd, + LCLIntf, registry, lresources; type TForm1 = class(TForm) @@ -2584,6 +2584,9 @@ END. { $Log$ + Revision 1.13 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.12 2003/01/01 11:11:49 mattias fixed testall example diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index 7c62f9a16d..bc0a7178dd 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -34,7 +34,7 @@ unit BuildLazDialog; interface uses - Classes, SysUtils, Forms, Controls, LCLType, LCLLinux, Graphics, GraphType, + Classes, SysUtils, Forms, Controls, LCLType, LCLIntf, Graphics, GraphType, StdCtrls, ExtCtrls, Buttons, FileCtrl, Dialogs, LResources, Laz_XMLCfg, LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs, InputHistory, ExtToolDialog, ExtToolEditDlg; diff --git a/ide/codetemplatedialog.pp b/ide/codetemplatedialog.pp index 26b52985fd..6435e932b8 100644 --- a/ide/codetemplatedialog.pp +++ b/ide/codetemplatedialog.pp @@ -31,7 +31,7 @@ unit CodeTemplateDialog; interface uses - Classes, SysUtils, LCLLinux, LResources, Forms, Buttons, Controls, + Classes, SysUtils, LCLIntf, LResources, Forms, Buttons, Controls, SynEditAutoComplete, LazarusIDEStrConsts, StdCtrls, SynEditKeyCmds, Dialogs; type diff --git a/ide/codetoolsdefines.pas b/ide/codetoolsdefines.pas index 97415d7ca5..add051a69c 100644 --- a/ide/codetoolsdefines.pas +++ b/ide/codetoolsdefines.pas @@ -44,7 +44,7 @@ unit CodeToolsDefines; interface uses - Classes, SysUtils, LCLLinux, Forms, Controls, Buttons, StdCtrls, ComCtrls, + Classes, SysUtils, LCLIntf, Forms, Controls, Buttons, StdCtrls, ComCtrls, ExtCtrls, Menus, LResources, LCLProc, Graphics, Dialogs, ImgList, SynEdit, Laz_XMLCfg, LazarusIDEStrConsts, DefineTemplates, CodeToolManager, CodeToolsOptions, CodeToolsDefPreview, TransferMacros, InputFileDialog, diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp index b19f531897..b849e3587c 100644 --- a/ide/editoroptions.pp +++ b/ide/editoroptions.pp @@ -38,7 +38,7 @@ unit EditorOptions; interface uses - LCLLinux, LCLType, + LCLIntf, LCLType, Forms, Classes, SysUtils, ComCtrls, Buttons, StdCtrls, ExtCtrls, LazConf, FileCtrl, GraphType, Graphics, Controls, Dialogs, LResources, IDEProcs, SynEdit, SynEditHighlighter, SynEditAutoComplete, SynEditKeyCmds, diff --git a/ide/findinfilesdlg.pas b/ide/findinfilesdlg.pas index 0ee0f6a69a..5b152f26d9 100644 --- a/ide/findinfilesdlg.pas +++ b/ide/findinfilesdlg.pas @@ -23,7 +23,7 @@ unit FindInFilesDlg; interface uses - Classes, SysUtils, LCLLinux, Controls, StdCtrls, Forms, Buttons, ExtCtrls, + Classes, SysUtils, LCLIntf, Controls, StdCtrls, Forms, Buttons, ExtCtrls, LResources, LazarusIDEStrConsts, DirSel, Dialogs, SynEditTypes; type diff --git a/ide/keymapping.pp b/ide/keymapping.pp index cc15d44beb..74bf9628c0 100644 --- a/ide/keymapping.pp +++ b/ide/keymapping.pp @@ -32,7 +32,7 @@ unit KeyMapping; interface uses - LCLLinux, LCLType, + LCLIntf, LCLType, Forms, Classes, SysUtils, Buttons, LResources, StdCtrls, Controls, SynEdit, SynEditKeyCmds, Laz_XMLCfg, Dialogs, StringHashList, LazarusIDEStrConsts; diff --git a/ide/main.pp b/ide/main.pp index f5bc6ab122..464d3052c6 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -47,8 +47,8 @@ uses // codetools Laz_XMLCfg, CodeToolsStructs, CodeToolManager, CodeCache, DefineTemplates, // lcl - LCLType, LclLinux, LCLproc, LMessages, LResources, StdCtrls, Forms, Buttons, - Menus, FileCtrl, Controls, Graphics, GraphType, ExtCtrls, Dialogs, + LCLType, LCLIntf, LCLproc, LMessages, LResources, StdCtrls, Forms, Buttons, + Menus, FileCtrl, Controls, GraphType, Graphics, ExtCtrls, Dialogs, // synedit SynEditKeyCmds, // compile @@ -2131,7 +2131,7 @@ procedure TMainIDE.ShowDesignerForm(AForm: TCustomForm); begin // do not call 'AForm.Show', because it will set Visible to true AForm.BringToFront; - LCLLinux.ShowWindow(AForm.Handle,SW_SHOWNORMAL); + LCLIntf.ShowWindow(AForm.Handle,SW_SHOWNORMAL); end; procedure TMainIDE.SetToolStatus(const AValue: TIDEToolStatus); @@ -9792,6 +9792,9 @@ end. { ============================================================================= $Log$ + Revision 1.649 2003/09/18 09:21:02 mattias + renamed LCLLinux to LCLIntf + Revision 1.648 2003/09/17 22:06:56 mattias implemented default lcl widget type diff --git a/ide/mainbar.pas b/ide/mainbar.pas index 8494c14b92..3820b99b00 100644 --- a/ide/mainbar.pas +++ b/ide/mainbar.pas @@ -40,7 +40,7 @@ uses {$IFDEF IDE_MEM_CHECK} MemCheck, {$ENDIF} - Classes, LCLType, LCLLinux, StdCtrls, Buttons, Menus, ComCtrls, SysUtils, + Classes, LCLType, LCLIntf, StdCtrls, Buttons, Menus, ComCtrls, SysUtils, Controls, Graphics, ExtCtrls, Dialogs, FileCtrl, Forms, CodeToolManager, CodeCache, AVL_Tree, SynEditKeyCmds, LazConf, LazarusIDEStrConsts, ProjectDefs, Project, PublishModule, BuildLazDialog, Compiler, diff --git a/ide/project.pp b/ide/project.pp index 9dd947a31c..c45162c61e 100644 --- a/ide/project.pp +++ b/ide/project.pp @@ -47,7 +47,7 @@ uses {$IFDEF IDE_MEM_CHECK} MemCheck, {$ENDIF} - Classes, SysUtils, LCLLinux, LCLType, Laz_XMLCfg, LazConf, CompilerOptions, + Classes, SysUtils, LCLIntf, LCLType, Laz_XMLCfg, LazConf, CompilerOptions, FileCtrl, CodeToolManager, CodeCache, Forms, Controls, EditorOptions, Dialogs, IDEProcs, RunParamsOpts, ProjectDefs, EditDefineTree, DefineTemplates, PackageDefs; @@ -2712,6 +2712,9 @@ end. { $Log$ + Revision 1.137 2003/09/18 09:21:02 mattias + renamed LCLLinux to LCLIntf + Revision 1.136 2003/09/17 08:43:17 mattias fixed loading old project compiler options diff --git a/ide/projectopts.pp b/ide/projectopts.pp index 17f2e5202c..701a304933 100644 --- a/ide/projectopts.pp +++ b/ide/projectopts.pp @@ -36,7 +36,7 @@ unit ProjectOpts; interface uses - Classes, LCLLinux, SysUtils, Forms, Controls, Graphics, StdCtrls, ExtCtrls, + Classes, LCLIntf, SysUtils, Forms, Controls, Graphics, StdCtrls, ExtCtrls, Project, LResources, Buttons, Dialogs, IDEProcs, CodeToolManager, LazarusIDEStrConsts, IDEOptionDefs; diff --git a/ide/splash.pp b/ide/splash.pp index 5a2e77c1ce..f214e49f15 100644 --- a/ide/splash.pp +++ b/ide/splash.pp @@ -36,7 +36,7 @@ interface uses Classes, Controls, Forms, Buttons, SysUtils, StdCtrls, ExtCtrls, LResources, - LCLLinux{must be used before graphics}, Graphics; + LCLIntf{must be used before graphics}, Graphics; type TSplashForm = class(TForm) @@ -141,6 +141,9 @@ end. { ============================================================================= $Log$ + Revision 1.19 2003/09/18 09:21:02 mattias + renamed LCLLinux to LCLIntf + Revision 1.18 2003/01/06 12:00:16 mattias implemented fsStayOnTop+bsNone for forms under gtk (useful for splash) diff --git a/ide/todolist.pp b/ide/todolist.pp index 76d10ca039..db9ce67f86 100644 --- a/ide/todolist.pp +++ b/ide/todolist.pp @@ -56,7 +56,7 @@ interface uses Classes, SysUtils, Forms, Controls, Graphics, Dialogs, LResources, ExtCtrls, ComCtrls, Menus, Buttons, GraphType, - StdCtrls, mPasLex, LCLLinux, LCLType, + StdCtrls, mPasLex, LCLIntf, LCLType, CodeCache, CodeToolManager, LazarusIDEStrConsts; Const diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp index 527811d3e9..dd6ea8a78a 100644 --- a/ide/uniteditor.pp +++ b/ide/uniteditor.pp @@ -41,7 +41,7 @@ uses {$IFDEF IDE_MEM_CHECK} MemCheck, {$ENDIF} - Classes, Controls, LCLProc, LCLType, LCLLinux, FileCtrl, LMessages, Forms, + Classes, Controls, LCLProc, LCLType, LCLIntf, FileCtrl, LMessages, Forms, Buttons, ComCtrls, SysUtils, Dialogs, StdCtrls, GraphType, Graphics, Extctrls, Menus, // codetools @@ -2542,7 +2542,7 @@ begin if CurCompletionControl=nil then exit; DeactivateCompletionForm; ActSE:=GetActiveSE; - if ActSE<>nil then LCLLinux.ShowCaret(ActSE.EditorComponent.Handle); + if ActSE<>nil then LCLIntf.ShowCaret(ActSE.EditorComponent.Handle); end; Procedure TSourceNotebook.ccExecute(Sender : TObject); diff --git a/lcl/Makefile b/lcl/Makefile index 0f4158c0ed..b81b8d5557 100644 --- a/lcl/Makefile +++ b/lcl/Makefile @@ -246,7 +246,7 @@ override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR) override COMPILER_UNITDIR+=$(LCLUNITDIR) override TARGET_DIRS+=interfaces override TARGET_UNITS+=allunits -override TARGET_IMPLICITUNITS+=arrow actnlist buttons calendar clipbrd clistbox comctrls commctrl controls dialogs dynamicarray dynhasharray extctrls extendedstrings filectrl forms graphics graphmath graphtype grids imglist interfacebase lazlinkedlist lclmemmanager lcllinux lclstrconsts lcltype lmessages lresources maskedit menus messages registry spin stdctrls stringhashlist toolwin utrace vclglobals printers postscriptprinter intfgraphics dbctrls +override TARGET_IMPLICITUNITS+=arrow actnlist buttons calendar clipbrd clistbox comctrls commctrl controls dialogs dynamicarray dynhasharray extctrls extendedstrings filectrl forms graphics graphmath graphtype grids imglist interfacebase lazlinkedlist lclmemmanager lclintf lclstrconsts lcltype lmessages lresources maskedit menus messages registry spin stdctrls stringhashlist toolwin utrace vclglobals printers postscriptprinter intfgraphics dbctrls override TARGET_RSTS+=dialogs override CLEAN_FILES+=$(wildcard units/*$(OEXT)) $(wildcard units/*$(PPUEXT)) $(wildcard units/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) override INSTALL_BUILDUNIT=allunits diff --git a/lcl/Makefile.fpc b/lcl/Makefile.fpc index 1727df7186..8f76b0ac90 100644 --- a/lcl/Makefile.fpc +++ b/lcl/Makefile.fpc @@ -13,7 +13,7 @@ units=allunits implicitunits=arrow actnlist buttons calendar clipbrd clistbox comctrls \ commctrl controls dialogs dynamicarray dynhasharray extctrls \ extendedstrings filectrl forms graphics graphmath graphtype grids \ - imglist interfacebase lazlinkedlist lclmemmanager lcllinux lclstrconsts \ + imglist interfacebase lazlinkedlist lclmemmanager lclintf lclstrconsts \ lcltype lmessages lresources maskedit menus messages registry spin \ stdctrls stringhashlist toolwin utrace vclglobals printers \ postscriptprinter intfgraphics dbctrls diff --git a/lcl/allunits.pp b/lcl/allunits.pp index 83793cedc3..b0d7aa7649 100644 --- a/lcl/allunits.pp +++ b/lcl/allunits.pp @@ -35,7 +35,7 @@ uses // the interface base InterfaceBase, {$IFDEF UseFPImage}IntfGraphics,{$ENDIF} // components and functions - Buttons, Extctrls, Registry, Calendar, Clipbrd, Forms, LCLLinux, Spin, + Buttons, Extctrls, Registry, Calendar, Clipbrd, Forms, LCLIntf, Spin, Comctrls, Graphics, StdCtrls, Arrow, Controls, ImgList, Menus, Toolwin, Dialogs, Messages, Clistbox, ActnList, Grids, MaskEdit, Printers, PostScriptPrinter, CheckLst, PairSplitter, DirSel, ExtDlgs, @@ -48,6 +48,9 @@ end. { ============================================================================= $Log$ + Revision 1.30 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.29 2003/09/16 11:35:14 mattias started TDBCheckBox diff --git a/lcl/buttons.pp b/lcl/buttons.pp index f40855db1a..d771cac41b 100644 --- a/lcl/buttons.pp +++ b/lcl/buttons.pp @@ -37,7 +37,7 @@ interface {$ASSERTIONS ON} {$endif} -uses StdCtrls, VCLGlobals, Classes, LCLType, LCLProc, LCLLinux,LCLStrConsts, +uses StdCtrls, VCLGlobals, Classes, LCLType, LCLProc, LCLIntf, LCLStrConsts, GraphType, Graphics, SysUtils, Controls, lMessages, Forms, Messages; type @@ -307,6 +307,9 @@ end. { ============================================================================= $Log$ + Revision 1.50 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.49 2003/09/13 15:43:05 ajgenius make speed button FState Protected, not private. needed for descendents, diff --git a/lcl/clipbrd.pp b/lcl/clipbrd.pp index cfcb9eb777..df2fa60d05 100644 --- a/lcl/clipbrd.pp +++ b/lcl/clipbrd.pp @@ -128,7 +128,7 @@ interface {$endif} uses - Classes, SysUtils, LCLType, LCLLinux, GraphType, Graphics; + Classes, SysUtils, LCLType, LCLIntf, GraphType, Graphics; { for delphi compatibility: @@ -360,6 +360,9 @@ end. { $Log$ + Revision 1.14 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.13 2003/09/10 19:15:15 mattias implemented copying graphics from/to clipboard diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index 3adca37236..4b982c7992 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -38,7 +38,7 @@ unit ComCtrls; interface uses - SysUtils, Classes, LCLStrConsts, LCLLinux, LCLType, LCLProc, AvgLvlTree, + SysUtils, Classes, LCLStrConsts, LCLIntf, LCLType, LCLProc, AvgLvlTree, Controls, Forms, StdCtrls, ExtCtrls, vclGlobals, LMessages, Menus, ImgList, GraphType, Graphics, ToolWin, CommCtrl, Buttons, Math; @@ -2039,6 +2039,9 @@ end. { ============================================================================= $Log$ + Revision 1.87 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.86 2003/09/13 10:06:53 mattias fixed ColorIsStored diff --git a/lcl/controls.pp b/lcl/controls.pp index c09edd7fca..bc1eac5d9e 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -40,7 +40,7 @@ interface uses Classes, SysUtils, LCLStrConsts, vclglobals, LCLType, LCLProc, - GraphType, Graphics, LMessages, LCLLinux, InterfaceBase, ImgList, UTrace, + GraphType, Graphics, LMessages, LCLIntf, InterfaceBase, ImgList, UTrace, Menus, ActnList; @@ -1844,6 +1844,9 @@ end. { ============================================================================= $Log$ + Revision 1.150 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.149 2003/09/13 15:51:21 mattias implemented parent color from Micha diff --git a/lcl/dialogs.pp b/lcl/dialogs.pp index 4eac445635..4de1af7dc6 100644 --- a/lcl/dialogs.pp +++ b/lcl/dialogs.pp @@ -37,7 +37,7 @@ unit Dialogs; interface uses - Classes, SysUtils, LCLlinux, InterfaceBase, FileCtrl, LCLStrConsts, LCLType, + Classes, SysUtils, LCLIntf, InterfaceBase, FileCtrl, LCLStrConsts, LCLType, VCLGlobals, LMessages, Forms, Controls, GraphType, Graphics, Buttons, StdCtrls; @@ -421,6 +421,9 @@ end. { ============================================================================= $Log$ + Revision 1.37 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.36 2003/09/04 10:51:30 mattias fixed default size of preview widget diff --git a/lcl/extctrls.pp b/lcl/extctrls.pp index bd7f71ee05..345462ded4 100644 --- a/lcl/extctrls.pp +++ b/lcl/extctrls.pp @@ -46,7 +46,7 @@ interface uses SysUtils, Classes, LCLStrConsts, LCLProc, Controls, Forms, StdCtrls, - vclGlobals, lMessages, GraphType, Graphics, LCLLinux, CustomTimer; + vclGlobals, lMessages, GraphType, Graphics, LCLIntf, CustomTimer; type { workaround problem with fcl } @@ -755,6 +755,9 @@ end. { $Log$ + Revision 1.75 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.74 2003/09/17 15:26:41 mattias fixed removing TPage diff --git a/lcl/forms.pp b/lcl/forms.pp index 34b0264038..f72296ba19 100644 --- a/lcl/forms.pp +++ b/lcl/forms.pp @@ -44,7 +44,7 @@ interface uses Classes, Controls, LCLStrConsts, VCLGlobals, SysUtils, LCLType, LCLProc, - LCLLinux, InterfaceBase, GraphType, Graphics, Menus, LMessages, CustomTimer, + LCLIntf, InterfaceBase, GraphType, Graphics, Menus, LMessages, CustomTimer, ActnList, ClipBrd {$IFDEF UseCustApp},CustApp{$ENDIF} ; diff --git a/lcl/graphics.pp b/lcl/graphics.pp index 0c3ce3cc44..d30879cd03 100644 --- a/lcl/graphics.pp +++ b/lcl/graphics.pp @@ -36,7 +36,7 @@ uses {$IFDEF UseFPImage} FPImage, FPReadPNG, FPWritePNG, FPReadBMP, FPWriteBMP, IntfGraphics, {$ENDIF} - LCLStrConsts, vclGlobals, LMessages, LCLType, LCLProc, LCLLinux, LResources, + LCLStrConsts, vclGlobals, LMessages, LCLType, LCLProc, LCLIntf, LResources, GraphType, GraphMath; type @@ -1256,6 +1256,9 @@ end. { ============================================================================= $Log$ + Revision 1.92 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.91 2003/09/12 14:59:43 mattias added searching for fpImage reader/writer diff --git a/lcl/grids.pas b/lcl/grids.pas index 8585468239..c8d531339c 100644 --- a/lcl/grids.pas +++ b/lcl/grids.pas @@ -28,7 +28,7 @@ unit Grids; interface uses - Classes, SysUtils, LCLStrConsts, LCLProc, LCLType, LCLLinux, Controls, + Classes, SysUtils, LCLStrConsts, LCLProc, LCLType, LCLIntf, Controls, GraphType, Graphics, Forms, VCLGlobals, DynamicArray, LMessages, Messages, XMLCfg, StdCtrls, LResources, MaskEdit; @@ -2435,7 +2435,7 @@ begin if (GoEditing in Options)and(FEditor=nil) and not Focused then begin {$IfDef dbgFocus} WriteLn(' AUTO-FOCUSING '); {$Endif} - LCLLinux.SetFocus(Self.Handle); + LCLIntf.SetFocus(Self.Handle); end; end; @@ -2983,7 +2983,7 @@ begin FEditorHiding:=True; Editor.Visible:=False; Editor.Parent:=nil; - LCLLinux.SetFocus(Self.Handle); + LCLIntf.SetFocus(Self.Handle); FEDitorHiding:=False; {$IfDef dbgFocus} WriteLn('EditorHide FIN'); {$Endif} end; @@ -3001,7 +3001,7 @@ begin FEditorShowing:=True; ScrollToCell(FCol,FRow); EditorReset; - LCLLinux.SetFocus(Editor.Handle); + LCLIntf.SetFocus(Editor.Handle); FEditorShowing:=False; InvalidateCell(FCol,FRow,True); {$IfDef dbgFocus} WriteLn('EditorShow FIN');{$Endif} diff --git a/lcl/include/canvas.inc b/lcl/include/canvas.inc index 1f36b688fd..c3785b534a 100644 --- a/lcl/include/canvas.inc +++ b/lcl/include/canvas.inc @@ -280,7 +280,7 @@ procedure TCanvas.Arc(x,y,width,height,angle1,angle2 : Integer); begin Changing; RequiredState([csHandleValid, csPenValid]); - LCLLinux.Arc(FHandle,x,y,width,height,angle1,angle2); + LCLIntf.Arc(FHandle,x,y,width,height,angle1,angle2); Changed; end; @@ -298,7 +298,7 @@ procedure TCanvas.Arc(x,y,width,height,sx,sy,ex,ey : Integer); begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.RadialArc(FHandle,x,y,width,height,sx,sy,ex,ey); + LCLIntf.RadialArc(FHandle,x,y,width,height,sx,sy,ex,ey); Changed; end; @@ -318,7 +318,7 @@ procedure TCanvas.RadialPie(x,y,width,height,angle1,angle2 : Integer); begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.RadialPieWithAngles(FHandle,x,y,width,height,angle1,angle2); + LCLIntf.RadialPieWithAngles(FHandle,x,y,width,height,angle1,angle2); Changed; end; @@ -336,7 +336,7 @@ procedure TCanvas.RadialPie(x,y,width,height,sx,sy,ex,ey: Integer); begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.RadialPie(FHandle,x,y,width,height,sx,sy,ex,ey); + LCLIntf.RadialPie(FHandle,x,y,width,height,sx,sy,ex,ey); Changed; end; @@ -357,7 +357,7 @@ procedure TCanvas.Pie(EllipseX1, EllipseY1, EllipseX2, EllipseY2, begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.Pie(FHandle,EllipseX1,EllipseY1,EllipseX2,EllipseY2, + LCLIntf.Pie(FHandle,EllipseX1,EllipseY1,EllipseX2,EllipseY2, StartX,StartY,EndX,EndY); Changed; end; @@ -403,7 +403,7 @@ procedure TCanvas.PolyBezier(Points: PPoint; NumPts: Integer; begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.PolyBezier(FHandle,Points,NumPts,Filled, Continuous); + LCLIntf.PolyBezier(FHandle,Points,NumPts,Filled, Continuous); Changed; end; @@ -460,7 +460,7 @@ begin if NumPts<=0 then exit; Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.Polygon(FHandle,Points,NumPts,Winding); + LCLIntf.Polygon(FHandle,Points,NumPts,Winding); Changed; end; @@ -509,7 +509,7 @@ procedure TCanvas.Polyline(Points: PPoint; NumPts: Integer); begin Changing; RequiredState([csHandleValid, csPenValid]); - LCLLinux.Polyline(FHandle,Points,NumPts); + LCLIntf.Polyline(FHandle,Points,NumPts); Changed; end; @@ -536,7 +536,7 @@ procedure TCanvas.Ellipse(x1, y1, x2, y2: Integer); begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.Ellipse(FHandle,x1,y1,x2,y2); + LCLIntf.Ellipse(FHandle,x1,y1,x2,y2); Changed; end; @@ -563,7 +563,7 @@ procedure TCanvas.FillRect(const ARect : TRect); begin Changing; RequiredState([csHandleValid, csBrushValid]); - LCLLinux.FillRect(FHandle, ARect, Brush.Handle); + LCLIntf.FillRect(FHandle, ARect, Brush.Handle); Changed; end; @@ -586,7 +586,7 @@ procedure TCanvas.FloodFill(X, Y: Integer; FillColor: TColor; FillStyle: TFillSt begin Changing; RequiredState([csHandleValid, csBrushValid]); - LCLLinux.FloodFill(FHandle, X, Y, FillColor, FillStyle, Brush.Handle); + LCLIntf.FloodFill(FHandle, X, Y, FillColor, FillStyle, Brush.Handle); Changed; end; @@ -601,7 +601,7 @@ procedure TCanvas.Frame3d(var ARect: TRect; const FrameWidth : integer; begin Changing; RequiredState([csHandleValid]); - LCLLinux.Frame3d(FHandle, ARect, FrameWidth, Style); + LCLIntf.Frame3d(FHandle, ARect, FrameWidth, Style); Changed; end; @@ -614,7 +614,7 @@ procedure TCanvas.Frame(const ARect: TRect); begin Changing; RequiredState([csHandleValid, csPenValid]); - LCLLinux.Frame(FHandle, ARect); + LCLIntf.Frame(FHandle, ARect); Changed; end; @@ -637,7 +637,7 @@ procedure TCanvas.FrameRect(const ARect: TRect); begin Changing; RequiredState([csHandleValid, csBrushValid]); - LCLLinux.FrameRect(FHandle, ARect, Brush.GetHandle); + LCLIntf.FrameRect(FHandle, ARect, Brush.GetHandle); Changed; end; @@ -661,7 +661,7 @@ procedure TCanvas.Rectangle(X1,Y1,X2,Y2 : Integer); begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.Rectangle(FHandle, X1, Y1, X2, Y2); + LCLIntf.Rectangle(FHandle, X1, Y1, X2, Y2); Changed; end; @@ -686,7 +686,7 @@ Procedure TCanvas.RoundRect(X1, Y1, X2, Y2: Integer; RX,RY : Integer); begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.RoundRect(FHandle, X1, Y1, X2, Y2, RX, RY); + LCLIntf.RoundRect(FHandle, X1, Y1, X2, Y2, RX, RY); Changed; end; @@ -825,7 +825,7 @@ end; Procedure TCanvas.MoveTo(X1, Y1 : Integer); begin RequiredState([csHandleValid]); - if LCLLinux.MoveToEx(FHandle, X1, Y1, nil) then FPenPos:= Point(X1, Y1); + if LCLIntf.MoveToEx(FHandle, X1, Y1, nil) then FPenPos:= Point(X1, Y1); End; {------------------------------------------------------------------------------ @@ -838,7 +838,7 @@ procedure TCanvas.LineTo(X1, Y1 : Integer); begin Changing; RequiredState([csHandleValid, csPenValid]); - if LCLLinux.LineTo(FHandle, X1, Y1) then FPenPos:= Point(X1, Y1); + if LCLIntf.LineTo(FHandle, X1, Y1) then FPenPos:= Point(X1, Y1); Changed; end; @@ -993,7 +993,7 @@ procedure TCanvas.Chord(x,y,width,height,angle1,angle2 : Integer); begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.AngleChord(FHandle,x,y,width,height,angle1,angle2); + LCLIntf.AngleChord(FHandle,x,y,width,height,angle1,angle2); Changed; end; @@ -1011,7 +1011,7 @@ procedure TCanvas.Chord(x,y,width,height,sx,sy,ex,ey : Integer); begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); - LCLLinux.RadialChord(FHandle,x,y,width,height,sx,sy,ex,ey); + LCLIntf.RadialChord(FHandle,x,y,width,height,sx,sy,ex,ey); Changed; end; @@ -1236,6 +1236,9 @@ end; { ============================================================================= $Log$ + Revision 1.53 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.52 2003/08/27 08:14:37 mattias fixed system fonts for win32 intf @@ -1413,7 +1416,7 @@ end; reference it from interface (GTK, Win32) units. New Frame3d canvas method that uses native (themed) drawing (GTK only). New overloaded Canvas.TextRect method. - LCLLinux and Graphics was split, so a bunch of files had to be modified. + LCLIntf and Graphics was split, so a bunch of files had to be modified. Revision 1.14 2002/01/02 15:24:58 lazarus MG: added TCanvas.Polygon and TCanvas.Polyline diff --git a/lcl/include/controlscrollbar.inc b/lcl/include/controlscrollbar.inc index 5c28229d39..5689890216 100644 --- a/lcl/include/controlscrollbar.inc +++ b/lcl/include/controlscrollbar.inc @@ -141,7 +141,7 @@ begin else KindID:=SM_CXVSCROLL; if HandleAllocated then - Result:=LCLLinux.GetScrollBarSize(ControlHandle,KindID) + Result:=LCLIntf.GetScrollBarSize(ControlHandle,KindID) else Result:=GetSystemMetrics(KindID); end; diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc index d81bd4b816..a96944492f 100644 --- a/lcl/include/customform.inc +++ b/lcl/include/customform.inc @@ -305,7 +305,7 @@ begin or (not NewFocusControl.Visible) or (not NewFocusControl.Enabled) then exit; - LCLLinux.SetFocus(NewFocusControl.Handle); + LCLIntf.SetFocus(NewFocusControl.Handle); if GetFocus = NewFocusControl.Handle then NewFocusControl.Perform(CM_UIACTIVATE, 0, 0); end; @@ -337,7 +337,7 @@ begin {$IFDEF VerboseFocus} writeln('TCustomForm.WMShowWindow B ',FActiveControl.Name,':',FActiveControl.ClassName); {$ENDIF} - LCLLinux.SetFocus(FActiveControl.Handle); + LCLIntf.SetFocus(FActiveControl.Handle); end; DoShow; end else begin @@ -696,7 +696,7 @@ begin {$IFDEF VerboseFocus} writeln('[TCustomForm.WndProc] ',Name,':',ClassName); {$ENDIF} - LCLLinux.SetFocus(FocusHandle); + LCLIntf.SetFocus(FocusHandle); Exit; end; end; @@ -1115,7 +1115,7 @@ begin Show; BringToFront; //writeln('TCustomForm.ShowOnTop ',Name,':',ClassName,' ',Visible,' ',HandleAllocated,' ',csDesigning in ComponentState); - LCLLinux.ShowWindow(Handle,SW_SHOWNORMAL); + LCLIntf.ShowWindow(Handle,SW_SHOWNORMAL); end; {------------------------------------------------------------------------------ @@ -1255,7 +1255,7 @@ begin {$IFDEF VerboseFocus} writeln('TCustomForm.CreateWnd A ',FActiveControl.Name,':',FActiveControl.ClassName); {$ENDIF} - LCLLinux.SetFocus(FActiveControl.Handle); + LCLIntf.SetFocus(FActiveControl.Handle); end; end; //writeln('TCustomForm.CreateWnd END ',ClassName); @@ -1435,6 +1435,9 @@ end; { ============================================================================= $Log$ + Revision 1.115 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.114 2003/09/13 10:04:35 mattias fixed ColorIsStored diff --git a/lcl/include/customnotebook.inc b/lcl/include/customnotebook.inc index 293edfe43d..877b4b73b8 100644 --- a/lcl/include/customnotebook.inc +++ b/lcl/include/customnotebook.inc @@ -401,7 +401,7 @@ end; function TCustomNotebook.TabIndexAtClientPos(ClientPos: TPoint): integer; begin if HandleAllocated then - Result:=LCLLinux.GetNotebookTabIndexAtPos(Handle,ClientPos) + Result:=LCLIntf.GetNotebookTabIndexAtPos(Handle,ClientPos) else Result:=-1; end; @@ -763,6 +763,9 @@ end;} { ============================================================================= $Log$ + Revision 1.34 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.33 2003/09/17 15:26:41 mattias fixed removing TPage diff --git a/lcl/include/messagedialogs.inc b/lcl/include/messagedialogs.inc index 2611a0f9a0..7270e85c73 100644 --- a/lcl/include/messagedialogs.inc +++ b/lcl/include/messagedialogs.inc @@ -221,7 +221,7 @@ end; Function InputQuery(const ACaption, APrompt : String; MaskInput : Boolean; var Value : String) : Boolean; begin - Result := LCLLinux.RequestInput(ACaption, APrompt, MaskInput, Value); + Result := LCLIntf.RequestInput(ACaption, APrompt, MaskInput, Value); end; Function InputQuery(const ACaption, APrompt : String; var Value : String) : Boolean; @@ -233,6 +233,9 @@ end; { $Log$ + Revision 1.23 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.22 2003/04/13 13:45:04 mattias implemented broken dependencies dialog diff --git a/lcl/include/mouse.inc b/lcl/include/mouse.inc index 00d0e0e841..db2ad9a4ba 100644 --- a/lcl/include/mouse.inc +++ b/lcl/include/mouse.inc @@ -41,7 +41,7 @@ Begin writeln('TMouse.SetCapture '); {$ENDIF} FCapture := Value; - if Value = 0 then ReleaseCapture else LCLLinux.SetCapture(Value); + if Value = 0 then ReleaseCapture else LCLIntf.SetCapture(Value); end; Procedure TMouse.SetCursorPos(Value : Tpoint); diff --git a/lcl/include/promptdialog.inc b/lcl/include/promptdialog.inc index c900432ff4..6beaeb2489 100644 --- a/lcl/include/promptdialog.inc +++ b/lcl/include/promptdialog.inc @@ -68,7 +68,7 @@ begin // focus the next button to the left or right // search old focused button - OldFocusControl:=FindControl(LCLLinux.GetFocus); + OldFocusControl:=FindControl(LCLIntf.GetFocus); if (OldFocusControl=nil) or (GetParentForm(OldFocusControl)<>Self) or (not (OldFocusControl is TButton)) then begin @@ -375,6 +375,9 @@ end; { $Log$ + Revision 1.8 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.7 2003/08/27 08:14:37 mattias fixed system fonts for win32 intf diff --git a/lcl/include/screen.inc b/lcl/include/screen.inc index 4cb5192d5e..74404d43aa 100644 --- a/lcl/include/screen.inc +++ b/lcl/include/screen.inc @@ -374,7 +374,7 @@ begin Exit; end; end;} - LCLLinux.SetCursor(Cursors[FCursor]); + LCLIntf.SetCursor(Cursors[FCursor]); end; Inc(FCursorCount); end; diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc index 9592cd8696..3a31e7d418 100644 --- a/lcl/include/wincontrol.inc +++ b/lcl/include/wincontrol.inc @@ -656,7 +656,7 @@ var begin Result:=false; if not HandleAllocated then exit; - LCLLinux.GetClientRect(Handle,IntfClientRect); + LCLIntf.GetClientRect(Handle,IntfClientRect); Result:=(FClientWidth<>IntfClientRect.Right) or (FClientHeight<>IntfClientRect.Bottom); end; @@ -749,7 +749,7 @@ Begin //writeln('[TWinControl.GetClientOrigin] ',Name,':',ClassName,' ',Handle); if HandleAllocated then begin // get the interface idea where the client area is on the screen - LCLLinux.ClientToScreen(Handle,Result); + LCLIntf.ClientToScreen(Handle,Result); // adjust the result by all bounds, that are not yet sent to the interface AControl:=Self; repeat @@ -799,12 +799,12 @@ begin StoreClientRect(Result); end else if wcfClientRectNeedsUpdate in FFlags then begin // update clientrect from interface - LCLLinux.GetClientRect(Handle, Result); + LCLIntf.GetClientRect(Handle, Result); // the LCL is not always in sync with the interface // -> adjust client rect based on LCL bounds // for example: if the Width in LCL differ from the Width of the Interface // object, then adjust the clientwidth accordingly - LCLLinux.GetWindowSize(Handle, InterfaceWidth, InterfaceHeight); + LCLIntf.GetWindowSize(Handle, InterfaceWidth, InterfaceHeight); Result.Right:=Width-(InterfaceWidth-Result.Right); Result.Bottom:=Height-(InterfaceHeight-Result.Bottom); StoreClientRect(Result); @@ -837,7 +837,7 @@ var ScrolledOffset: TPoint; begin if HandleAllocated then begin - LCLLinux.GetClientBounds(Handle,Result); + LCLIntf.GetClientBounds(Handle,Result); if Scrolled then begin ScrolledOffset:=GetClientScrollOffset; inc(Result.Left,ScrolledOffset.X); @@ -1171,7 +1171,7 @@ begin if (Control is TWinControl) and TWinControl(Control).HandleAllocated then begin // map coordinates to client area of control - LCLLinux.GetClientBounds(TWinControl(Control).Handle,ClientBounds); + LCLIntf.GetClientBounds(TWinControl(Control).Handle,ClientBounds); dec(P.X,ClientBounds.Left); dec(P.Y,ClientBounds.Top); {$IFDEF VerboseMouseBugfix} @@ -1214,7 +1214,7 @@ procedure TWinControl.PaintHandler(var TheMessage: TLMPaint); var I, Clip, SaveIndex: Integer; DC: HDC; - PS: TPaintStruct; //defined in LCLLinux.pp + PS: TPaintStruct; //defined in LCLIntf.pp ControlsNeedsClipping: boolean; begin //writeln('[TWinControl.PaintHandler] ',Name,':',ClassName,' DC=',HexStr(Message.DC,8)); @@ -1714,7 +1714,7 @@ begin if Form <> nil then Form.FocusControl(Self) else if Visible and HandleAllocated then - LCLLinux.SetFocus(Handle); + LCLIntf.SetFocus(Handle); end; {------------------------------------------------------------------------------} @@ -2664,7 +2664,7 @@ var { procedure WriteClientRect(const Prefix: string); var r: TRect; begin - LCLLinux.GetClientRect(Handle,r); + LCLIntf.GetClientRect(Handle,r); if csDesigning in ComponentState then writeln('WriteClientRect ',Prefix,' ',Name,':',ClassName,' r=',r.Right,',',r.Bottom); end;} @@ -3081,6 +3081,9 @@ end; { ============================================================================= $Log$ + Revision 1.170 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.169 2003/09/17 15:26:41 mattias fixed removing TPage diff --git a/lcl/interfaces/gnome/gnomeint.pp b/lcl/interfaces/gnome/gnomeint.pp index 1ebcb1f429..77293a2f15 100644 --- a/lcl/interfaces/gnome/gnomeint.pp +++ b/lcl/interfaces/gnome/gnomeint.pp @@ -40,7 +40,7 @@ interface uses InterfaceBase, {$Ifndef NoGdkPixbufLib}gdkpixbuf,{$EndIf} gtk, gdk, glib, SysUtils, LMessages, Classes, Controls, Forms, VclGlobals, - LCLLinux, LCLType, gtkDef, DynHashArray, LazQueue, GraphType, + LCLIntf, LCLType, gtkDef, DynHashArray, LazQueue, GraphType, GraphMath, gtkInt, {$Ifndef NoGdkImlib}gdk_imlib,{$EndIf} libgnome, libart, libgnomeui; @@ -246,6 +246,9 @@ end. { $Log$ + Revision 1.18 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.17 2003/06/05 15:53:30 mattias increased version to 0.9.0 beta diff --git a/lcl/interfaces/gtk/gtkdef.pp b/lcl/interfaces/gtk/gtkdef.pp index 5c07145347..c29169a6ab 100644 --- a/lcl/interfaces/gtk/gtkdef.pp +++ b/lcl/interfaces/gtk/gtkdef.pp @@ -41,7 +41,7 @@ uses {$ELSE} glib, gdk, gtk, {$Ifndef NoGdkPixbufLib}gdkpixbuf,{$EndIf} {$ENDIF} - Classes, LCLLinux, LCLType, VclGlobals, LCLMemManager, DynHashArray, + Classes, LCLIntf, LCLType, VclGlobals, LCLMemManager, DynHashArray, GraphType; type @@ -465,6 +465,9 @@ end. { ============================================================================= $Log$ + Revision 1.47 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.46 2003/09/15 03:10:46 ajgenius PANGO support for GTK2 now works.. sorta. TextOut/ExtTextOut broken? diff --git a/lcl/interfaces/gtk/gtkglobals.pp b/lcl/interfaces/gtk/gtkglobals.pp index 087d371e0a..6354eb9427 100644 --- a/lcl/interfaces/gtk/gtkglobals.pp +++ b/lcl/interfaces/gtk/gtkglobals.pp @@ -26,7 +26,7 @@ uses glib, gdk, gtk, {$ENDIF} LMessages, Controls, Forms, - VclGlobals, LCLLinux, LCLType, GTKDef, DynHashArray, LazLinkedList; + VclGlobals, LCLIntf, LCLType, GTKDef, DynHashArray, LazLinkedList; {$I dragicons.inc} diff --git a/lcl/interfaces/gtk/gtkint.pp b/lcl/interfaces/gtk/gtkint.pp index 86485856a1..960e235e24 100644 --- a/lcl/interfaces/gtk/gtkint.pp +++ b/lcl/interfaces/gtk/gtkint.pp @@ -59,7 +59,7 @@ uses {$ENDIF} xlib, SysUtils, Classes, ExtDlgs, Dialogs, Controls, Forms, LCLStrConsts, LMessages, - VclGlobals, LCLProc, LCLLinux, LCLType, gtkDef, DynHashArray, gtkMsgQueue, + VclGlobals, LCLProc, LCLIntf, LCLType, gtkDef, DynHashArray, gtkMsgQueue, GraphType, GraphMath, Graphics; @@ -372,6 +372,9 @@ end. { ============================================================================= $Log$ + Revision 1.147 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.146 2003/09/15 03:10:46 ajgenius PANGO support for GTK2 now works.. sorta. TextOut/ExtTextOut broken? diff --git a/lcl/interfaces/gtk/gtkproc.pp b/lcl/interfaces/gtk/gtkproc.pp index bae066daeb..173598fc71 100644 --- a/lcl/interfaces/gtk/gtkproc.pp +++ b/lcl/interfaces/gtk/gtkproc.pp @@ -45,7 +45,7 @@ uses glib, gdk, gtk, {$Ifndef NoGdkPixbufLib}gdkpixbuf,{$EndIf} {$ENDIF} LMessages, Controls, Forms, VclGlobals, LCLProc, - LCLStrConsts, LCLLinux, LCLType, gtkDef, DynHashArray, LazLinkedList, + LCLStrConsts, LCLIntf, LCLType, gtkDef, DynHashArray, LazLinkedList, GraphType, GraphMath, Graphics, Buttons, Menus, GTKWinApiWindow, StdCtrls, ComCtrls, CListBox, KeyMap, Calendar, Arrow, Spin, CommCtrl, ExtCtrls, Dialogs, ExtDlgs, FileCtrl, LResources, Math, GTKGlobals; diff --git a/lcl/interfaces/gtk/gtkwinapi.inc b/lcl/interfaces/gtk/gtkwinapi.inc index 4cd07b8e8f..f4cea76860 100644 --- a/lcl/interfaces/gtk/gtkwinapi.inc +++ b/lcl/interfaces/gtk/gtkwinapi.inc @@ -597,7 +597,7 @@ end; {------------------------------------------------------------------------------ Function: ClipboardGetOwnerShip Params: ClipboardType - OnRequestProc - TClipboardRequestEvent is defined in LCLLinux.pp + OnRequestProc - TClipboardRequestEvent is defined in LCLIntf.pp If OnRequestProc is nil the onwership will end. FormatCount - number of formats Formats - array of TClipboardFormat. The supported formats the owner @@ -5289,8 +5289,8 @@ function TgtkObject.GradientFill(DC: HDC; Vertices: PTriVertex; NumVertices : Lo end; If GradientBrush <> 0 then - LCLLinux.DeleteObject(GradientBrush); - GradientBrush := LCLLinux.CreateBrushIndirect(NewBrush); + LCLIntf.DeleteObject(GradientBrush); + GradientBrush := LCLIntf.CreateBrushIndirect(NewBrush); end; Function FillTriMesh(Mesh : tagGradientTriangle) : Boolean; @@ -5364,7 +5364,7 @@ function TgtkObject.GradientFill(DC: HDC; Vertices: PTriVertex; NumVertices : Lo Steps := Min(BR.Y - TL.Y, MaxSteps); for I := 0 to Steps - 1 do begin GetGradientBrush(StartColor, EndColor, I, Steps, UseBrush); - LCLLinux.FillRect(DC, Rect(TL.X, TL.Y + I, BR.X, TL.Y + I + 1), + LCLIntf.FillRect(DC, Rect(TL.X, TL.Y + I, BR.X, TL.Y + I + 1), UseBrush) end end @@ -5372,12 +5372,12 @@ function TgtkObject.GradientFill(DC: HDC; Vertices: PTriVertex; NumVertices : Lo Steps := Min(BR.X - TL.X, MaxSteps); for I := 0 to Steps - 1 do begin GetGradientBrush(StartColor, EndColor, I, Steps, UseBrush); - LCLLinux.FillRect(DC, Rect(TL.X + I, TL.Y, TL.X + I + 1, BR.Y), + LCLIntf.FillRect(DC, Rect(TL.X + I, TL.Y, TL.X + I + 1, BR.Y), UseBrush); end; end; If UseBrush <> 0 then - LCLLinux.DeleteObject(UseBrush); + LCLIntf.DeleteObject(UseBrush); end; end; @@ -8794,6 +8794,9 @@ end; { ============================================================================= $Log$ + Revision 1.284 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.283 2003/09/17 19:40:46 ajgenius Initial DoubleBuffering Support for GTK2 @@ -9546,7 +9549,7 @@ end; reference it from interface (GTK, Win32) units. New Frame3d canvas method that uses native (themed) drawing (GTK only). New overloaded Canvas.TextRect method. - LCLLinux and Graphics was split, so a bunch of files had to be modified. + LCLIntf and Graphics was split, so a bunch of files had to be modified. Revision 1.59 2002/01/24 15:40:59 lazarus MG: deactivated clipboard setting target list for win32 diff --git a/lcl/interfaces/gtk2/gtk2int.pas b/lcl/interfaces/gtk2/gtk2int.pas index a60b0529ac..ac49b13c45 100644 --- a/lcl/interfaces/gtk2/gtk2int.pas +++ b/lcl/interfaces/gtk2/gtk2int.pas @@ -42,13 +42,13 @@ uses gdk2pixbuf, gtk2, gdk2, glib2, Pango, - LMessages, Controls, Forms, VclGlobals, LCLProc, - LCLStrConsts, LCLLinux, LCLType, DynHashArray, LazLinkedList, + LMessages, Controls, Forms, VclGlobals, LCLProc, + LCLStrConsts, LCLIntf, LCLType, DynHashArray, LazLinkedList, GraphType, GraphMath, Graphics, Buttons, Menus, GTKWinApiWindow, StdCtrls, ComCtrls, CListBox, KeyMap, Calendar, Arrow, Spin, CommCtrl, ExtCtrls, Dialogs, ExtDlgs, FileCtrl, LResources, Math, GTKGlobals, - gtkDef, gtkProc, gtkInt; + gtkDef, gtkProc, gtkInt; type TGtk2Object = class(TGtkObject) @@ -1046,6 +1046,9 @@ end. { $Log$ + Revision 1.15 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.14 2003/09/17 20:30:57 ajgenius fix(?) DCOffset for DrawText diff --git a/lcl/interfaces/qt/qtint.pp b/lcl/interfaces/qt/qtint.pp index 57516c5f75..79d1354240 100644 --- a/lcl/interfaces/qt/qtint.pp +++ b/lcl/interfaces/qt/qtint.pp @@ -35,7 +35,7 @@ interface uses InterfaceBase, sysutils, lmessages, Classes, Controls, extctrls, forms,dialogs, VclGlobals,stdctrls, comctrls, - LCLLinux,qt; + LCLIntf, qt; diff --git a/lcl/interfaces/win32/win32int.pp b/lcl/interfaces/win32/win32int.pp index 7720bf20eb..47325cfd6e 100644 --- a/lcl/interfaces/win32/win32int.pp +++ b/lcl/interfaces/win32/win32int.pp @@ -37,7 +37,7 @@ Interface } Uses Windows, Classes, LCLStrConsts, ComCtrls, Controls, Dialogs, DynHashArray, - ExtCtrls, Forms, GraphMath, GraphType, InterfaceBase, LCLLinux, LCLType, + ExtCtrls, Forms, GraphMath, GraphType, InterfaceBase, LCLIntf, LCLType, LMessages, StdCtrls, SysUtils, VCLGlobals, Win32Def, Graphics; Type @@ -186,6 +186,9 @@ End. { ============================================================================= $Log$ + Revision 1.41 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.40 2003/09/14 09:43:45 mattias fixed common dialogs from Karl diff --git a/lcl/intfgraphics.pas b/lcl/intfgraphics.pas index 66fb111c12..40ce322e38 100644 --- a/lcl/intfgraphics.pas +++ b/lcl/intfgraphics.pas @@ -31,7 +31,7 @@ unit IntfGraphics; interface uses - Classes, SysUtils, fpImage, AvgLvlTree, LCLLinux, LCLType, LCLProc, GraphType; + Classes, SysUtils, fpImage, AvgLvlTree, LCLIntf, LCLType, LCLProc, GraphType; type { TLazIntfImage } diff --git a/lcl/lcllinux.pp b/lcl/lclintf.pas similarity index 97% rename from lcl/lcllinux.pp rename to lcl/lclintf.pas index aefc33a897..4ef1227e8c 100644 --- a/lcl/lcllinux.pp +++ b/lcl/lclintf.pas @@ -2,7 +2,7 @@ { $Id$ } { /*************************************************************************** - LCLLinux.pp + LCLIntf.pas ----------- Component Library Windows Controls Initial Revision : Fri Jul 23 20:00:00 PDT 1999 @@ -31,11 +31,10 @@ This unit is being created specifically for compatibility with Delphi. It should only be used for constants and type definitions that are included in -the Delphi Windows unit. This is only done for compatibiltiy. - +the Delphi Windows unit. This is only done for compatibility. } -unit LCLLinux; +unit LCLIntf; {$mode objfpc}{$H+} @@ -145,6 +144,9 @@ end. { $Log$ + Revision 1.1 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.25 2002/12/16 12:12:50 mattias fixes for fpc 1.1 diff --git a/lcl/menus.pp b/lcl/menus.pp index 0be87026eb..6ac6d0bbce 100644 --- a/lcl/menus.pp +++ b/lcl/menus.pp @@ -45,7 +45,7 @@ interface {$endif} uses - Classes, SysUtils, LCLStrConsts, LCLLinux, LCLType, LCLProc, VCLGlobals, + Classes, SysUtils, LCLStrConsts, LCLIntf, LCLType, LCLProc, VCLGlobals, LMessages, ActnList, Graphics, ImgList; @@ -386,6 +386,9 @@ end. { $Log$ + Revision 1.51 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.50 2003/07/21 23:43:32 marc * Fixed radiogroup menuitems diff --git a/lcl/pairsplitter.pas b/lcl/pairsplitter.pas index b12ba6fc2b..23f039f9ca 100644 --- a/lcl/pairsplitter.pas +++ b/lcl/pairsplitter.pas @@ -36,7 +36,7 @@ interface uses Classes, SysUtils, LCLProc, LMessages, VCLGlobals, Graphics, GraphType, - LCLLinux, Controls; + LCLIntf, Controls; type TCustomPairSplitter = class; diff --git a/lcl/postscriptprinter.pas b/lcl/postscriptprinter.pas index 98a6c142af..2a9cd79d19 100644 --- a/lcl/postscriptprinter.pas +++ b/lcl/postscriptprinter.pas @@ -31,7 +31,7 @@ unit PostScriptPrinter; interface uses - Classes, SysUtils, GraphType, Graphics, GraphMath, LCLLinux, Forms; + Classes, SysUtils, GraphType, Graphics, GraphMath, LCLIntf, Forms; // uses lcllinux or winapi for RGB conversions and FORMS for application object diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp index 41aaf5afeb..7999fe7552 100644 --- a/lcl/stdctrls.pp +++ b/lcl/stdctrls.pp @@ -31,7 +31,7 @@ interface uses VCLGlobals, Classes, SysUtils, LCLStrConsts, LCLType, LCLProc, - Graphics, GraphType, LMessages, Controls, ExtendedStrings, LCLLinux, + Graphics, GraphType, LMessages, Controls, ExtendedStrings, LCLIntf, GraphMath, Forms; @@ -1464,6 +1464,9 @@ end. { ============================================================================= $Log$ + Revision 1.104 2003/09/18 09:21:03 mattias + renamed LCLLinux to LCLIntf + Revision 1.103 2003/08/28 09:10:00 mattias listbox and comboboxes now set sort and selection at handle creation diff --git a/lcl/toolwin.pp b/lcl/toolwin.pp index 8926601474..9e15b2fedd 100644 --- a/lcl/toolwin.pp +++ b/lcl/toolwin.pp @@ -43,7 +43,7 @@ interface uses Classes, Controls, SysUtils, stdCtrls, GraphType, Graphics, vclGlobals, - LMessages, LCLType, LCLLinux; + LMessages, LCLType, LCLIntf; type