mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-10 05:36:10 +02:00
fixed some gtk2 intf warnings
git-svn-id: trunk@6789 -
This commit is contained in:
mattias
parent
81a07bf019
commit
925cc87469
@ -1919,26 +1919,20 @@ end;
|
||||
function gtkPressedCB( widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
|
||||
var
|
||||
Mess : TLMessage;
|
||||
Status : GBoolean;
|
||||
begin
|
||||
Result := CallBackDefaultReturn;
|
||||
|
||||
if (Widget=nil) then ;
|
||||
EventTrace('pressed', data);
|
||||
Mess.msg := LM_PRESSED;
|
||||
Status := DeliverMessage(Data, Mess) = 0;
|
||||
DeliverMessage(Data, Mess);
|
||||
|
||||
{$ifdef GTK2}
|
||||
Result := False;
|
||||
{$Else}
|
||||
Result := Status;
|
||||
{$endif}
|
||||
Result := CallBackDefaultReturn;
|
||||
end;
|
||||
|
||||
function gtkEnterCB(widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
|
||||
var
|
||||
Mess : TLMessage;
|
||||
Status : GBoolean;
|
||||
Mess : TLMessage;
|
||||
begin
|
||||
Result := CallBackDefaultReturn;
|
||||
|
||||
@ -1950,19 +1944,14 @@ begin
|
||||
end;
|
||||
|
||||
Mess.msg := CM_MOUSEENTER;
|
||||
Status := DeliverMessage(Data, Mess) = 0;
|
||||
DeliverMessage(Data, Mess);
|
||||
|
||||
{$ifdef GTK2}
|
||||
Result := CallBackDefaultReturn;
|
||||
{$Else}
|
||||
Result := Status;
|
||||
{$endif}
|
||||
end;
|
||||
|
||||
function gtkLeaveCB(widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
|
||||
var
|
||||
Mess : TLMessage;
|
||||
Status : GBoolean;
|
||||
begin
|
||||
Result := CallBackDefaultReturn;
|
||||
|
||||
@ -1974,13 +1963,9 @@ begin
|
||||
end;
|
||||
|
||||
Mess.msg := CM_MOUSELEAVE;
|
||||
Status := DeliverMessage(Data, Mess) = 0;
|
||||
DeliverMessage(Data, Mess);
|
||||
|
||||
{$ifdef GTK2}
|
||||
Result := CallBackDefaultReturn;
|
||||
{$Else}
|
||||
Result := Status;
|
||||
{$endif}
|
||||
end;
|
||||
|
||||
function gtkMoveCursorCB(widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
|
||||
@ -2979,6 +2964,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$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
|
||||
fixed some gtk2 intf mem leaks, clean ups
|
||||
|
||||
|
||||
@ -2289,7 +2289,8 @@ begin
|
||||
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow G Width=',dbgs(AnImage^.Width),' Height=',dbgs(AnImage^.Height),
|
||||
' BitsPerPixel=',dbgs(NewRawImage.Description.BitsPerPixel),' bpl=',dbgs(AnImage^.bpl));
|
||||
{$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');
|
||||
|
||||
// copy data
|
||||
@ -2384,7 +2385,8 @@ begin
|
||||
{$IFDEF VerboseRawImage}
|
||||
DebugLn('TGtkWidgetSet.GetRawImageFromGdkWindow G Width=',dbgs(AnImage^.Width),' Height=',dbgs(AnImage^.Height),' BitsPerPixel=',dbgs(RawImage.Description.AlphaBitsPerPixel),' bpl=',dbgs(AnImage^.bpl));
|
||||
{$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');
|
||||
|
||||
// copy data
|
||||
@ -7008,6 +7010,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$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
|
||||
improved gtk intf file dialog filter from C Western
|
||||
|
||||
|
||||
@ -2082,7 +2082,7 @@ function TGtkWidgetSet.ComboBoxDropDown(Handle: HWND; DropDown: boolean): boolea
|
||||
if GTK_LIST (combo^.list)^.children = nil then
|
||||
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 * border_width(GTK_CONTAINER (gtk_bin_get_child(popwin))^) -
|
||||
2 * border_width(GTK_CONTAINER (combo^.popup)^) -
|
||||
@ -7462,10 +7462,12 @@ var
|
||||
|
||||
procedure PreparePaintMessage(TargetObject: TObject; var AMessage: TLMessage);
|
||||
var
|
||||
PaintDC: HDC;
|
||||
GtkPaintData: TLMGtkPaintData;
|
||||
DCOrigin: TPoint;
|
||||
OldGtkPaintMsg: TLMGtkPaint;
|
||||
{$IFNDEF Gtk2}
|
||||
PaintDC: HDC;
|
||||
DCOrigin: TPoint;
|
||||
{$ENDIF}
|
||||
begin
|
||||
(* 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.
|
||||
@ -8893,6 +8895,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$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
|
||||
clean up
|
||||
|
||||
|
||||
@ -310,7 +310,9 @@ function TGtkWSCustomNotebook.GetNotebookMinTabHeight(
|
||||
var
|
||||
NBWidget: PGTKWidget;
|
||||
BorderWidth: Integer;
|
||||
{$IFDEF Gtk1}
|
||||
Requisition: TGtkRequisition;
|
||||
{$ENDIF}
|
||||
Page: PGtkNotebookPage;
|
||||
begin
|
||||
Result:=inherited GetNotebookMinTabHeight(AWinControl);
|
||||
@ -338,9 +340,11 @@ begin
|
||||
Page:=PGtkNoteBook(NBWidget)^.cur_page;
|
||||
|
||||
Result:=BorderWidth;
|
||||
{$IFDEF GTK2}
|
||||
{$WARNING TODO}
|
||||
{$ELSE GTK2}
|
||||
{$IFDEF GTK2}
|
||||
if (Page<>nil) then begin
|
||||
debugln('TGtkWSCustomNotebook.RemovePage TODO');
|
||||
end;
|
||||
{$ELSE GTK2}
|
||||
if (NBWidget^.thestyle<>nil) and (PGtkStyle(NBWidget^.thestyle)^.klass<>nil) then
|
||||
inc(Result,PGtkStyle(NBWidget^.thestyle)^.klass^.ythickness);
|
||||
if (Page<>nil) and (Page^.child<>nil) then begin
|
||||
@ -350,9 +354,9 @@ begin
|
||||
' ',GetWidgetDebugReport(Page^.child),' Requisition=',dbgs(Requisition.height));
|
||||
inc(Result,Page^.child^.allocation.height);
|
||||
end;
|
||||
{$ENDIF GTK2}
|
||||
debugln('TGtkWSCustomNotebook.GetNotebookMinTabHeight END ',dbgs(Result),' ',
|
||||
GetWidgetDebugReport(NBWidget));
|
||||
{$ENDIF GTK2}
|
||||
end;
|
||||
|
||||
function TGtkWSCustomNotebook.GetNotebookMinTabWidth(
|
||||
|
||||
@ -618,15 +618,14 @@ end;
|
||||
procedure TGtk2WSCustomListView.UpdateProperties(
|
||||
const ACustomListView: TCustomListView);
|
||||
var
|
||||
Widgets: TTVWidgets;
|
||||
GtkColumn: PGtkTreeViewColumn;
|
||||
Column: TListColumn;
|
||||
GtkAlign: gfloat;
|
||||
Iter: TGtkTreeIter;
|
||||
Item: TListItem;
|
||||
X, Y: Integer;
|
||||
Count: Integer;
|
||||
BitImage: TBitmap;
|
||||
Widgets: TTVWidgets;
|
||||
GtkColumn: PGtkTreeViewColumn;
|
||||
Column: TListColumn;
|
||||
Iter: TGtkTreeIter;
|
||||
Item: TListItem;
|
||||
X, Y: Integer;
|
||||
Count: Integer;
|
||||
BitImage: TBitmap;
|
||||
begin
|
||||
if Not(ACustomListView.HandleAllocated) then exit;
|
||||
|
||||
@ -642,8 +641,9 @@ begin
|
||||
gtk_tree_view_column_set_alignment(GtkColumn, AlignToGtkAlign(Column.Alignment));
|
||||
// set auto sizing
|
||||
case Column.AutoSize of
|
||||
// The gtk2 docs say that GTK_TREE_VIEW_COLUMN_AUTOSIZE is inefficient for large views
|
||||
// so perhaps this should be GTK_TREE_VIEW_COLUMN_GROW_ONLY
|
||||
// The gtk2 docs say that GTK_TREE_VIEW_COLUMN_AUTOSIZE is inefficient
|
||||
// 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_GROW_ONLY);
|
||||
False: gtk_tree_view_column_set_sizing(GtkColumn, GTK_TREE_VIEW_COLUMN_FIXED);
|
||||
@ -654,21 +654,19 @@ begin
|
||||
// set Visible
|
||||
gtk_tree_view_column_set_visible(GtkColumn, Column.Visible);
|
||||
// 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
|
||||
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;
|
||||
|
||||
// ViewStyle
|
||||
case ACustomListView.ViewStyle of
|
||||
vsReport:
|
||||
begin
|
||||
gtk_tree_view_set_headers_visible(TreeView, True);
|
||||
end;
|
||||
vsList:
|
||||
begin
|
||||
gtk_tree_view_set_headers_visible(TreeView, False);
|
||||
end;
|
||||
end;
|
||||
|
||||
//sorting
|
||||
|
||||
Loading…
Reference in New Issue
Block a user