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

fixed some gtk2 intf warnings

Browse Source 
git-svn-id: trunk@6789 -
This commit is contained in:
mattias 2005-02-17 00:05:25 +00:00
parent 81a07bf019
commit 925cc87469
5 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lcl/interfaces/gtk/gtkcallback.inc
View File

@ -1919,26 +1919,20 @@ end;
function gtkPressedCB( widget: PGtkWidget; data: gPointer) : GBoolean; cdecl; function gtkPressedCB( widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
var var
Mess : TLMessage; Mess : TLMessage;
Status : GBoolean;
begin begin
Result := CallBackDefaultReturn; Result := CallBackDefaultReturn;
if (Widget=nil) then ; if (Widget=nil) then ;
EventTrace('pressed', data); EventTrace('pressed', data);
Mess.msg := LM_PRESSED; Mess.msg := LM_PRESSED;
Status := DeliverMessage(Data, Mess) = 0; DeliverMessage(Data, Mess);
{$ifdef GTK2} Result := CallBackDefaultReturn;
Result := False;
{$Else}
Result := Status;
{$endif}
end; end;
function gtkEnterCB(widget: PGtkWidget; data: gPointer) : GBoolean; cdecl; function gtkEnterCB(widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
var var
Mess : TLMessage; Mess : TLMessage;
Status : GBoolean;
begin begin
Result := CallBackDefaultReturn; Result := CallBackDefaultReturn;
@ -1950,19 +1944,14 @@ begin
end; end;
Mess.msg := CM_MOUSEENTER; Mess.msg := CM_MOUSEENTER;
Status := DeliverMessage(Data, Mess) = 0; DeliverMessage(Data, Mess);
{$ifdef GTK2}
Result := CallBackDefaultReturn; Result := CallBackDefaultReturn;
{$Else}
Result := Status;
{$endif}
end; end;
function gtkLeaveCB(widget: PGtkWidget; data: gPointer) : GBoolean; cdecl; function gtkLeaveCB(widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
var var
Mess : TLMessage; Mess : TLMessage;
Status : GBoolean;
begin begin
Result := CallBackDefaultReturn; Result := CallBackDefaultReturn;
@ -1974,13 +1963,9 @@ begin
end; end;
Mess.msg := CM_MOUSELEAVE; Mess.msg := CM_MOUSELEAVE;
Status := DeliverMessage(Data, Mess) = 0; DeliverMessage(Data, Mess);
{$ifdef GTK2}
Result := CallBackDefaultReturn; Result := CallBackDefaultReturn;
{$Else}
Result := Status;
{$endif}
end; end;
function gtkMoveCursorCB(widget: PGtkWidget; data: gPointer) : GBoolean; cdecl; function gtkMoveCursorCB(widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
@ -2979,6 +2964,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.266 2005/02/17 00:05:25 mattias
fixed some gtk2 intf warnings
Revision 1.265 2005/02/16 23:56:51 mattias Revision 1.265 2005/02/16 23:56:51 mattias
fixed some gtk2 intf mem leaks, clean ups fixed some gtk2 intf mem leaks, clean ups

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

@ -2289,7 +2289,8 @@ begin
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow G Width=',dbgs(AnImage^.Width),' Height=',dbgs(AnImage^.Height), DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow G Width=',dbgs(AnImage^.Width),' Height=',dbgs(AnImage^.Height),
' BitsPerPixel=',dbgs(NewRawImage.Description.BitsPerPixel),' bpl=',dbgs(AnImage^.bpl)); ' BitsPerPixel=',dbgs(NewRawImage.Description.BitsPerPixel),' bpl=',dbgs(AnImage^.bpl));
{$ENDIF} {$ENDIF}
if NewRawImage.DataSize<>cardinal(AnImage^.bpl) * AnImage^.Height then if NewRawImage.DataSize<>cardinal(AnImage^.bpl) * cardinal(AnImage^.Height)
then
RaiseGDBException('NewRawImage.DataSize<>AnImage^.bpl*AnImage^.Height'); RaiseGDBException('NewRawImage.DataSize<>AnImage^.bpl*AnImage^.Height');
// copy data // copy data
@ -2384,7 +2385,8 @@ begin
{$IFDEF VerboseRawImage} {$IFDEF VerboseRawImage}
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow G Width=',dbgs(AnImage^.Width),' Height=',dbgs(AnImage^.Height),' BitsPerPixel=',dbgs(RawImage.Description.AlphaBitsPerPixel),' bpl=',dbgs(AnImage^.bpl)); DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow G Width=',dbgs(AnImage^.Width),' Height=',dbgs(AnImage^.Height),' BitsPerPixel=',dbgs(RawImage.Description.AlphaBitsPerPixel),' bpl=',dbgs(AnImage^.bpl));
{$ENDIF} {$ENDIF}
if RawImage.MaskSize<>cardinal(AnImage^.bpl) * AnImage^.Height then if RawImage.MaskSize<>cardinal(AnImage^.bpl) * cardinal(AnImage^.Height)
then
RaiseGDBException('RawImage.MaskSize<>AnImage^.bpl*AnImage^.Height'); RaiseGDBException('RawImage.MaskSize<>AnImage^.bpl*AnImage^.Height');
// copy data // copy data
@ -7008,6 +7010,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.627 2005/02/17 00:05:25 mattias
fixed some gtk2 intf warnings
Revision 1.626 2005/02/16 22:55:59 mattias Revision 1.626 2005/02/16 22:55:59 mattias
improved gtk intf file dialog filter from C Western improved gtk intf file dialog filter from C Western

11
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -2082,7 +2082,7 @@ function TGtkWidgetSet.ComboBoxDropDown(Handle: HWND; DropDown: boolean): boolea
if GTK_LIST (combo^.list)^.children = nil then if GTK_LIST (combo^.list)^.children = nil then
list_requisition^.height := list_requisition^.height + EMPTY_LIST_HEIGHT; list_requisition^.height := list_requisition^.height + EMPTY_LIST_HEIGHT;
alloc_width := (widget^.allocation.width - alloc_width := (cardinal(widget^.allocation.width) -
2 * cardinal(gtk_widget_get_xthickness(gtk_bin_get_child(popwin))) - 2 * cardinal(gtk_widget_get_xthickness(gtk_bin_get_child(popwin))) -
2 * border_width(GTK_CONTAINER (gtk_bin_get_child(popwin))^) - 2 * border_width(GTK_CONTAINER (gtk_bin_get_child(popwin))^) -
2 * border_width(GTK_CONTAINER (combo^.popup)^) - 2 * border_width(GTK_CONTAINER (combo^.popup)^) -
@ -7462,10 +7462,12 @@ var
procedure PreparePaintMessage(TargetObject: TObject; var AMessage: TLMessage); procedure PreparePaintMessage(TargetObject: TObject; var AMessage: TLMessage);
var var
PaintDC: HDC;
GtkPaintData: TLMGtkPaintData; GtkPaintData: TLMGtkPaintData;
DCOrigin: TPoint;
OldGtkPaintMsg: TLMGtkPaint; OldGtkPaintMsg: TLMGtkPaint;
{$IFNDEF Gtk2}
PaintDC: HDC;
DCOrigin: TPoint;
{$ENDIF}
begin begin
(* MG: old trick. Not used anymore, but it might be, that someday there (* MG: old trick. Not used anymore, but it might be, that someday there
will be component, that works better with this, so it is kept. will be component, that works better with this, so it is kept.
@ -8893,6 +8895,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.396 2005/02/17 00:05:25 mattias
fixed some gtk2 intf warnings
Revision 1.395 2005/02/05 22:48:51 mattias Revision 1.395 2005/02/05 22:48:51 mattias
clean up clean up

12
lcl/interfaces/gtk/gtkwsextctrls.pp
View File

@ -310,7 +310,9 @@ function TGtkWSCustomNotebook.GetNotebookMinTabHeight(
var var
NBWidget: PGTKWidget; NBWidget: PGTKWidget;
BorderWidth: Integer; BorderWidth: Integer;
{$IFDEF Gtk1}
Requisition: TGtkRequisition; Requisition: TGtkRequisition;
{$ENDIF}
Page: PGtkNotebookPage; Page: PGtkNotebookPage;
begin begin
Result:=inherited GetNotebookMinTabHeight(AWinControl); Result:=inherited GetNotebookMinTabHeight(AWinControl);
@ -338,9 +340,11 @@ begin
Page:=PGtkNoteBook(NBWidget)^.cur_page; Page:=PGtkNoteBook(NBWidget)^.cur_page;
Result:=BorderWidth; Result:=BorderWidth;
{$IFDEF GTK2} {$IFDEF GTK2}
{$WARNING TODO} if (Page<>nil) then begin
{$ELSE GTK2} debugln('TGtkWSCustomNotebook.RemovePage TODO');
end;
{$ELSE GTK2}
if (NBWidget^.thestyle<>nil) and (PGtkStyle(NBWidget^.thestyle)^.klass<>nil) then if (NBWidget^.thestyle<>nil) and (PGtkStyle(NBWidget^.thestyle)^.klass<>nil) then
inc(Result,PGtkStyle(NBWidget^.thestyle)^.klass^.ythickness); inc(Result,PGtkStyle(NBWidget^.thestyle)^.klass^.ythickness);
if (Page<>nil) and (Page^.child<>nil) then begin if (Page<>nil) and (Page^.child<>nil) then begin
@ -350,9 +354,9 @@ begin
' ',GetWidgetDebugReport(Page^.child),' Requisition=',dbgs(Requisition.height)); ' ',GetWidgetDebugReport(Page^.child),' Requisition=',dbgs(Requisition.height));
inc(Result,Page^.child^.allocation.height); inc(Result,Page^.child^.allocation.height);
end; end;
{$ENDIF GTK2}
debugln('TGtkWSCustomNotebook.GetNotebookMinTabHeight END ',dbgs(Result),' ', debugln('TGtkWSCustomNotebook.GetNotebookMinTabHeight END ',dbgs(Result),' ',
GetWidgetDebugReport(NBWidget)); GetWidgetDebugReport(NBWidget));
{$ENDIF GTK2}
end; end;
function TGtkWSCustomNotebook.GetNotebookMinTabWidth( function TGtkWSCustomNotebook.GetNotebookMinTabWidth(

32
lcl/interfaces/gtk2/gtk2wscomctrls.pp
View File

@ -618,15 +618,14 @@ end;
procedure TGtk2WSCustomListView.UpdateProperties( procedure TGtk2WSCustomListView.UpdateProperties(
const ACustomListView: TCustomListView); const ACustomListView: TCustomListView);
var var
Widgets: TTVWidgets; Widgets: TTVWidgets;
GtkColumn: PGtkTreeViewColumn; GtkColumn: PGtkTreeViewColumn;
Column: TListColumn; Column: TListColumn;
GtkAlign: gfloat; Iter: TGtkTreeIter;
Iter: TGtkTreeIter; Item: TListItem;
Item: TListItem; X, Y: Integer;
X, Y: Integer; Count: Integer;
Count: Integer; BitImage: TBitmap;
BitImage: TBitmap;
begin begin
if Not(ACustomListView.HandleAllocated) then exit; if Not(ACustomListView.HandleAllocated) then exit;
@ -642,8 +641,9 @@ begin
gtk_tree_view_column_set_alignment(GtkColumn, AlignToGtkAlign(Column.Alignment)); gtk_tree_view_column_set_alignment(GtkColumn, AlignToGtkAlign(Column.Alignment));
// set auto sizing // set auto sizing
case Column.AutoSize of case Column.AutoSize of
// The gtk2 docs say that GTK_TREE_VIEW_COLUMN_AUTOSIZE is inefficient for large views // The gtk2 docs say that GTK_TREE_VIEW_COLUMN_AUTOSIZE is inefficient
// so perhaps this should be GTK_TREE_VIEW_COLUMN_GROW_ONLY // for large views, so perhaps this should be
// GTK_TREE_VIEW_COLUMN_GROW_ONLY
True : gtk_tree_view_column_set_sizing(GtkColumn, GTK_TREE_VIEW_COLUMN_AUTOSIZE); True : gtk_tree_view_column_set_sizing(GtkColumn, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
//True : gtk_tree_view_column_set_sizing(GtkColumn, GTK_TREE_VIEW_COLUMN_GROW_ONLY); //True : gtk_tree_view_column_set_sizing(GtkColumn, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
False: gtk_tree_view_column_set_sizing(GtkColumn, GTK_TREE_VIEW_COLUMN_FIXED); False: gtk_tree_view_column_set_sizing(GtkColumn, GTK_TREE_VIEW_COLUMN_FIXED);
@ -654,21 +654,19 @@ begin
// set Visible // set Visible
gtk_tree_view_column_set_visible(GtkColumn, Column.Visible); gtk_tree_view_column_set_visible(GtkColumn, Column.Visible);
// set MinWidth // set MinWidth
gtk_tree_view_column_set_min_width(GtkColumn, Column.MinWidth-Ord(Column.MinWidth=0)); gtk_tree_view_column_set_min_width(GtkColumn,
Column.MinWidth-Ord(Column.MinWidth=0));
// set MaxWidth // set MaxWidth
gtk_tree_view_column_set_max_width(GtkColumn, Column.MaxWidth-Ord(Column.MaxWidth=0)); gtk_tree_view_column_set_max_width(GtkColumn,
Column.MaxWidth-Ord(Column.MaxWidth=0));
end; end;
// ViewStyle // ViewStyle
case ACustomListView.ViewStyle of case ACustomListView.ViewStyle of
vsReport: vsReport:
begin
gtk_tree_view_set_headers_visible(TreeView, True); gtk_tree_view_set_headers_visible(TreeView, True);
end;
vsList: vsList:
begin
gtk_tree_view_set_headers_visible(TreeView, False); gtk_tree_view_set_headers_visible(TreeView, False);
end;
end; end;
//sorting //sorting