debugger: removed hack for popup menu in watches dialog, the LCL now shows a pop menu correctly on Windows.

git-svn-id: trunk@10950 -
This commit is contained in:
vincents 2007-04-16 10:05:03 +00:00
parent f75315aedf
commit 171f613297
3 changed files with 32 additions and 48 deletions

View File

@ -1,20 +1,19 @@
object WatchesDlg: TWatchesDlg
ActiveControl = lvWatches
Caption = 'Watch list'
ClientHeight = 200
ClientWidth = 500
OnClose = FormClose
OnCloseQuery = FormCloseQuery
OnCreate = FormCreate
OnDestroy = FormDestroy
PixelsPerInch = 112
HorzScrollBar.Page = 499
VertScrollBar.Page = 199
inherited WatchesDlg: TWatchesDlg
Left = 321
Height = 200
Top = 437
Width = 500
HorzScrollBar.Page = 499
VertScrollBar.Page = 199
ActiveControl = lvWatches
Caption = 'Watch list'
OnClose = FormClose
OnCloseQuery = FormCloseQuery
OnCreate = FormCreate
OnDestroy = FormDestroy
object lvWatches: TListView
Height = 200
Width = 500
Align = alClient
Columns = <
item
@ -31,11 +30,8 @@ object WatchesDlg: TWatchesDlg
TabOrder = 0
ViewStyle = vsReport
OnDblClick = lvWatchesDblClick
OnMouseDown = lvWatchesMouseDown
OnKeyDown = lvWatchesKeyDown
OnSelectItem = lvWatchesSelectItem
Height = 200
Width = 500
end
object mnuPopup: TPopupMenu
left = 100

View File

@ -1,26 +1,25 @@
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TWatchesDlg','FORMDATA',[
'TPF0'#11'TWatchesDlg'#10'WatchesDlg'#13'ActiveControl'#7#9'lvWatches'#7'Capt'
+'ion'#6#10'Watch list'#12'ClientHeight'#3#200#0#11'ClientWidth'#3#244#1#7'On'
+'Close'#7#9'FormClose'#12'OnCloseQuery'#7#14'FormCloseQuery'#8'OnCreate'#7#10
+'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#13'PixelsPerInch'#2'p'#18'HorzSc'
+'rollBar.Page'#3#243#1#18'VertScrollBar.Page'#3#199#0#4'Left'#3'A'#1#6'Heigh'
+'t'#3#200#0#3'Top'#3#181#1#5'Width'#3#244#1#0#9'TListView'#9'lvWatches'#5'Al'
+'ign'#7#8'alClient'#7'Columns'#14#1#7'Caption'#6#10'Expression'#5'Width'#2#10
+#0#1#7'Caption'#6#5'Value'#5'Width'#2#10#0#0#11'MultiSelect'#9#9'PopupMenu'#7
+#8'mnuPopup'#9'RowSelect'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#10'On'
+'DblClick'#7#17'lvWatchesDblClick'#11'OnMouseDown'#7#18'lvWatchesMouseDown'#9
+'OnKeyDown'#7#16'lvWatchesKeyDown'#12'OnSelectItem'#7#19'lvWatchesSelectItem'
+#6'Height'#3#200#0#5'Width'#3#244#1#0#0#10'TPopupMenu'#8'mnuPopup'#4'left'#2
+'d'#3'top'#2'`'#0#9'TMenuItem'#6'popAdd'#7'Caption'#6#4'&Add'#7'OnClick'#7#11
+'popAddClick'#0#0#9'TMenuItem'#2'N1'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#13'p'
+'opProperties'#7'Caption'#6#11'&Properties'#7'OnClick'#7#18'popPropertiesCli'
+'ck'#0#0#9'TMenuItem'#10'popEnabled'#7'Caption'#6#8'&Enabled'#7'OnClick'#7#15
+'popEnabledClick'#0#0#9'TMenuItem'#9'popDelete'#7'Caption'#6#7'&Delete'#7'On'
+'Click'#7#14'popDeleteClick'#0#0#9'TMenuItem'#2'N2'#7'Caption'#6#1'-'#0#0#9
+'TMenuItem'#13'popDisableAll'#7'Caption'#6#12'D&isable All'#7'OnClick'#7#18
+'popDisableAllClick'#0#0#9'TMenuItem'#12'popEnableAll'#7'Caption'#6#11'E&nab'
+'le All'#7'OnClick'#7#17'popEnableAllClick'#0#0#9'TMenuItem'#12'popDeleteAll'
+#7'Caption'#6#11'De&lete All'#7'OnClick'#7#17'popDeleteAllClick'#0#0#0#0
'TPF0'#241#11'TWatchesDlg'#10'WatchesDlg'#4'Left'#3'A'#1#6'Height'#3#200#0#3
+'Top'#3#181#1#5'Width'#3#244#1#18'HorzScrollBar.Page'#3#243#1#18'VertScrollB'
+'ar.Page'#3#199#0#13'ActiveControl'#7#9'lvWatches'#7'Caption'#6#10'Watch lis'
+'t'#7'OnClose'#7#9'FormClose'#12'OnCloseQuery'#7#14'FormCloseQuery'#8'OnCrea'
+'te'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#0#9'TListView'#9'lvWatc'
+'hes'#6'Height'#3#200#0#5'Width'#3#244#1#5'Align'#7#8'alClient'#7'Columns'#14
+#1#7'Caption'#6#10'Expression'#5'Width'#2#10#0#1#7'Caption'#6#5'Value'#5'Wid'
+'th'#2#10#0#0#11'MultiSelect'#9#9'PopupMenu'#7#8'mnuPopup'#9'RowSelect'#9#8
+'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#10'OnDblClick'#7#17'lvWatchesDblCl'
+'ick'#9'OnKeyDown'#7#16'lvWatchesKeyDown'#12'OnSelectItem'#7#19'lvWatchesSel'
+'ectItem'#0#0#10'TPopupMenu'#8'mnuPopup'#4'left'#2'd'#3'top'#2'`'#0#9'TMenuI'
+'tem'#6'popAdd'#7'Caption'#6#4'&Add'#7'OnClick'#7#11'popAddClick'#0#0#9'TMen'
+'uItem'#2'N1'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#13'popProperties'#7'Caption'
+#6#11'&Properties'#7'OnClick'#7#18'popPropertiesClick'#0#0#9'TMenuItem'#10'p'
+'opEnabled'#7'Caption'#6#8'&Enabled'#7'OnClick'#7#15'popEnabledClick'#0#0#9
+'TMenuItem'#9'popDelete'#7'Caption'#6#7'&Delete'#7'OnClick'#7#14'popDeleteCl'
+'ick'#0#0#9'TMenuItem'#2'N2'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#13'popDisabl'
+'eAll'#7'Caption'#6#12'D&isable All'#7'OnClick'#7#18'popDisableAllClick'#0#0
+#9'TMenuItem'#12'popEnableAll'#7'Caption'#6#11'E&nable All'#7'OnClick'#7#17
+'popEnableAllClick'#0#0#9'TMenuItem'#12'popDeleteAll'#7'Caption'#6#11'De&let'
+'e All'#7'OnClick'#7#17'popDeleteAllClick'#0#0#0#0
]);

View File

@ -65,8 +65,6 @@ type
procedure lvWatchesDblClick(Sender: TObject);
procedure lvWatchesKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
procedure lvWatchesMouseDown(Sender: TOBject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure lvWatchesSelectItem(Sender: TObject; AItem: TListItem; Selected: Boolean);
procedure popAddClick(Sender: TObject);
procedure popPropertiesClick(Sender: TObject);
@ -176,15 +174,6 @@ begin
popEnabled.Checked := Enable and Watch.Enabled;
end;
procedure TWatchesDlg.lvWatchesMouseDown(Sender: TOBject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
begin
{$IFdef MSWindows}
{$NOTE TODO repair TListView.PopupMenu and remove this hack}
if Button in [mbRight] then mnuPopup.PopUp(X + lvWatches.Left + Left, Y + lvWatches.Top + Top);
{$ENDIF}
end;
procedure TWatchesDlg.lvWatchesDblClick(Sender: TObject);
begin
if lvWatches.SelCount >= 0 then