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

fixed fpc 1.9.1 warns

Browse Source 
git-svn-id: trunk@4869 -
This commit is contained in:
mattias 2003-11-30 18:35:20 +00:00
parent 21484feee9
commit bbaf66e037
6 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
designer/designermenu.pp
View File

@ -56,8 +56,8 @@ type
subitem_level: Integer;
fAction: Integer;
public
constructor Create(AOwner: TComponent; aAction: Integer);
procedure OkButtonCLick(Sender: TObject);
constructor CreateWithAction(AOwner: TComponent; aAction: Integer);
procedure OkButtonClick(Sender: TObject);
procedure CancelButtonCLick(Sender: TObject);
function GetSelectedMenuTemplate: Integer;
function GetDescription: string;
@ -100,7 +100,8 @@ type
TemplateMenuForm: TTemplateMenuForm;
public
// Constructor and destructor
constructor Create(aOwner: TComponent; aMenu: TMenu; aEditor: TComponentEditor);
constructor CreateWithMenu(aOwner: TComponent; aMenu: TMenu;
aEditor: TComponentEditor);
destructor Destroy; override;
// Properties for accesing private variables
@ -189,7 +190,8 @@ var
XMLConfig: TXMLConfig;
//
constructor TDesignerMainMenu.Create(aOwner: TComponent; aMenu: TMenu; aEditor: TComponentEditor);
constructor TDesignerMainMenu.CreateWithMenu(aOwner: TComponent; aMenu: TMenu;
aEditor: TComponentEditor);
var
PopupMenuItem: TMenuItem;
begin
@ -831,7 +833,7 @@ var
templatemenuitem: string;
temp_designermenuitem: PDesignerMenuItem;
begin
TemplateMenuForm:=TTemplateMenuForm.Create(self, 1);
TemplateMenuForm:=TTemplateMenuForm.CreateWithAction(self, 1);
if (TemplateMenuForm.ShowModal = mrOK) then
begin
@ -1090,7 +1092,7 @@ begin
i:=1;
Str(i,str_i);
templatemenuitem:='menu_' + str_i;
TemplateMenuForm:=TTemplateMenuForm.Create(self, 2);
TemplateMenuForm:=TTemplateMenuForm.CreateWithAction(self, 2);
if (TemplateMenuForm.ShowModal = mrOK) then
begin
while (XMLConfig.GetValue(templatemenuitem + '/Name/Value','does_not_exists') <> 'does_not_exists') do
@ -1141,7 +1143,7 @@ begin
//SelectedDesignerMenuItem:=GetSelectedDesignerMenuItem(Root);
i:=1;
j:=1;
TemplateMenuForm:=TTemplateMenuForm.Create(self, 3);
TemplateMenuForm:=TTemplateMenuForm.CreateWithAction(self, 3);
if (TemplateMenuForm.ShowModal = mrOK) and (TemplateMenuForm.GetSelectedMenuTemplate > 0) then
begin
i:=TemplateMenuForm.GetSelectedMenuTemplate;
@ -1796,7 +1798,8 @@ end;
// TTemplateMenuForm ---/
// ---------------------/
constructor TTemplateMenuForm.Create(AOwner: TComponent; aAction: Integer);
constructor TTemplateMenuForm.CreateWithAction(AOwner: TComponent;
aAction: Integer);
var
i: Integer;
templatemenuitem, str_i: string;

4
designer/menueditorform.pas
View File

@ -112,7 +112,7 @@ begin
fEditor:=aEditor;
DesignerMainMenu:=TDesignerMainMenu.Create(Self, fMenu, fEditor);
DesignerMainMenu:=TDesignerMainMenu.CreateWithMenu(Self, fMenu, fEditor);
PopupMenu:=DesignerMainMenu.MainPopupMenu;
Cmp2:=TScrollBox.Create(self);
@ -215,7 +215,7 @@ begin
fMenu:=TMenu(fDesigner.Form.Components[j]);
end;
end;
DesignerMainMenu:=TDesignerMainMenu.Create(Self, fMenu, fEditor);
DesignerMainMenu:=TDesignerMainMenu.CreateWithMenu(Self, fMenu, fEditor);
with DesignerMainMenu do
begin
Parent:=Self;

4
lcl/comctrls.pp
View File

@ -650,7 +650,6 @@ type
private
MinBtn,
MaxBtn : TControl;//TSpeedButton's
BTimer : TTimer;
BTimerProc : Procedure of Object;
BTimerBounds : TRect;
FArrowKeys: Boolean;
@ -1937,6 +1936,9 @@ end.
{ =============================================================================
$Log$
Revision 1.92 2003/11/30 18:35:19 mattias
fixed fpc 1.9.1 warns
Revision 1.91 2003/11/07 15:57:45 mattias
implemented auto selection visible for component tree

1
lcl/include/customupdown.inc
View File

@ -23,6 +23,7 @@ Type
TUpDownButton = Class(TSpeedButton)
Private
BTimer : TTimer;
FUpDown : TCustomUpDown;
FButtonType : TUDBtnType;
Protected

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

@ -8390,7 +8390,7 @@ begin
// create Lines
CurLineEntry:=Lines;
CurLineStart:=PChar(Lines)+ArraySize;
CurLineStart:=PChar(CurLineEntry)+ArraySize;
i:=0;
while i<LinesList.Count do begin
// set the pointer to the start of the current line
@ -8465,6 +8465,9 @@ end;
{ =============================================================================
$Log$
Revision 1.440 2003/11/30 18:35:19 mattias
fixed fpc 1.9.1 warns
Revision 1.439 2003/11/29 13:17:38 mattias
made gtklayout using window theme at start

7
lcl/interfaces/gtk/gtkproc.inc
View File

@ -5108,7 +5108,7 @@ begin
clMENUTEXT,
clBTNTEXT :
begin
Case Color of
Case TColor(Color) of
clBTNTEXT : Style := GetStyle('button');
clMENUTEXT : Style := GetStyle('menuitem');
end;
@ -5159,7 +5159,7 @@ var
begin
style := nil;
Case Color of
Case TColor(Color) of
{ clMenu:
begin
Style := GetStyle('menuitem');
@ -5620,6 +5620,9 @@ end;
{ =============================================================================
$Log$
Revision 1.232 2003/11/30 18:35:20 mattias
fixed fpc 1.9.1 warns
Revision 1.231 2003/11/29 13:17:38 mattias
made gtklayout using window theme at start