paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 13:39:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

implemented TBitBtn Text+Caption from Micha

Browse Source 
git-svn-id: trunk@4656 -
This commit is contained in:
mattias 2003-09-21 10:42:48 +00:00
parent c8338ad600
commit 429de108cf
5 changed files with 134 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ide/codetoolsdefines.pas
View File

@ -126,6 +126,9 @@ type
InsertDelphi6CompilerDefinesTemplateMenuItem: TMenuItem;
InsertDelphi6DirectoryTemplateMenuItem: TMenuItem;
InsertDelphi6ProjectTemplateMenuItem: TMenuItem;
InsertDelphi7CompilerDefinesTemplateMenuItem: TMenuItem;
InsertDelphi7DirectoryTemplateMenuItem: TMenuItem;
InsertDelphi7ProjectTemplateMenuItem: TMenuItem;
InsertKylix3CompilerDefinesTemplateMenuItem: TMenuItem;
InsertKylix3DirectoryTemplateMenuItem: TMenuItem;
InsertKylix3ProjectTemplateMenuItem: TMenuItem;
@ -823,7 +826,9 @@ procedure TCodeToolsDefinesEditor.InsertDelphiCompilerDefinesTemplateMenuItemCli
(Sender: TObject);
var DelphiVersion: integer;
begin
if Sender=InsertDelphi6CompilerDefinesTemplateMenuItem then
if Sender=InsertDelphi7CompilerDefinesTemplateMenuItem then
DelphiVersion:=7
else if Sender=InsertDelphi6CompilerDefinesTemplateMenuItem then
DelphiVersion:=6
else
DelphiVersion:=5;
@ -838,7 +843,9 @@ var InputFileDlg: TInputFileDialog;
DelphiVersion: integer;
DelphiName: string;
begin
if Sender=InsertDelphi6DirectoryTemplateMenuItem then
if Sender=InsertDelphi7DirectoryTemplateMenuItem then
DelphiVersion:=7
else if Sender=InsertDelphi6DirectoryTemplateMenuItem then
DelphiVersion:=6
else
DelphiVersion:=5;
@ -876,7 +883,9 @@ var
DelphiVersion: integer;
DelphiName: string;
begin
if Sender=InsertDelphi6ProjectTemplateMenuItem then
if Sender=InsertDelphi7ProjectTemplateMenuItem then
DelphiVersion:=7
else if Sender=InsertDelphi6ProjectTemplateMenuItem then
DelphiVersion:=6
else
DelphiVersion:=5;
@ -1402,6 +1411,29 @@ begin
InsertDelphi6ProjectTemplateMenuItem.OnClick:=
@InsertDelphiProjectTemplateMenuItemClick;
// Delphi 7 templates
InsertTemplateMenuItem.Add(CreateSeperator);
AddMenuItem(InsertDelphi7CompilerDefinesTemplateMenuItem,
'InsertDelphi7CompilerDefinesTemplateMenuItem',
lisCodeToolsDefsInsertDelphi7CompilerTemp,
InsertTemplateMenuItem);
InsertDelphi7CompilerDefinesTemplateMenuItem.OnClick:=
@InsertDelphiCompilerDefinesTemplateMenuItemClick;
AddMenuItem(InsertDelphi7DirectoryTemplateMenuItem,
'InsertDelphi7DirectoryTemplateMenuItem',
lisCodeToolsDefsInsertDelphi7DirectoryTem,
InsertTemplateMenuItem);
InsertDelphi7DirectoryTemplateMenuItem.OnClick:=
@InsertDelphiDirectoryTemplateMenuItemClick;
AddMenuItem(InsertDelphi7ProjectTemplateMenuItem,
'InsertDelphi7ProjectTemplateMenuItem',
lisCodeToolsDefsInsertDelphi7ProjectTempl,
InsertTemplateMenuItem);
InsertDelphi7ProjectTemplateMenuItem.OnClick:=
@InsertDelphiProjectTemplateMenuItemClick;
// Kylix 3 templates
InsertTemplateMenuItem.Add(CreateSeperator);
AddMenuItem(InsertKylix3CompilerDefinesTemplateMenuItem,

6
ide/lazarusidestrconsts.pas
View File

@ -1417,6 +1417,12 @@ resourcestring
+'Template';
lisCodeToolsDefsInsertDelphi6ProjectTempl =
'Insert Delphi 6 Project Template';
lisCodeToolsDefsInsertDelphi7CompilerTemp = 'Insert Delphi 7 Compiler '
+'Template';
lisCodeToolsDefsInsertDelphi7DirectoryTem = 'Insert Delphi 7 Directory '
+'Template';
lisCodeToolsDefsInsertDelphi7ProjectTempl =
'Insert Delphi 7 Project Template';
lisCodeToolsDefsInsertKylix3CompilerTemp = 'Insert Kylix 3 Compiler '
+'Template';
lisCodeToolsDefsInsertKylix3DirectoryTem = 'Insert Kylix 3 Directory '

5
lcl/extctrls.pp
View File

@ -79,9 +79,9 @@ type
procedure DestroyHandle; override;
function GetPageIndex: integer;
procedure SetPageIndex(AValue: Integer);
property PageIndex: Integer read GetPageIndex write SetPageIndex;
property TabVisible: Boolean read GetTabVisible write SetTabVisible default True;
public
property PageIndex: Integer read GetPageIndex write SetPageIndex;
constructor Create(TheOwner: TComponent); override;
procedure AdjustClientRect(var ARect: TRect); override;
function CanTab: boolean; override;
@ -825,6 +825,9 @@ end.
{
$Log$
Revision 1.80 2003/09/21 10:42:47 mattias
implemented TBitBtn Text+Caption from Micha
Revision 1.79 2003/09/20 15:24:54 mattias
implemented TPageControl and TTabSheet

10
lcl/interfaces/win32/win32callback.inc
View File

@ -110,7 +110,7 @@ Var
begin
Notebook := TObject(GetProp(NotebookHandle, 'Lazarus')) as TCustomNotebook;
PageIndex := SendMessage(NotebookHandle, TCM_GETCURSEL, 0, 0);
PageHandle := Notebook.Page[PageIndex].Handle;
PageHandle := Notebook.CustomPage(PageIndex).Handle;
if Showing
then ShowWindow(PageHandle, SW_SHOW)
else ShowWindow(PageHandle, SW_HIDE);
@ -595,6 +595,11 @@ Begin
// SendMessage(Window, WM_SIZE, 0, MakeLParam(R.right-R.left, R.bottom-R.top));
// WinProcess:=false;
End;
WM_DRAWITEM:
Begin
CNSendMessage(LM_DRAWITEM, TObject(GetProp(PDRAWITEMSTRUCT(LParam)^.hwndItem ,'WinControl')), Pointer(LParam));
WinProcess := false;
End;
End;
If WinProcess Then
@ -757,6 +762,9 @@ end;
{
$Log$
Revision 1.59 2003/09/21 10:42:48 mattias
implemented TBitBtn Text+Caption from Micha
Revision 1.58 2003/09/20 13:27:49 mattias
varois improvements for ParentColor from Micha

111
lcl/interfaces/win32/win32object.inc
View File

@ -203,7 +203,8 @@ Begin
TCI.cchTextMax := MAX_PATH;
TCI.pszText := Caption;
Assert(False, 'Trace:TWin32Object.GetText - Getting the text');
Result := (Windows.Sendmessage(Ctrl.Handle, TCM_GETITEM, TCustomPage(Sender).PageIndex, LPARAM(@TCI))<>0);
Result := (Windows.Sendmessage(Ctrl.Handle, TCM_GETITEM,
TCustomPage(Sender).PageIndex, LPARAM(@TCI))<>0);
if Result
then Data := StrPas(Caption);
Assert(False, Format('Trace:TWin32Object.GetText - Returning the text --> %S', [Data]));
@ -364,7 +365,7 @@ End;
Function TWin32Object.IntSendMessage3(LM_Message: Integer; Sender: TObject; Data: Pointer): Integer;
Var
XPMFIle : TFileStream;
Bitmap: HBITMAP; // Pixel map type image
//Bitmap: HBITMAP; // Pixel map type image
//CBI: COMBOBOXINFO;
DC: HDC;
Handle: HWND;
@ -380,6 +381,63 @@ Var
OldPageIndex: Integer; //used by LM_SETITEMINDEX of a csNotebook
AMenu: TMenu;
TheWinControl: TWinControl;
Procedure DrawOwnerButton;
var flags:integer; // How the button looks like (pressed or not pressed)
BitmapHandle: HBITMAP; // Handle of bitmap
BitmapBuf: BITMAP; // Buffer for bitmap
hdcBitmap: HDC; // Memory device context for the bitmap
xDestBitmap: integer; // X coordinate of destination rectangle for bitmap
yDestBitmap: integer; // Y coordinate of destination rectangle for bitmap
TextSize: SIZE; // For computing the length of button caption in pixels
TextPosFlags:integer; // Flags for text position on the button
begin
with PDrawItemStruct(Data)^ do
begin
flags:=DFCS_BUTTONPUSH;
if (itemState and ODS_SELECTED)<>0 then flags:=flags or DFCS_PUSHED;
DrawFrameControl(_HDC, rcItem, DFC_BUTTON, flags);
InflateRect(rcItem, -2, -2);
if (itemState and ODS_SELECTED)<>0 then OffsetRect(rcItem, 2, 2);
SetBkMode(_HDC, TRANSPARENT);
BitmapHandle:=(Sender as TBitBtn).Glyph.Handle;
hdcBitmap := CreateCompatibleDC(_HDC);
GetObject(BitmapHandle, sizeof(BitmapBuf), @BitmapBuf);
SelectObject(hdcBitmap, BitmapHandle);
GetTextExtentPoint32(_HDC, LPSTR((Sender as TBitBtn).Caption), length((Sender as TBitBtn).Caption), TextSize);
case (Sender as TBitBtn).Layout of
blGlyphLeft: begin
xDestBitmap:=rcItem.Left+((rcItem.Right-rcItem.Left)-(TextSize.cx+BitmapBuf.bmWidth+2)) shr 1;
yDestBitmap:=rcItem.Top+((rcItem.Bottom-rcItem.Top)-BitmapBuf.bmHeight) shr 1;
TextPosFlags:=DT_SINGLELINE or DT_LEFT or DT_VCENTER;
Inc(rcItem.Left, xDestBitmap+BitmapBuf.bmWidth+2);
end;
blGlyphRight: begin
xDestBitmap:=rcItem.Right-((rcItem.Right-rcItem.Left)-(TextSize.cx+BitmapBuf.bmWidth+2)) shr 1 - BitmapBuf.bmWidth;
yDestBitmap:=rcItem.Top+((rcItem.Bottom-rcItem.Top)-BitmapBuf.bmHeight) shr 1;
TextPosFlags:=DT_SINGLELINE or DT_RIGHT or DT_VCENTER;
rcItem.Right:=xDestBitmap-2;
end;
blGlyphTop: begin
xDestBitmap:=rcItem.Left+((rcItem.Right-rcItem.Left)-BitmapBuf.bmWidth) shr 1;
yDestBitmap:=rcItem.Top+((rcItem.Bottom-rcItem.Top)-(TextSize.cy+BitmapBuf.bmHeight+2)) shr 1;
TextPosFlags:=DT_SINGLELINE or DT_CENTER or DT_TOP;
Inc(rcItem.Top, yDestBitmap+BitmapBuf.bmHeight+2);
end;
blGlyphBottom: begin
xDestBitmap:=rcItem.Left+((rcItem.Right-rcItem.Left)-BitmapBuf.bmWidth) shr 1;
yDestBitmap:=rcItem.Bottom-((rcItem.Bottom-rcItem.Top)-(TextSize.cy+BitmapBuf.bmHeight+2)) shr 1 - BitmapBuf.bmHeight;
TextPosFlags:=DT_SINGLELINE or DT_CENTER or DT_BOTTOM;
rcItem.Bottom:=yDestBitmap-2;
end;
end;
BitBlt(_HDC, xDestBitmap, yDestBitmap, BitmapBuf.bmWidth, BitmapBuf.bmHeight, hdcBitmap, 0, 0, SRCCOPY);
DrawText(_HDC, LPSTR((Sender as TBitBtn).Caption), -1, rcItem, TextPosFlags);
DeleteObject(BitmapHandle);
DeleteDC(hdcBitmap);
end;
end;
Begin
Result := 0; //default value just in case nothing sets it
Assert(False, 'Trace:IntSendMessage3 - Start, Received (' + GetMessageName(LM_Message) + ')');
@ -582,15 +640,22 @@ Begin
LM_DRAGINFOCHANGED:
Begin
End;
LM_DRAWITEM:
Begin
if PDrawItemStruct(Data)^.CtlType = ODT_BUTTON then
Begin
DrawOwnerButton;
End;
End;
//TBitBtn
LM_IMAGECHANGED, LM_LAYOUTCHANGED:
Begin
Assert(False, 'Trace:[TWin32Object.IntSendMessage3 - Got LM_IMAGECHANGED or LM_LAYOUTCHANGED');
Assert(False, 'Trace:********************');
Assert(False, 'Trace:1');
Bitmap := (Sender As TBitBtn).Glyph.Handle;
{Bitmap := (Sender As TBitBtn).Glyph.Handle;
SendMessage(Handle, BM_SETIMAGE, IMAGE_BITMAP, Bitmap);
SetWindowText(Handle, PChar((Sender As TWinControl).Caption));
SetWindowText(Handle, PChar((Sender As TWinControl).Caption));}
Assert(False, 'Trace:5');
Assert(False, 'Trace:********************');
End;
@ -875,10 +940,12 @@ activate_time : the time at which the activation event occurred.
begin
OldPageIndex := SendMessage(Handle,TCM_GETCURSEL,0,0);
SendMessage(Handle,TCM_SETCURSEL,WPARAM(Page),0);
if (Page>=0) And ((Parent As TCustomNotebook).Page[Page].HandleAllocated)
then ShowWindow(TCustomNotebook(Parent).Page[Page].Handle, SW_SHOW);
if (OldPageIndex>=0) and (OldPageIndex<>Page) and (TCustomNotebook(Parent).Page[OldPageIndex].HandleAllocated)
then ShowWindow(TCustomNotebook(Parent).Page[OldPageIndex].Handle, SW_HIDE);
if (Page>=0)
And ((Parent As TCustomNotebook).CustomPage(Page).HandleAllocated)
then ShowWindow(TCustomNotebook(Parent).CustomPage(Page).Handle, SW_SHOW);
if (OldPageIndex>=0) and (OldPageIndex<>Page)
and (TCustomNotebook(Parent).CustomPage(OldPageIndex).HandleAllocated)
then ShowWindow(TCustomNotebook(Parent).CustomPage(OldPageIndex).Handle, SW_HIDE);
end;
End;
End;
@ -1762,29 +1829,8 @@ End;
Changes the form's default background color
------------------------------------------------------------------------------}
Procedure TWin32Object.SetColor(Sender: TObject);
Var
DC: HDC;
Begin
With Sender Do
Begin
If Sender Is TWincontrol Then
Begin
With TWincontrol(Sender) Do
Begin
// Temphack to set backcolor, till better solution
// For what control does this work?
{
If HandleAllocated Then
Begin
DC := Windows.GetDC(Handle);
SetBKColor(Handle, Color);
ReleaseDC(Handle, DC);
End;
}
End;
End;
End;
//NOT USED RIGHT NOW..........CAUSES ALL FORMS TO USE THESE COLORS!!!!!!
End;
{------------------------------------------------------------------------------
@ -1895,7 +1941,7 @@ Begin
End;
csBitBtn:
Begin
Window := CreateWindow('BUTTON', Nil, Flags or BS_PUSHBUTTON Or BS_BITMAP, Left, Top, Width, Height, Parent, HMENU(Nil), HInstance, Nil);
Window := CreateWindow('BUTTON', Nil, Flags or BS_PUSHBUTTON Or BS_OWNERDRAW, Left, Top, Width, Height, Parent, HMENU(Nil), HInstance, Nil);
IntSendMessage3(LM_LOADXPM, Sender, StrTemp);
End;
csButton:
@ -2795,6 +2841,9 @@ End;
{
$Log$
Revision 1.112 2003/09/21 10:42:48 mattias
implemented TBitBtn Text+Caption from Micha
Revision 1.111 2003/09/20 13:27:49 mattias
varois improvements for ParentColor from Micha