paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-11 20:39:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtk2: replace the deprecated gtk_object_get/set_data by g_object_get/set_data

Browse Source 
git-svn-id: trunk@37751 -
This commit is contained in:
blikblum 2012-06-23 18:25:44 +00:00
parent 65afb65cf7
commit d26811409a
8 changed files with 145 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/interfaces/gtk2/gtk2lclintf.inc
View File

@ -875,7 +875,7 @@ begin
{ We were requested by window manager to close so return EscapeResult} { We were requested by window manager to close so return EscapeResult}
if PInteger(data)^ = 0 then if PInteger(data)^ = 0 then
begin begin
ModalResult:= {%H-}PtrUInt(gtk_object_get_data(PGtkObject(Widget), 'modal_result')); ModalResult:= {%H-}PtrUInt(g_object_get_data(PGObject(Widget), 'modal_result'));
{ Don't allow to close if we don't have a default return value } { Don't allow to close if we don't have a default return value }
Result:= (ModalResult = 0); Result:= (ModalResult = 0);
if not Result then PInteger(data)^:= ModalResult if not Result then PInteger(data)^:= ModalResult
@ -885,7 +885,7 @@ end;
function PromptUserButtonClicked(Widget : PGtkWidget; data: gPointer) : GBoolean; cdecl; function PromptUserButtonClicked(Widget : PGtkWidget; data: gPointer) : GBoolean; cdecl;
begin begin
PInteger(data)^ := {%H-}PtrUInt(gtk_object_get_data(PGtkObject(Widget), 'modal_result')); PInteger(data)^ := {%H-}PtrUInt(g_object_get_data(PGObject(Widget), 'modal_result'));
Result := False; Result := False;
end; end;
@ -1047,10 +1047,10 @@ begin
BtnID := ButtonResults[Buttons[BtnIdx].ModalResult]; BtnID := ButtonResults[Buttons[BtnIdx].ModalResult];
if BtnID = idButtonCancel then if BtnID = idButtonCancel then
gtk_object_set_data(PGtkObject(Dialog), 'modal_result', Pointer(idButtonCancel)); g_object_set_data(PGObject(Dialog), 'modal_result', Pointer(idButtonCancel));
X := Buttons[BtnIdx].ModalResult; X := Buttons[BtnIdx].ModalResult;
gtk_object_set_data(PGtkObject(Btn), 'modal_result', g_object_set_data(PGObject(Btn), 'modal_result',
{%H-}Pointer(PtrInt(X))); {%H-}Pointer(PtrInt(X)));
g_signal_connect(PGtkObject(Btn), 'clicked', g_signal_connect(PGtkObject(Btn), 'clicked',
@ -1060,7 +1060,7 @@ begin
begin begin
gtk_dialog_set_default_response(PGtkDialog(Dialog), ResponseID(BtnID)); gtk_dialog_set_default_response(PGtkDialog(Dialog), ResponseID(BtnID));
X := Buttons[BtnIdx].ModalResult; X := Buttons[BtnIdx].ModalResult;
gtk_object_set_data(PGtkObject(Dialog), 'modal_result', g_object_set_data(PGObject(Dialog), 'modal_result',
{%H-}Pointer(PtrInt(X))); {%H-}Pointer(PtrInt(X)));
end; end;
@ -1210,10 +1210,10 @@ begin
Btn := PGtkButton(ChildList^.Data); Btn := PGtkButton(ChildList^.Data);
if Buttons[BtnIdx] = idButtonCancel then if Buttons[BtnIdx] = idButtonCancel then
gtk_object_set_data(PGtkObject(Dialog), 'modal_result', Pointer(idButtonCancel)); g_object_set_data(PGObject(Dialog), 'modal_result', Pointer(idButtonCancel));
X := Buttons[BtnIdx]; X := Buttons[BtnIdx];
gtk_object_set_data(PGtkObject(Btn), 'modal_result', g_object_set_data(PGObject(Btn), 'modal_result',
{%H-}Pointer(PtrInt(X))); {%H-}Pointer(PtrInt(X)));
g_signal_connect(PGtkObject(Btn), 'clicked', g_signal_connect(PGtkObject(Btn), 'clicked',
@ -1223,7 +1223,7 @@ begin
begin begin
gtk_dialog_set_default_response(PGtkDialog(Dialog), ResponseID(Buttons[BtnIdx])); gtk_dialog_set_default_response(PGtkDialog(Dialog), ResponseID(Buttons[BtnIdx]));
X := Buttons[BtnIdx]; X := Buttons[BtnIdx];
gtk_object_set_data(PGtkObject(Dialog), 'modal_result', g_object_set_data(PGObject(Dialog), 'modal_result',
{%H-}Pointer(PtrInt(X))); {%H-}Pointer(PtrInt(X)));
end; end;

26
lcl/interfaces/gtk2/gtk2listsl.inc
View File

@ -61,10 +61,10 @@ begin
//DebugLn('gtkListItemDrawCB '); //DebugLn('gtkListItemDrawCB ');
// get context // get context
GtkList:=PGtkList(gtk_object_get_data(PGtkObject(Data),GtkListItemGtkListTag)); GtkList:=PGtkList(g_object_get_data(PGObject(Data),GtkListItemGtkListTag));
if GtkList=nil then if GtkList=nil then
RaiseGDBException('gtkListItemDrawAfterCB GtkList=nil'); RaiseGDBException('gtkListItemDrawAfterCB GtkList=nil');
LCLList:=TGtkListStringList(gtk_object_get_data(PGtkObject(Data), LCLList:=TGtkListStringList(g_object_get_data(PGObject(Data),
GtkListItemLCLListTag)); GtkListItemLCLListTag));
if LCLList=nil then if LCLList=nil then
RaiseGDBException('gtkListItemDrawAfterCB LCLList=nil'); RaiseGDBException('gtkListItemDrawAfterCB LCLList=nil');
@ -145,10 +145,10 @@ begin
//DebugLn('gtkListItemDrawCB '); //DebugLn('gtkListItemDrawCB ');
// get context // get context
GtkList:=PGtkList(gtk_object_get_data(PGtkObject(Data),GtkListItemGtkListTag)); GtkList:=PGtkList(g_object_get_data(PGObject(Data),GtkListItemGtkListTag));
if GtkList=nil then if GtkList=nil then
RaiseGDBException('gtkListItemToggledCB GtkList=nil'); RaiseGDBException('gtkListItemToggledCB GtkList=nil');
LCLList:=TGtkListStringList(gtk_object_get_data(PGtkObject(Data), LCLList:=TGtkListStringList(g_object_get_data(PGObject(Data),
GtkListItemLCLListTag)); GtkListItemLCLListTag));
if LCLList=nil then if LCLList=nil then
RaiseGDBException('gtkListItemToggledCB LCLList=nil'); RaiseGDBException('gtkListItemToggledCB LCLList=nil');
@ -160,7 +160,7 @@ begin
if LockOnChange({%H-}PgtkObject(LCLList.Owner.Handle),0) > 0 then Exit; if LockOnChange({%H-}PgtkObject(LCLList.Owner.Handle),0) > 0 then Exit;
if GtkWidgetIsA(Widget,gtk_toggle_button_get_type) then begin if GtkWidgetIsA(Widget,gtk_toggle_button_get_type) then begin
gtk_object_set_data(PgtkObject(Widget), 'Grayed', nil); g_object_set_data(PGObject(Widget), 'Grayed', nil);
end; end;
Mess.Msg := LM_CHANGED; Mess.Msg := LM_CHANGED;
@ -212,10 +212,10 @@ begin
Debugln('gtkListItemSelectAfterCB'); Debugln('gtkListItemSelectAfterCB');
{$ENDIF} {$ENDIF}
// get context // get context
GtkList:=PGtkList(gtk_object_get_data(PGtkObject(Data),GtkListItemGtkListTag)); GtkList:=PGtkList(g_object_get_data(PGObject(Data),GtkListItemGtkListTag));
if GtkList=nil then if GtkList=nil then
RaiseGTKListNotFound; RaiseGTKListNotFound;
LCLList:=TGtkListStringList(gtk_object_get_data(PGtkObject(Data), LCLList:=TGtkListStringList(g_object_get_data(PGObject(Data),
GtkListItemLCLListTag)); GtkListItemLCLListTag));
if LCLList=nil then if LCLList=nil then
RaiseGDBException('gtkListItemSelectAfterCB LCLList=nil'); RaiseGDBException('gtkListItemSelectAfterCB LCLList=nil');
@ -340,8 +340,8 @@ begin
{$IFDEF EventTrace} {$IFDEF EventTrace}
Debugln('connect itemCallback'); Debugln('connect itemCallback');
{$ENDIF} {$ENDIF}
gtk_object_set_data(PGtkObject(li),GtkListItemLCLListTag,Self); g_object_set_data(PGObject(li),GtkListItemLCLListTag,Self);
gtk_object_set_data(PGtkObject(li),GtkListItemGtkListTag,FGtkList); g_object_set_data(PGObject(li),GtkListItemGtkListTag,FGtkList);
//DebugLn('TGtkListStringList.ConnectItemCallbacks Self=',DbgS(Self), //DebugLn('TGtkListStringList.ConnectItemCallbacks Self=',DbgS(Self),
//' GtkList=',DbgS(FGtkList), //' GtkList=',DbgS(FGtkList),
//' Owner=',DbgS(Owner),'=',Owner.ClassName, //' Owner=',DbgS(Owner),'=',Owner.ClassName,
@ -395,8 +395,8 @@ begin
{$IFDEF EventTrace} {$IFDEF EventTrace}
Debugln('connect itemCallback'); Debugln('connect itemCallback');
{$ENDIF} {$ENDIF}
gtk_object_set_data(PGtkObject(AItem), GtkListItemLCLListTag, nil); g_object_set_data(PGObject(AItem), GtkListItemLCLListTag, nil);
gtk_object_set_data(PGtkObject(AItem), GtkListItemGtkListTag, nil); g_object_set_data(PGObject(AItem), GtkListItemGtkListTag, nil);
g_signal_handlers_disconnect_by_func( g_signal_handlers_disconnect_by_func(
G_OBJECT(AItem), G_CALLBACK(@gtkListItemExposeEvent), AItem); G_OBJECT(AItem), G_CALLBACK(@gtkListItemExposeEvent), AItem);
@ -492,7 +492,7 @@ begin
//DebugLn('[TGtkListStringList.PutObject] Index=',Index,' Count=',Count); //DebugLn('[TGtkListStringList.PutObject] Index=',Index,' Count=',Count);
ListItem:=GetListItem(Index); ListItem:=GetListItem(Index);
if ListItem <> nil then if ListItem <> nil then
gtk_object_set_data(PGtkObject(ListItem),'LCLStringsObject',AnObject); g_object_set_data(PGObject(ListItem),'LCLStringsObject',AnObject);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -686,7 +686,7 @@ begin
Result:=nil; Result:=nil;
ListItem:=GetListItem(Index); ListItem:=GetListItem(Index);
if ListItem<>nil then if ListItem<>nil then
Result:=TObject(gtk_object_get_data(PGtkObject(ListItem),'LCLStringsObject')); Result:=TObject(g_object_get_data(PGObject(ListItem),'LCLStringsObject'));
end; end;
procedure TGtkListStringList.Put(Index: Integer; const S: string); procedure TGtkListStringList.Put(Index: Integer; const S: string);

22
lcl/interfaces/gtk2/gtk2pagecontrol.inc
View File

@ -174,9 +174,9 @@ begin
UpdateNoteBookClientWidget(TObject(Data)); UpdateNoteBookClientWidget(TObject(Data));
// remove flag // remove flag
IsManual := gtk_object_get_data(PGtkObject(Widget), LCL_NotebookManualPageSwitchKey) <> nil; IsManual := g_object_get_data(PGObject(Widget), LCL_NotebookManualPageSwitchKey) <> nil;
if IsManual then if IsManual then
gtk_object_set_data(PGtkObject(Widget), LCL_NotebookManualPageSwitchKey, nil); g_object_set_data(PGObject(Widget), LCL_NotebookManualPageSwitchKey, nil);
if PGtkNotebook(Widget)^.cur_page = nil then // for windows compatibility if PGtkNotebook(Widget)^.cur_page = nil then // for windows compatibility
Exit; Exit;
@ -195,7 +195,7 @@ begin
DeliverMessage(Data, Mess); DeliverMessage(Data, Mess);
if Mess.Result <> 0 then if Mess.Result <> 0 then
begin begin
g_signal_stop_emission_by_name(PGtkObject(Widget), 'switch-page'); g_signal_stop_emission_by_name(PGObject(Widget), 'switch-page');
Result := not CallBackDefaultReturn; Result := not CallBackDefaultReturn;
Exit; Exit;
end; end;
@ -240,7 +240,7 @@ begin
Set_RC_Name(AWinControl, Widget); Set_RC_Name(AWinControl, Widget);
gtk_object_set_data(PGtkObject(WidgetInfo^.CoreWidget),'lcl_ttabcontrol', WidgetInfo^.CoreWidget); g_object_set_data(PGObject(WidgetInfo^.CoreWidget),'lcl_ttabcontrol', WidgetInfo^.CoreWidget);
TGtk2WSWinControl.SetCallbacks(GTK_OBJECT(Widget), AWinControl); TGtk2WSWinControl.SetCallbacks(GTK_OBJECT(Widget), AWinControl);
@ -378,11 +378,11 @@ begin
// create the tab (hbox container) // create the tab (hbox container)
TabWidget := gtk_hbox_new(false, 1); TabWidget := gtk_hbox_new(false, 1);
gtk_object_set_data(PGtkObject(TabWidget), 'TabImage', nil); g_object_set_data(PGObject(TabWidget), 'TabImage', nil);
gtk_object_set_data(PGtkObject(TabWidget), 'TabCloseBtn', nil); g_object_set_data(PGObject(TabWidget), 'TabCloseBtn', nil);
// put a label into the tab // put a label into the tab
TabLabelWidget := gtk_label_new(''); TabLabelWidget := gtk_label_new('');
gtk_object_set_data(PGtkObject(TabWidget), 'TabLabel', TabLabelWidget); g_object_set_data(PGObject(TabWidget), 'TabLabel', TabLabelWidget);
gtk_widget_show(TabLabelWidget); gtk_widget_show(TabLabelWidget);
gtk_box_pack_start_defaults(PGtkBox(TabWidget), TabLabelWidget); gtk_box_pack_start_defaults(PGtkBox(TabWidget), TabLabelWidget);
@ -392,10 +392,10 @@ begin
// create popup menu item // create popup menu item
MenuWidget := gtk_hbox_new(false, 2); MenuWidget := gtk_hbox_new(false, 2);
// set icon widget to nil // set icon widget to nil
gtk_object_set_data(PGtkObject(MenuWidget), 'TabImage', nil); g_object_set_data(PGObject(MenuWidget), 'TabImage', nil);
// put a label into the menu // put a label into the menu
MenuLabelWidget := gtk_label_new(''); MenuLabelWidget := gtk_label_new('');
gtk_object_set_data(PGtkObject(MenuWidget), 'TabMenuLabel', MenuLabelWidget); g_object_set_data(PGObject(MenuWidget), 'TabMenuLabel', MenuLabelWidget);
gtk_widget_show(MenuLabelWidget); gtk_widget_show(MenuLabelWidget);
gtk_box_pack_start_defaults(PGtkBox(MenuWidget), MenuLabelWidget); gtk_box_pack_start_defaults(PGtkBox(MenuWidget), MenuLabelWidget);
@ -566,7 +566,7 @@ begin
begin begin
Page := {%H-}PGtkWidget(ATabControl.Page[AIndex].Handle); Page := {%H-}PGtkWidget(ATabControl.Page[AIndex].Handle);
ANewIndex := gtk_notebook_page_num(GtkNoteBook, Page); ANewIndex := gtk_notebook_page_num(GtkNoteBook, Page);
gtk_object_set_data(PGtkObject(GtkNotebook), LCL_NotebookManualPageSwitchKey, ATabControl); g_object_set_data(PGObject(GtkNotebook), LCL_NotebookManualPageSwitchKey, ATabControl);
gtk_notebook_set_page(GtkNotebook, ANewIndex); gtk_notebook_set_page(GtkNotebook, ANewIndex);
end; end;
end; end;
@ -657,7 +657,7 @@ begin
if (TabWidget = nil) or not GTK_WIDGET_VISIBLE(TabWidget) then if (TabWidget = nil) or not GTK_WIDGET_VISIBLE(TabWidget) then
exit; exit;
TabImageWidget := gtk_object_get_data(PGtkObject(TabWidget), 'TabImage'); TabImageWidget := g_object_get_data(PGObject(TabWidget), 'TabImage');
if TabImageWidget <> nil then if TabImageWidget <> nil then
gtk_widget_queue_draw(TabImageWidget); gtk_widget_queue_draw(TabImageWidget);
end; end;

116
lcl/interfaces/gtk2/gtk2proc.inc
View File

@ -657,7 +657,7 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function WidgetIsDestroyingHandle(Widget: PGtkWidget): boolean; function WidgetIsDestroyingHandle(Widget: PGtkWidget): boolean;
begin begin
Result:=gtk_object_get_data(PGtkObject(Widget),'LCLDestroyingHandle')<>nil; Result:=g_object_get_data(PGObject(Widget),'LCLDestroyingHandle')<>nil;
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -667,7 +667,7 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure SetWidgetIsDestroyingHandle(Widget: PGtkWidget); procedure SetWidgetIsDestroyingHandle(Widget: PGtkWidget);
begin begin
gtk_object_set_data(PGtkObject(Widget),'LCLDestroyingHandle',Widget); g_object_set_data(PGObject(Widget),'LCLDestroyingHandle',Widget);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -3460,12 +3460,12 @@ begin
gtk_window_set_transient_for(PGtkWindow(DlgWindow),nil); gtk_window_set_transient_for(PGtkWindow(DlgWindow),nil);
if ADialog is TOpenDialog then begin if ADialog is TOpenDialog then begin
FileSelWidget:=GTK_FILE_CHOOSER(DlgWindow); FileSelWidget:=GTK_FILE_CHOOSER(DlgWindow);
LCLHistoryMenu:=PGTKWidget(gtk_object_get_data(PGtkObject(FileSelWidget), LCLHistoryMenu:=PGTKWidget(g_object_get_data(PGObject(FileSelWidget),
'LCLHistoryMenu')); 'LCLHistoryMenu'));
if LCLHistoryMenu<>nil then FreeWidgetInfo(LCLHistoryMenu); if LCLHistoryMenu<>nil then FreeWidgetInfo(LCLHistoryMenu);
// free history // free history
HistoryList:=TFPList(gtk_object_get_data(PGtkObject(DlgWindow), HistoryList:=TFPList(g_object_get_data(PGObject(DlgWindow),
'LCLHistoryList')); 'LCLHistoryList'));
if HistoryList<>nil then begin if HistoryList<>nil then begin
for i:=0 to HistoryList.Count-1 do begin for i:=0 to HistoryList.Count-1 do begin
@ -3475,7 +3475,7 @@ begin
Dispose(AHistoryEntry); Dispose(AHistoryEntry);
end; end;
HistoryList.Free; HistoryList.Free;
gtk_object_set_data(PGtkObject(DlgWindow),'LCLHistoryList',nil); g_object_set_data(PGObject(DlgWindow),'LCLHistoryList',nil);
end; end;
// free preview handle // free preview handle
@ -3651,7 +3651,7 @@ begin
if Widget = nil if Widget = nil
then raise EInterfaceException.Create('GetMainWidget Widget=nil'); then raise EInterfaceException.Create('GetMainWidget Widget=nil');
Result := gtk_object_get_data(Widget, 'Main'); Result := g_object_get_data(Widget, 'Main');
if Result = nil then Result := Widget; // the widget is the main widget itself. if Result = nil then Result := Widget; // the widget is the main widget itself.
end; end;
@ -3666,7 +3666,7 @@ begin
if PGtkWidget(ParentWidget)^.parent=ChildWidget if PGtkWidget(ParentWidget)^.parent=ChildWidget
then raise EInterfaceException.Create('SetMainWidget Parent^.Parent=ChildWidget'); then raise EInterfaceException.Create('SetMainWidget Parent^.Parent=ChildWidget');
gtk_object_set_data(ChildWidget, 'Main', ParentWidget) g_object_set_data(ChildWidget, 'Main', ParentWidget)
end; end;
{ ------------------------------------------------------------------------------ { ------------------------------------------------------------------------------
@ -3689,7 +3689,7 @@ begin
else Result := nil; else Result := nil;
if Result <> nil then Exit; if Result <> nil then Exit;
Result := gtk_object_get_data(Widget, 'Fixed'); Result := g_object_get_data(Widget, 'Fixed');
// A last resort // A last resort
if Result = nil then Result := Widget; if Result = nil then Result := Widget;
end; end;
@ -3709,7 +3709,7 @@ begin
WidgetInfo := GetWidgetInfo(ParentWidget, True); WidgetInfo := GetWidgetInfo(ParentWidget, True);
WidgetInfo^.ClientWidget := FixedWidget; WidgetInfo^.ClientWidget := FixedWidget;
//TODO: remove old compatebility //TODO: remove old compatebility
gtk_object_set_data(ParentWidget, 'Fixed', FixedWidget) g_object_set_data(ParentWidget, 'Fixed', FixedWidget)
end; end;
{------------------------------------------------------------------------------- {-------------------------------------------------------------------------------
@ -3951,7 +3951,7 @@ begin
else begin else begin
New(Result); New(Result);
FillChar(Result^, SizeOf(Result^), 0); FillChar(Result^, SizeOf(Result^), 0);
gtk_object_set_data(AWidget, 'widgetinfo', Result); g_object_set_data(AWidget, 'widgetinfo', Result);
end; end;
end; end;
@ -3983,7 +3983,7 @@ begin
if AWidget <> nil then if AWidget <> nil then
begin begin
MainWidget := GetMainWidget(AWidget); MainWidget := GetMainWidget(AWidget);
Result := gtk_object_get_data(MainWidget, 'widgetinfo'); Result := g_object_get_data(PGObject(MainWidget), 'widgetinfo');
if (Result = nil) and ACreate then if (Result = nil) and ACreate then
begin begin
Result := CreateWidgetInfo(MainWidget); Result := CreateWidgetInfo(MainWidget);
@ -4000,7 +4000,7 @@ var
begin begin
if AWidget = nil then Exit; if AWidget = nil then Exit;
//DebugLn(['FreeWidgetInfo ',GetWidgetDebugReport(AWidget)]); //DebugLn(['FreeWidgetInfo ',GetWidgetDebugReport(AWidget)]);
Info := gtk_object_get_data(AWidget, 'widgetinfo'); Info := g_object_get_data(AWidget, 'widgetinfo');
if Info = nil then Exit; if Info = nil then Exit;
if Info^.DoubleBuffer <> nil then if Info^.DoubleBuffer <> nil then
@ -4010,7 +4010,7 @@ begin
FreeMem(Info^.UserData); FreeMem(Info^.UserData);
//Info^.UserData := nil; // see below the whole memory is cleared by Fillchar //Info^.UserData := nil; // see below the whole memory is cleared by Fillchar
end; end;
gtk_object_set_data(AWidget,'widgetinfo',nil); g_object_set_data(AWidget,'widgetinfo',nil);
// Set WidgetInfo memory to nil. This will expose bugs that use widgetinfo after // Set WidgetInfo memory to nil. This will expose bugs that use widgetinfo after
// it has been freed and is still referenced by something! // it has been freed and is still referenced by something!
@ -4075,7 +4075,7 @@ begin
WidgetInfo := GetWidgetInfo(AWidget); WidgetInfo := GetWidgetInfo(AWidget);
if (WidgetInfo = nil) or (WidgetInfo^.CoreWidget = nil) then if (WidgetInfo = nil) or (WidgetInfo^.CoreWidget = nil) then
exit(False); exit(False);
Result := gtk_object_get_data(PGtkObject(WidgetInfo^.CoreWidget),'lcl_ttabcontrol') <> nil; Result := g_object_get_data(PGObject(WidgetInfo^.CoreWidget),'lcl_ttabcontrol') <> nil;
end; end;
{------------------------------------------------------------------------------- {-------------------------------------------------------------------------------
@ -4085,7 +4085,7 @@ end;
-------------------------------------------------------------------------------} -------------------------------------------------------------------------------}
function GetGtkNoteBookDummyPage(ANoteBookWidget: PGtkNoteBook): PGtkWidget; function GetGtkNoteBookDummyPage(ANoteBookWidget: PGtkNoteBook): PGtkWidget;
begin begin
Result:=gtk_object_get_data(PGtkObject(ANoteBookWidget),'LCLDummyPage'); Result:=g_object_get_data(PGObject(ANoteBookWidget),'LCLDummyPage');
end; end;
{------------------------------------------------------------------------------- {-------------------------------------------------------------------------------
@ -4097,7 +4097,7 @@ end;
procedure SetGtkNoteBookDummyPage(ANoteBookWidget: PGtkNoteBook; procedure SetGtkNoteBookDummyPage(ANoteBookWidget: PGtkNoteBook;
DummyWidget: PGtkWidget); DummyWidget: PGtkWidget);
begin begin
gtk_object_set_data(PGtkObject(ANoteBookWidget),'LCLDummyPage',DummyWidget); g_object_set_data(PGObject(ANoteBookWidget),'LCLDummyPage',DummyWidget);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -4213,7 +4213,7 @@ var
TabImageWidget := gtk_label_new(#0); TabImageWidget := gtk_label_new(#0);
g_signal_connect(PgtkObject(TabImageWidget), 'expose_event', g_signal_connect(PgtkObject(TabImageWidget), 'expose_event',
TGTKSignalFunc(@PageIconWidgetExposeAfter), ThePage); TGTKSignalFunc(@PageIconWidgetExposeAfter), ThePage);
gtk_object_set_data(PGtkObject(TabWidget), 'TabImage', TabImageWidget); g_object_set_data(PGObject(TabWidget), 'TabImage', TabImageWidget);
gtk_widget_set_usize(TabImageWidget, IconSize.X, IconSize.Y); gtk_widget_set_usize(TabImageWidget, IconSize.X, IconSize.Y);
gtk_widget_show(TabImageWidget); gtk_widget_show(TabImageWidget);
gtk_box_pack_start_defaults(PGtkBox(TabWidget), TabImageWidget); gtk_box_pack_start_defaults(PGtkBox(TabWidget), TabImageWidget);
@ -4232,7 +4232,7 @@ var
g_signal_connect_after(PgtkObject(MenuImageWidget), 'expose_event', g_signal_connect_after(PgtkObject(MenuImageWidget), 'expose_event',
TGTKSignalFunc(@PageIconWidgetExposeAfter), ThePage); TGTKSignalFunc(@PageIconWidgetExposeAfter), ThePage);
gtk_widget_set_usize(MenuImageWidget,IconSize.X,IconSize.Y); gtk_widget_set_usize(MenuImageWidget,IconSize.X,IconSize.Y);
gtk_object_set_data(PGtkObject(MenuWidget),'TabImage',MenuImageWidget); g_object_set_data(PGObject(MenuWidget),'TabImage',MenuImageWidget);
gtk_widget_show(MenuImageWidget); gtk_widget_show(MenuImageWidget);
gtk_box_pack_start_defaults(PGtkBox(MenuWidget),MenuImageWidget); gtk_box_pack_start_defaults(PGtkBox(MenuWidget),MenuImageWidget);
gtk_box_reorder_child(PGtkBox(MenuWidget),MenuImageWidget,0); gtk_box_reorder_child(PGtkBox(MenuWidget),MenuImageWidget,0);
@ -4245,7 +4245,7 @@ var
// there is a pixmap for an old image in the tab // there is a pixmap for an old image in the tab
// -> remove the icon widget // -> remove the icon widget
DestroyWidget(TabImageWidget); DestroyWidget(TabImageWidget);
gtk_object_set_data(PGtkObject(TabWidget), 'TabImage', nil); g_object_set_data(PGObject(TabWidget), 'TabImage', nil);
TabImageWidget:=nil; TabImageWidget:=nil;
end; end;
if MenuImageWidget<>nil then if MenuImageWidget<>nil then
@ -4253,7 +4253,7 @@ var
// there is a pixmap for an old image in the menu // there is a pixmap for an old image in the menu
// -> remove the icon widget // -> remove the icon widget
DestroyWidget(MenuImageWidget); DestroyWidget(MenuImageWidget);
gtk_object_set_data(PGtkObject(MenuWidget), 'TabImage', nil); g_object_set_data(PGObject(MenuWidget), 'TabImage', nil);
MenuImageWidget:=nil; MenuImageWidget:=nil;
end; end;
end; end;
@ -4290,11 +4290,11 @@ var
style^.ythickness := 0; style^.ythickness := 0;
gtk_widget_modify_style(TabCloseBtnWidget, style); gtk_widget_modify_style(TabCloseBtnWidget, style);
gtk_object_set_data(PGtkObject(TabWidget), 'TabCloseBtn', g_object_set_data(PGObject(TabWidget), 'TabCloseBtn',
TabCloseBtnWidget); TabCloseBtnWidget);
// put a pixmap into the button // put a pixmap into the button
TabCloseBtnImageWidget:=gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); TabCloseBtnImageWidget:=gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
gtk_object_set_data(PGtkObject(TabCloseBtnWidget),'TabCloseBtnImage', g_object_set_data(PGObject(TabCloseBtnWidget),'TabCloseBtnImage',
TabCloseBtnImageWidget); TabCloseBtnImageWidget);
gtk_widget_show(TabCloseBtnImageWidget); gtk_widget_show(TabCloseBtnImageWidget);
gtk_container_add(PGtkContainer(TabCloseBtnWidget), gtk_container_add(PGtkContainer(TabCloseBtnWidget),
@ -4309,7 +4309,7 @@ var
if TabCloseBtnWidget<>nil then begin if TabCloseBtnWidget<>nil then begin
// there is a close button // there is a close button
// -> remove it // -> remove it
gtk_object_set_data(PGtkObject(TabWidget), 'TabCloseBtn', g_object_set_data(PGObject(TabWidget), 'TabCloseBtn',
nil); nil);
DestroyWidget(TabCloseBtnWidget); DestroyWidget(TabCloseBtnWidget);
TabCloseBtnWidget:=nil; TabCloseBtnWidget:=nil;
@ -4332,9 +4332,9 @@ begin
TabWidget:=gtk_notebook_get_tab_label(PGtkNoteBook(NotebookWidget), TabWidget:=gtk_notebook_get_tab_label(PGtkNoteBook(NotebookWidget),
PageWidget); PageWidget);
if TabWidget<>nil then begin if TabWidget<>nil then begin
TabImageWidget:=gtk_object_get_data(PGtkObject(TabWidget), 'TabImage'); TabImageWidget:=g_object_get_data(PGObject(TabWidget), 'TabImage');
TabLabelWidget:=gtk_object_get_data(PGtkObject(TabWidget), 'TabLabel'); TabLabelWidget:=g_object_get_data(PGObject(TabWidget), 'TabLabel');
TabCloseBtnWidget:=gtk_object_get_data(PGtkObject(TabWidget),'TabCloseBtn'); TabCloseBtnWidget:=g_object_get_data(PGObject(TabWidget),'TabCloseBtn');
end else begin end else begin
TabImageWidget:=nil; TabImageWidget:=nil;
TabLabelWidget:=nil; TabLabelWidget:=nil;
@ -4345,8 +4345,8 @@ begin
MenuWidget:=gtk_notebook_get_menu_label(PGtkNoteBook(NotebookWidget), MenuWidget:=gtk_notebook_get_menu_label(PGtkNoteBook(NotebookWidget),
PageWidget); PageWidget);
if MenuWidget<>nil then begin if MenuWidget<>nil then begin
MenuImageWidget:=gtk_object_get_data(PGtkObject(MenuWidget), 'TabImage'); MenuImageWidget:=g_object_get_data(PGObject(MenuWidget), 'TabImage');
MenuLabelWidget:=gtk_object_get_data(PGtkObject(MenuWidget), 'TabMenuLabel'); MenuLabelWidget:=g_object_get_data(PGObject(MenuWidget), 'TabMenuLabel');
end else begin end else begin
MenuImageWidget:=nil; MenuImageWidget:=nil;
MenuLabelWidget:=nil; MenuLabelWidget:=nil;
@ -4370,7 +4370,7 @@ begin
TabWidget:=gtk_notebook_get_tab_label(PGtkNoteBook(NotebookWidget), TabWidget:=gtk_notebook_get_tab_label(PGtkNoteBook(NotebookWidget),
PageWidget); PageWidget);
if TabWidget<>nil then if TabWidget<>nil then
TabLabelWidget:=gtk_object_get_data(PGtkObject(TabWidget), 'TabLabel') TabLabelWidget:=g_object_get_data(PGObject(TabWidget), 'TabLabel')
else else
TabLabelWidget:=nil; TabLabelWidget:=nil;
@ -4556,7 +4556,7 @@ end;
function SubtractScoll(AWidget: PGtkWidget; APosition: TPoint): TPoint; function SubtractScoll(AWidget: PGtkWidget; APosition: TPoint): TPoint;
begin begin
Result := APosition; Result := APosition;
AWidget := gtk_object_get_data(PGTKObject(AWidget), odnScrollArea); AWidget := g_object_get_data(PGObject(AWidget), odnScrollArea);
if GTK_IS_SCROLLED_WINDOW(AWidget) then if GTK_IS_SCROLLED_WINDOW(AWidget) then
begin begin
with gtk_scrolled_window_get_hadjustment(PGtkScrolledWindow(AWidget))^ do with gtk_scrolled_window_get_hadjustment(PGtkScrolledWindow(AWidget))^ do
@ -4781,13 +4781,13 @@ end;
function GetDesignSignalMask(Widget: PGtkWidget): TDesignSignalMask; function GetDesignSignalMask(Widget: PGtkWidget): TDesignSignalMask;
begin begin
Result:=TDesignSignalMask({%H-}PtrUInt(gtk_object_get_data(PGtkObject(Widget), Result:=TDesignSignalMask({%H-}PtrUInt(g_object_get_data(PGObject(Widget),
'LCLDesignMask'))); 'LCLDesignMask')));
end; end;
procedure SetDesignSignalMask(Widget: PGtkWidget; NewMask: TDesignSignalMask); procedure SetDesignSignalMask(Widget: PGtkWidget; NewMask: TDesignSignalMask);
begin begin
gtk_object_set_data(PGtkObject(Widget),'LCLDesignMask',{%H-}Pointer(PtrInt(NewMask))); g_object_set_data(PGObject(Widget),'LCLDesignMask',{%H-}Pointer(PtrInt(NewMask)));
end; end;
function GetDesignOnlySignalFlag(Widget: PGtkWidget; function GetDesignOnlySignalFlag(Widget: PGtkWidget;
@ -5016,7 +5016,7 @@ end;
function GetAccelGroup(const Widget: PGtkWidget; function GetAccelGroup(const Widget: PGtkWidget;
CreateIfNotExists: boolean): PGTKAccelGroup; CreateIfNotExists: boolean): PGTKAccelGroup;
begin begin
Result := PGTKAccelGroup(gtk_object_get_data(PGtkObject(Widget),'AccelGroup')); Result := PGTKAccelGroup(g_object_get_data(PGObject(Widget),'AccelGroup'));
if (Result=nil) and CreateIfNotExists then begin if (Result=nil) and CreateIfNotExists then begin
{$IFDEF VerboseAccelerator} {$IFDEF VerboseAccelerator}
DebugLn('GetAccelGroup CREATING Widget=',DbgS(Widget),' CreateIfNotExists=',dbgs(CreateIfNotExists)); DebugLn('GetAccelGroup CREATING Widget=',DbgS(Widget),' CreateIfNotExists=',dbgs(CreateIfNotExists));
@ -5032,7 +5032,7 @@ procedure SetAccelGroup(const Widget: PGtkWidget;
const AnAccelGroup: PGTKAccelGroup); const AnAccelGroup: PGTKAccelGroup);
begin begin
if (Widget = nil) then exit; if (Widget = nil) then exit;
gtk_object_set_data(PGtkObject(Widget), 'AccelGroup', AnAccelGroup); g_object_set_data(PGObject(Widget), 'AccelGroup', AnAccelGroup);
if AnAccelGroup<>nil then begin if AnAccelGroup<>nil then begin
// attach group to widget // attach group to widget
{$IFDEF VerboseAccelerator} {$IFDEF VerboseAccelerator}
@ -5207,7 +5207,7 @@ end;
function GetAccelKey(Widget: PGtkWidget): PAcceleratorKey; function GetAccelKey(Widget: PGtkWidget): PAcceleratorKey;
begin begin
Result := PAcceleratorKey(gtk_object_get_data(PGtkObject(Widget),'AccelKey')); Result := PAcceleratorKey(g_object_get_data(PGObject(Widget),'AccelKey'));
end; end;
function SetAccelKey(const Widget: PGtkWidget; function SetAccelKey(const Widget: PGtkWidget;
@ -5237,7 +5237,7 @@ begin
' Key=',dbgs(Key),' Mods=',DbgS(Mods), ' Key=',dbgs(Key),' Mods=',DbgS(Mods),
' Signal="',Signal,'" Result=',DbgS(Result)); ' Signal="',Signal,'" Result=',DbgS(Result));
{$ENDIF} {$ENDIF}
gtk_object_set_data(PGtkObject(Widget), 'AccelKey', Result); g_object_set_data(PGObject(Widget), 'AccelKey', Result);
end; end;
procedure ClearAccelKey(Widget: PGtkWidget); procedure ClearAccelKey(Widget: PGtkWidget);
@ -5752,7 +5752,7 @@ var
begin begin
if (MenuItemWidget = nil) or (LCLMenuItem = nil) then if (MenuItemWidget = nil) or (LCLMenuItem = nil) then
Exit; Exit;
LabelWidget := gtk_object_get_data(PGtkObject(MenuItemWidget), 'LCLLabel'); LabelWidget := g_object_get_data(PGObject(MenuItemWidget), 'LCLLabel');
Gtk2Widgetset.SetLabelCaption(LabelWidget, LCLMenuItem.Caption); Gtk2Widgetset.SetLabelCaption(LabelWidget, LCLMenuItem.Caption);
gtk_widget_set_direction(PGtkWidget(LabelWidget), WidgetDirection[UseRTL]); gtk_widget_set_direction(PGtkWidget(LabelWidget), WidgetDirection[UseRTL]);
end; end;
@ -5773,7 +5773,7 @@ var
not ( (LCLMenuItem.Parent <> nil) and LCLMenuItem.Parent.HandleAllocated and not ( (LCLMenuItem.Parent <> nil) and LCLMenuItem.Parent.HandleAllocated and
GtkWidgetIsA({%H-}PGtkWidget(LCLMenuItem.Parent.Handle), GTK_TYPE_MENU_BAR) ); GtkWidgetIsA({%H-}PGtkWidget(LCLMenuItem.Parent.Handle), GTK_TYPE_MENU_BAR) );
LabelWidget := PGtkLabel(gtk_object_get_data(PGtkObject(MenuItemWidget),'LCLShortCutLabel')); LabelWidget := PGtkLabel(g_object_get_data(PGObject(MenuItemWidget),'LCLShortCutLabel'));
if NeedShortCut then if NeedShortCut then
begin begin
s := GetAcceleratorString(Key, Shift); s := GetAcceleratorString(Key, Shift);
@ -5784,7 +5784,7 @@ var
begin begin
// create a label for the ShortCut // create a label for the ShortCut
LabelWidget := PGtkLabel(gtk_label_new(PChar(Pointer(s)))); LabelWidget := PGtkLabel(gtk_label_new(PChar(Pointer(s))));
gtk_object_set_data(PGtkObject(MenuItemWidget), 'LCLShortCutLabel', LabelWidget); g_object_set_data(PGObject(MenuItemWidget), 'LCLShortCutLabel', LabelWidget);
gtk_container_add(GTK_CONTAINER(HBoxWidget), PGtkWidget(LabelWidget)); gtk_container_add(GTK_CONTAINER(HBoxWidget), PGtkWidget(LabelWidget));
gtk_widget_show(PGtkWidget(LabelWidget)); gtk_widget_show(PGtkWidget(LabelWidget));
end end
@ -5822,7 +5822,7 @@ var
end end
else else
MinHeightWidget := nil; MinHeightWidget := nil;
gtk_object_set_data(PGtkObject(MenuItemWidget), g_object_set_data(PGObject(MenuItemWidget),
'LCLMinHeight', MinHeightWidget); 'LCLMinHeight', MinHeightWidget);
end; end;
@ -5833,7 +5833,7 @@ var
// create a label for the Caption // create a label for the Caption
LabelWidget := PGtkLabel(gtk_label_new('')); LabelWidget := PGtkLabel(gtk_label_new(''));
gtk_misc_set_alignment(GTK_MISC (LabelWidget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC (LabelWidget), 0.0, 0.5);
gtk_object_set_data(PGtkObject(MenuItemWidget), 'LCLLabel', LabelWidget); g_object_set_data(PGObject(MenuItemWidget), 'LCLLabel', LabelWidget);
gtk_container_add(GTK_CONTAINER(HBoxWidget), PGtkWidget(LabelWidget)); gtk_container_add(GTK_CONTAINER(HBoxWidget), PGtkWidget(LabelWidget));
SetMenuItemLabelText(LCLMenuItem, MenuItemWidget); SetMenuItemLabelText(LCLMenuItem, MenuItemWidget);
//gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(LabelWidget), MenuItemWidget); //gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(LabelWidget), MenuItemWidget);
@ -5841,7 +5841,7 @@ var
end; end;
begin begin
HBoxWidget := gtk_object_get_data(PGtkObject(MenuItemWidget), 'LCLHBox'); HBoxWidget := g_object_get_data(PGObject(MenuItemWidget), 'LCLHBox');
if HBoxWidget = nil then if HBoxWidget = nil then
begin begin
// create inner widgets // create inner widgets
@ -5852,7 +5852,7 @@ begin
end; end;
HBoxWidget := gtk_hbox_new(false, 20); HBoxWidget := gtk_hbox_new(false, 20);
gtk_widget_set_direction(PGtkWidget(HBoxWidget), WidgetDirection[UseRTL]); gtk_widget_set_direction(PGtkWidget(HBoxWidget), WidgetDirection[UseRTL]);
gtk_object_set_data(PGtkObject(MenuItemWidget), 'LCLHBox', HBoxWidget); g_object_set_data(PGObject(MenuItemWidget), 'LCLHBox', HBoxWidget);
CreateIcon; CreateIcon;
CreateLabel; CreateLabel;
UpdateShortCutLabel; UpdateShortCutLabel;
@ -5865,7 +5865,7 @@ begin
begin begin
// a separator is an empty gtkmenuitem -> delete the inner widgets // a separator is an empty gtkmenuitem -> delete the inner widgets
DestroyWidget(HBoxWidget); DestroyWidget(HBoxWidget);
gtk_object_set_data(PGtkObject(MenuItemWidget), 'LCLHBox', nil); g_object_set_data(PGObject(MenuItemWidget), 'LCLHBox', nil);
end else end else
begin begin
// just update the content // just update the content
@ -5921,7 +5921,7 @@ begin
begin begin
CurStatusPanelWidget := PGtkBoxChild( CurStatusPanelWidget := PGtkBoxChild(
g_list_nth_data(PGtkBox(HBox)^.children, CurPanelCount - 1))^.Widget; g_list_nth_data(PGtkBox(HBox)^.children, CurPanelCount - 1))^.Widget;
gtk_object_remove_data(PGtkObject(CurStatusPanelWidget),'lcl_statusbar_id'); g_object_set_data(PGObject(CurStatusPanelWidget),'lcl_statusbar_id', nil);
DestroyConnectedWidgetCB(CurStatusPanelWidget, True); DestroyConnectedWidgetCB(CurStatusPanelWidget, True);
dec(CurPanelCount); dec(CurPanelCount);
end; end;
@ -5967,7 +5967,7 @@ begin
if TStatusBar(Data).SimplePanel then if TStatusBar(Data).SimplePanel then
exit; exit;
ItemId := PtrInt(gtk_object_get_data(PGtkObject(Widget), 'lcl_statusbar_id')^); ItemId := PtrInt(g_object_get_data(PGObject(Widget), 'lcl_statusbar_id')^);
if not ((ItemId >= 0) and (ItemId < TStatusBar(Data).Panels.Count)) then if not ((ItemId >= 0) and (ItemId < TStatusBar(Data).Panels.Count)) then
exit; exit;
@ -6092,7 +6092,7 @@ begin
gtk_widget_set_usize(StatusPanelWidget, CurPanel.Width, gtk_widget_set_usize(StatusPanelWidget, CurPanel.Width,
StatusPanelWidget^.allocation.height); StatusPanelWidget^.allocation.height);
gtk_object_set_data(PGtkObject(StatusPanelWidget),'lcl_statusbar_id', g_object_set_data(PGObject(StatusPanelWidget),'lcl_statusbar_id',
@AStatusBar.Panels[Index].ID); @AStatusBar.Panels[Index].ID);
g_signal_connect_after(StatusPanelWidget, 'expose-event', g_signal_connect_after(StatusPanelWidget, 'expose-event',
TGtkSignalFunc(@gtk2PaintStatusBarWidget), AStatusBar); TGtkSignalFunc(@gtk2PaintStatusBarWidget), AStatusBar);
@ -7346,7 +7346,7 @@ begin
//debugln('CreateFormContents Style=',GetStyleDebugReport(WindowStyle)); //debugln('CreateFormContents Style=',GetStyleDebugReport(WindowStyle));
gtk_container_add(PGtkContainer(ScrolledWidget), ClientAreaWidget); gtk_container_add(PGtkContainer(ScrolledWidget), ClientAreaWidget);
gtk_object_set_data(FormWidget, odnScrollArea, ScrolledWidget); g_object_set_data(FormWidget, odnScrollArea, ScrolledWidget);
gtk_widget_show(ClientAreaWidget); gtk_widget_show(ClientAreaWidget);
SetFixedWidget(FormWidget, ClientAreaWidget); SetFixedWidget(FormWidget, ClientAreaWidget);
@ -7363,12 +7363,12 @@ begin
Adjustment := gtk_scrolled_window_get_vadjustment(PGTKScrolledWindow(ScrolledWidget)); Adjustment := gtk_scrolled_window_get_vadjustment(PGTKScrolledWindow(ScrolledWidget));
if Adjustment <> nil then if Adjustment <> nil then
gtk_object_set_data(PGTKObject(Adjustment), odnScrollBar, g_object_set_data(PGObject(Adjustment), odnScrollBar,
PGTKScrolledWindow(ScrolledWidget)^.vscrollbar); PGTKScrolledWindow(ScrolledWidget)^.vscrollbar);
Adjustment := gtk_scrolled_window_get_hadjustment(PGTKScrolledWindow(ScrolledWidget)); Adjustment := gtk_scrolled_window_get_hadjustment(PGTKScrolledWindow(ScrolledWidget));
if Adjustment <> nil then if Adjustment <> nil then
gtk_object_set_data(PGTKObject(Adjustment), odnScrollBar, g_object_set_data(PGObject(Adjustment), odnScrollBar,
PGTKScrolledWindow(ScrolledWidget)^.hscrollbar); PGTKScrolledWindow(ScrolledWidget)^.hscrollbar);
if (AWidgetInfo <> nil) and if (AWidgetInfo <> nil) and
@ -7648,11 +7648,11 @@ begin
VBox:=gtk_vbox_new(false,0);// vbox is needed for menu above and fixed widget below VBox:=gtk_vbox_new(false,0);// vbox is needed for menu above and fixed widget below
gtk_widget_show(VBox); gtk_widget_show(VBox);
gtk_container_add(PGtkContainer(StyleObject^.Widget), VBox); gtk_container_add(PGtkContainer(StyleObject^.Widget), VBox);
gtk_object_set_data(PGtkObject(StyleObject^.Widget),'vbox',VBox); g_object_set_data(PGObject(StyleObject^.Widget),'vbox',VBox);
WindowFixedWidget:=CreateFixedClientWidget; WindowFixedWidget:=CreateFixedClientWidget;
gtk_widget_show(WindowFixedWidget); gtk_widget_show(WindowFixedWidget);
gtk_container_add(PGtkContainer(VBox), WindowFixedWidget); gtk_container_add(PGtkContainer(VBox), WindowFixedWidget);
gtk_object_set_data(PGtkObject(StyleObject^.Widget),'fixedwidget',WindowFixedWidget); g_object_set_data(PGObject(StyleObject^.Widget),'fixedwidget',WindowFixedWidget);
gtk_widget_realize(StyleObject^.Widget); gtk_widget_realize(StyleObject^.Widget);
end end
else else
@ -7762,7 +7762,7 @@ begin
WindowFixedWidget:=CreateFixedClientWidget{$IFNDEF GtkFixedWithWindow}(false){$ENDIF}; WindowFixedWidget:=CreateFixedClientWidget{$IFNDEF GtkFixedWithWindow}(false){$ENDIF};
gtk_widget_show(WindowFixedWidget); gtk_widget_show(WindowFixedWidget);
gtk_container_add(PGtkContainer(StyleObject^.Widget), WindowFixedWidget); gtk_container_add(PGtkContainer(StyleObject^.Widget), WindowFixedWidget);
gtk_object_set_data(PGtkObject(StyleObject^.Widget),'fixedwidget',WindowFixedWidget); g_object_set_data(PGObject(StyleObject^.Widget),'fixedwidget',WindowFixedWidget);
end end
else else
@ -7842,7 +7842,7 @@ begin
StyleWindowWidget:=GetStyleWidget(lgsWindow); StyleWindowWidget:=GetStyleWidget(lgsWindow);
// add menu above the forms client area (fixed widget) // add menu above the forms client area (fixed widget)
VBox:=PGTKWidget( VBox:=PGTKWidget(
gtk_object_get_data(PGtkObject(StyleWindowWidget),'vbox')); g_object_get_data(PGObject(StyleWindowWidget),'vbox'));
gtk_box_pack_start(PGTKBox(VBox), StyleObject^.Widget, False, False, 0); gtk_box_pack_start(PGTKBox(VBox), StyleObject^.Widget, False, False, 0);
end end
else else
@ -7861,7 +7861,7 @@ begin
StyleWindowWidget:=GetStyleWidget(lgsWindow); StyleWindowWidget:=GetStyleWidget(lgsWindow);
// add widget on client area of form // add widget on client area of form
WindowFixedWidget:=PGTKWidget( WindowFixedWidget:=PGTKWidget(
gtk_object_get_data(PGtkObject(StyleWindowWidget),'fixedwidget')); g_object_get_data(PGObject(StyleWindowWidget),'fixedwidget'));
//DebugLn('GetStyleWithName adding on hidden stylewindow ',WName,' ',GetWidgetDebugReport(StyleObject^.Widget)); //DebugLn('GetStyleWithName adding on hidden stylewindow ',WName,' ',GetWidgetDebugReport(StyleObject^.Widget));
if WindowFixedWidget <> nil then if WindowFixedWidget <> nil then
gtk_fixed_put(PGtkFixed(WindowFixedWidget),StyleObject^.Widget,10,10); gtk_fixed_put(PGtkFixed(WindowFixedWidget),StyleObject^.Widget,10,10);
@ -8517,7 +8517,7 @@ begin
allocation.height:=s; allocation.height:=s;
gtk_widget_size_allocate(StyleObject^.Widget,@allocation); gtk_widget_size_allocate(StyleObject^.Widget,@allocation);
InnerWidget:=PGTKWidget( InnerWidget:=PGTKWidget(
gtk_object_get_data(PGtkObject(StyleObject^.Widget),'fixedwidget')); g_object_get_data(PGObject(StyleObject^.Widget),'fixedwidget'));
allocation:=InnerWidget^.allocation; allocation:=InnerWidget^.allocation;
//DebugLn(['GetStyleFormFrameBorders BBB2 ',dbgs(allocation),' WithMenu=',WithMenu,' ClientWidget=',GetWidgetDebugReport(InnerWidget)]); //DebugLn(['GetStyleFormFrameBorders BBB2 ',dbgs(allocation),' WithMenu=',WithMenu,' ClientWidget=',GetWidgetDebugReport(InnerWidget)]);
f.Left:=Min(s,Max(0,allocation.x)); f.Left:=Min(s,Max(0,allocation.x));
@ -8531,10 +8531,10 @@ begin
if WithMenu then begin if WithMenu then begin
InnerWidget:=PGTKWidget( InnerWidget:=PGTKWidget(
gtk_object_get_data(PGtkObject(StyleObject^.Widget),'vbox')); g_object_get_data(PGObject(StyleObject^.Widget),'vbox'));
end else begin end else begin
InnerWidget:=PGTKWidget( InnerWidget:=PGTKWidget(
gtk_object_get_data(PGtkObject(StyleObject^.Widget),'fixedwidget')); g_object_get_data(PGObject(StyleObject^.Widget),'fixedwidget'));
end; end;
Outer:=StyleObject^.Widget^.allocation; Outer:=StyleObject^.Widget^.allocation;
Inner:=InnerWidget^.allocation; Inner:=InnerWidget^.allocation;

74
lcl/interfaces/gtk2/gtk2winapi.inc
View File

@ -216,9 +216,7 @@ var
begin begin
Result := -1; Result := -1;
if Handle = 0 then Exit; if Handle = 0 then Exit;
Result := -1; P := g_object_get_data({%H-}PGObject(Handle),'WNDPROC');
P := nil;
P := gtk_object_get_data({%H-}pgtkobject(Handle),'WNDPROC');
if P <> nil then if P <> nil then
Proc := TWndMethod(P^) Proc := TWndMethod(P^)
else else
@ -1116,7 +1114,7 @@ begin
Result := GTKObject <> nil; Result := GTKObject <> nil;
if Result then begin if Result then begin
if gtk_type_is_a(gtk_object_type(GTKObject), GTKAPIWidget_GetType) if gtk_type_is_a(g_object_type(GTKObject), GTKAPIWidget_GetType)
then begin then begin
if IsValidGDIObjectType(Bitmap, gdiBitmap) then if IsValidGDIObjectType(Bitmap, gdiBitmap) then
BMP := {%H-}PGdiObject(Bitmap)^.GDIBitmapObject BMP := {%H-}PGdiObject(Bitmap)^.GDIBitmapObject
@ -1989,7 +1987,7 @@ begin
Result := true; Result := true;
if GTKObject<>nil then begin if GTKObject<>nil then begin
if gtk_type_is_a(gtk_object_type(GTKObject), GTKAPIWidget_GetType) if gtk_type_is_a(g_object_type(GTKObject), GTKAPIWidget_GetType)
then begin then begin
GTKAPIWidget_DestroyCaret(PGTKAPIWidget(GTKObject)); GTKAPIWidget_DestroyCaret(PGTKAPIWidget(GTKObject));
end end
@ -4257,7 +4255,7 @@ function TGtk2WidgetSet.GetCaretRespondToFocus(handle: HWND;
var ShowHideOnFocus: boolean): Boolean; var ShowHideOnFocus: boolean): Boolean;
begin begin
if handle<>0 then begin if handle<>0 then begin
if gtk_type_is_a(gtk_object_type({%H-}PGTKObject(handle)), GTKAPIWidget_GetType) if gtk_type_is_a({%H-}g_object_type(PGTKObject(handle)), GTKAPIWidget_GetType)
then begin then begin
GTKAPIWidget_GetCaretRespondToFocus({%H-}PGTKAPIWidget(handle), GTKAPIWidget_GetCaretRespondToFocus({%H-}PGTKAPIWidget(handle),
ShowHideOnFocus); ShowHideOnFocus);
@ -5321,7 +5319,7 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TGtk2WidgetSet.GetProp(Handle : hwnd; Str : PChar): Pointer; function TGtk2WidgetSet.GetProp(Handle : hwnd; Str : PChar): Pointer;
Begin Begin
Result := gtk_object_get_data({%H-}pgtkobject(Handle),Str); Result := g_object_get_data({%H-}PGObject(Handle),Str);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -5338,8 +5336,7 @@ begin
if GtkWidgetIsA(Widget,GTK_TYPE_SCROLLED_WINDOW) then begin if GtkWidgetIsA(Widget,GTK_TYPE_SCROLLED_WINDOW) then begin
ScrollWidget:=Widget; ScrollWidget:=Widget;
end else begin end else begin
ScrollWidget:=PGtkWidget(gtk_object_get_data( ScrollWidget:=PGtkWidget(g_object_get_data(PGObject(Widget),odnScrollArea));
PGtkObject(Widget),odnScrollArea));
end; end;
if ScrollWidget=nil then exit; if ScrollWidget=nil then exit;
if BarKind=SM_CYVSCROLL then begin if BarKind=SM_CYVSCROLL then begin
@ -5367,8 +5364,7 @@ begin
if GtkWidgetIsA(Widget,GTK_TYPE_SCROLLED_WINDOW) then begin if GtkWidgetIsA(Widget,GTK_TYPE_SCROLLED_WINDOW) then begin
ScrollWidget:=Widget; ScrollWidget:=Widget;
end else begin end else begin
ScrollWidget:=PGtkWidget(gtk_object_get_data( ScrollWidget:=PGtkWidget(g_object_get_data(PGObject(Widget),odnScrollArea));
PGtkObject(Widget),odnScrollArea));
end; end;
if ScrollWidget=nil then exit; if ScrollWidget=nil then exit;
if SBStyle=SB_VERT then begin if SBStyle=SB_VERT then begin
@ -5397,7 +5393,7 @@ begin
if (Handle = 0) then exit; if (Handle = 0) then exit;
Scroll := gtk_object_get_data({%H-}PGTKObject(Handle), odnScrollArea); Scroll := g_object_get_data({%H-}PGObject(Handle), odnScrollArea);
if GtkWidgetIsA(Scroll, gtk_scrolled_window_get_type) if GtkWidgetIsA(Scroll, gtk_scrolled_window_get_type)
then begin then begin
IsScrollWindow := True; IsScrollWindow := True;
@ -6070,7 +6066,7 @@ function TGtk2WidgetSet.GetWindowLong(Handle: HWND; int: Integer): PtrInt;
function GetObjectData(Name: PChar): PtrInt; function GetObjectData(Name: PChar): PtrInt;
begin begin
Result := PtrInt({%H-}PtrUInt(gtk_object_get_data(pgtkobject(Handle),Name))); Result := PtrInt(PtrUInt({%H-}g_object_get_data(PGObject(Handle),Name)));
end; end;
var var
WidgetInfo: PWidgetInfo; WidgetInfo: PWidgetInfo;
@ -6447,7 +6443,7 @@ begin
if Result if Result
then begin then begin
if gtk_type_is_a(gtk_object_type(GTKObject), GTKAPIWidget_GetType) if gtk_type_is_a(g_object_type(GTKObject), GTKAPIWidget_GetType)
then begin then begin
WasVisible:=false; WasVisible:=false;
GTKAPIWidget_HideCaret(PGTKAPIWidget(GTKObject),WasVisible); GTKAPIWidget_HideCaret(PGTKAPIWidget(GTKObject),WasVisible);
@ -6740,9 +6736,9 @@ end;
function MessageButtonClicked(Widget : PGtkWidget; data: gPointer) : GBoolean; cdecl; function MessageButtonClicked(Widget : PGtkWidget; data: gPointer) : GBoolean; cdecl;
begin begin
//DebugLn('[MessageButtonClicked] ',dbgs(data),' ',dbgs(gtk_object_get_data(PGtkObject(Widget), 'modal_result'))); //DebugLn('[MessageButtonClicked] ',dbgs(data),' ',dbgs(g_object_get_data(PGtkObject(Widget), 'modal_result')));
if PInteger(data)^ = 0 then if PInteger(data)^ = 0 then
PInteger(data)^:={%H-}PtrUInt(gtk_object_get_data(PGtkObject(Widget), 'modal_result')); PInteger(data)^:={%H-}PtrUInt(g_object_get_data(PGObject(Widget), 'modal_result'));
Result:=false; Result:=false;
end; end;
@ -6752,7 +6748,7 @@ var ModalResult : PtrUInt;
begin begin
{ We were requested by window manager to close } { We were requested by window manager to close }
if PInteger(data)^ = 0 then begin if PInteger(data)^ = 0 then begin
ModalResult:= {%H-}PtrUInt(gtk_object_get_data(PGtkObject(Widget), 'modal_result')); ModalResult:= {%H-}PtrUInt(g_object_get_data(PGObject(Widget), 'modal_result'));
{ Don't allow to close if we don't have a default return value } { Don't allow to close if we don't have a default return value }
Result:= (ModalResult = 0); Result:= (ModalResult = 0);
if not Result then PInteger(data)^:= ModalResult if not Result then PInteger(data)^:= ModalResult
@ -6776,9 +6772,9 @@ var Dialog, ALabel : PGtkWidget;
end; end;
{ If there is the Cancel button, allow the dialog to close } { If there is the Cancel button, allow the dialog to close }
if RetValue = IDCANCEL then begin if RetValue = IDCANCEL then begin
gtk_object_set_data(PGtkObject(Dialog), 'modal_result', Pointer(IDCANCEL)); g_object_set_data(PGObject(Dialog), 'modal_result', Pointer(IDCANCEL));
end; end;
gtk_object_set_data(PGtkObject(AButton), 'modal_result', g_object_set_data(PGObject(AButton), 'modal_result',
{%H-}Pointer(PtrInt(RetValue))); {%H-}Pointer(PtrInt(RetValue)));
g_signal_connect(PGtkObject(AButton), 'clicked', g_signal_connect(PGtkObject(AButton), 'clicked',
TGtkSignalFunc(@MessageButtonClicked), @ADialogResult); TGtkSignalFunc(@MessageButtonClicked), @ADialogResult);
@ -7413,7 +7409,7 @@ const
begin begin
if (Item^.Data <> {%H-}Pointer(hndMenu)) // exclude ourself if (Item^.Data <> {%H-}Pointer(hndMenu)) // exclude ourself
and gtk_is_radio_menu_item(Item^.Data) and gtk_is_radio_menu_item(Item^.Data)
and (GroupIndex = Integer({%H-}PtrUInt(gtk_object_get_data(Item^.Data, GROUPIDX_DATANAME)))) and (GroupIndex = Integer({%H-}PtrUInt(g_object_get_data(Item^.Data, GROUPIDX_DATANAME))))
then begin then begin
Result := gtk_radio_menu_item_get_group (PGtkRadioMenuItem(Item^.Data)); Result := gtk_radio_menu_item_get_group (PGtkRadioMenuItem(Item^.Data));
Exit; Exit;
@ -7434,7 +7430,7 @@ begin
Exit; Exit;
end; end;
CurrentGroupIndex := integer({%H-}PtrUInt(gtk_object_get_data(Pointer(hndMenu), GROUPIDX_DATANAME))); CurrentGroupIndex := integer({%H-}PtrUInt(g_object_get_data(Pointer(hndMenu), GROUPIDX_DATANAME)));
// Update needed ? // Update needed ?
if GroupIndex = CurrentGroupIndex if GroupIndex = CurrentGroupIndex
@ -7445,7 +7441,7 @@ begin
// Remove current group // Remove current group
gtk_radio_menu_item_set_group({%H-}PGtkRadioMenuItem(hndMenu), nil); gtk_radio_menu_item_set_group({%H-}PGtkRadioMenuItem(hndMenu), nil);
gtk_object_set_data({%H-}Pointer(hndMenu), GROUPIDX_DATANAME, nil); g_object_set_data({%H-}Pointer(hndMenu), GROUPIDX_DATANAME, nil);
// Check remove only // Check remove only
if GroupIndex = 0 if GroupIndex = 0
@ -7458,7 +7454,7 @@ begin
RadioGroup := GetGroup; RadioGroup := GetGroup;
// Set new group // Set new group
gtk_object_set_data({%H-}Pointer(hndMenu), GROUPIDX_DATANAME, {%H-}Pointer(PtrInt(GroupIndex))); g_object_set_data({%H-}Pointer(hndMenu), GROUPIDX_DATANAME, Pointer(PtrInt(GroupIndex)));
if RadioGroup = nil if RadioGroup = nil
then begin then begin
// We're the only member, get a group // We're the only member, get a group
@ -7569,7 +7565,7 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TGtk2WidgetSet.RemoveProp(Handle: hwnd; Str: PChar): THandle; function TGtk2WidgetSet.RemoveProp(Handle: hwnd; Str: PChar): THandle;
begin begin
gtk_object_remove_data({%H-}pGTKObject(handle), Str); g_object_set_data({%H-}PGObject(handle), Str, nil);
Result := 1; Result := 1;
end; end;
@ -8398,7 +8394,7 @@ begin
Result := GtkObject <> nil; Result := GtkObject <> nil;
if Result then begin if Result then begin
if gtk_type_is_a(gtk_object_type(GtkObject), GTKAPIWidget_GetType) if gtk_type_is_a(g_object_type(GtkObject), GTKAPIWidget_GetType)
then begin then begin
GTKAPIWidget_SetCaretPos(PGTKAPIWidget(GtkObject), X, Y); GTKAPIWidget_SetCaretPos(PGTKAPIWidget(GtkObject), X, Y);
end end
@ -8420,7 +8416,7 @@ function TGtk2WidgetSet.SetCaretRespondToFocus(handle: HWND;
ShowHideOnFocus: boolean): Boolean; ShowHideOnFocus: boolean): Boolean;
begin begin
if handle<>0 then begin if handle<>0 then begin
if gtk_type_is_a(gtk_object_type({%H-}PGTKObject(handle)), GTKAPIWidget_GetType) if gtk_type_is_a(g_object_type({%H-}PGTKObject(handle)), GTKAPIWidget_GetType)
then begin then begin
GTKAPIWidget_SetCaretRespondToFocus({%H-}PGTKAPIWidget(handle), GTKAPIWidget_SetCaretRespondToFocus({%H-}PGTKAPIWidget(handle),
ShowHideOnFocus); ShowHideOnFocus);
@ -8754,7 +8750,7 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TGtk2WidgetSet.SetProp(Handle: hwnd; Str : PChar; Data : Pointer) : Boolean; function TGtk2WidgetSet.SetProp(Handle: hwnd; Str : PChar; Data : Pointer) : Boolean;
begin begin
gtk_object_set_data({%H-}pGTKObject(handle),Str,data); g_object_set_data({%H-}pGObject(handle),Str,data);
Result:=true; Result:=true;
end; end;
@ -8831,7 +8827,7 @@ begin
',nTrackPos=',ScrollInfo.nTrackPos, ',nTrackPos=',ScrollInfo.nTrackPos,
']']);} ']']);}
Scroll := gtk_object_get_data({%H-}PGTKObject(Handle), odnScrollArea); Scroll := g_object_get_data({%H-}PGObject(Handle), odnScrollArea);
if GtkWidgetIsA(Scroll, gtk_scrolled_window_get_type) if GtkWidgetIsA(Scroll, gtk_scrolled_window_get_type)
then begin then begin
IsScrollWindow := True; IsScrollWindow := True;
@ -8994,9 +8990,9 @@ begin
then begin then begin
case SBStyle of case SBStyle of
SB_HORZ: SB_HORZ:
gtk_object_set(PGTKObject(Scroll),'hscrollbar_policy',[POLICY[IsScrollbarVis],nil]); g_object_set(PGTKObject(Scroll),'hscrollbar_policy',[POLICY[IsScrollbarVis],nil]);
SB_VERT: SB_VERT:
gtk_object_set(PGTKObject(Scroll),'vscrollbar_policy',[POLICY[IsScrollbarVis],nil]); g_object_set(PGTKObject(Scroll),'vscrollbar_policy',[POLICY[IsScrollbarVis],nil]);
end; end;
end end
else else
@ -9176,11 +9172,11 @@ begin
end; end;
GWL_HINSTANCE : GWL_HINSTANCE :
begin begin
gtk_object_set_data({%H-}pgtkobject(Handle),'HINSTANCE',Data); g_object_set_data({%H-}pgobject(Handle),'HINSTANCE',Data);
end; end;
GWL_HWNDPARENT : GWL_HWNDPARENT :
begin begin
gtk_object_set_data({%H-}pgtkobject(Handle),'HWNDPARENT',Data); g_object_set_data({%H-}pgobject(Handle),'HWNDPARENT',Data);
end; end;
GWL_STYLE : GWL_STYLE :
begin begin
@ -9196,11 +9192,11 @@ begin
end; end;
GWL_USERDATA : GWL_USERDATA :
begin begin
gtk_object_set_data({%H-}pgtkobject(Handle),'Userdata',Data); g_object_set_data({%H-}pgobject(Handle),'Userdata',Data);
end; end;
GWL_ID : GWL_ID :
begin begin
gtk_object_set_data({%H-}pgtkobject(Handle),'ID',Data); g_object_set_data({%H-}pgobject(Handle),'ID',Data);
end; end;
end; //case end; //case
end; end;
@ -9442,7 +9438,7 @@ begin
if Result if Result
then begin then begin
if gtk_type_is_a(gtk_object_type(GTKObject), GTKAPIWidget_GetType) if gtk_type_is_a(g_object_type(GTKObject), GTKAPIWidget_GetType)
then begin then begin
GTKAPIWidget_ShowCaret(PGTKAPIWidget(GTKObject)); GTKAPIWidget_ShowCaret(PGTKAPIWidget(GTKObject));
end end
@ -9470,7 +9466,7 @@ begin
Result := (Handle <> 0); Result := (Handle <> 0);
if not Result then exit; if not Result then exit;
Scroll := PGtkWidget(gtk_object_get_data({%H-}PGTKObject(Handle), odnScrollArea)); Scroll := PGtkWidget(g_object_get_data({%H-}PGObject(Handle), odnScrollArea));
if GtkWidgetIsA(Scroll, gtk_scrolled_window_get_type) if GtkWidgetIsA(Scroll, gtk_scrolled_window_get_type)
then begin then begin
IsScrollWindow := True; IsScrollWindow := True;
@ -9488,19 +9484,19 @@ begin
NewPolicy:=GTK_POLICY_ALWAYS NewPolicy:=GTK_POLICY_ALWAYS
else else
NewPolicy:=GTK_POLICY_NEVER; NewPolicy:=GTK_POLICY_NEVER;
gtk_object_set(PGTKObject(Scroll), 'hscrollbar_policy', [NewPolicy,nil]); g_object_set(PGTKObject(Scroll), 'hscrollbar_policy', [NewPolicy,nil]);
end; end;
if wBar in [SB_BOTH, SB_VERT] then begin if wBar in [SB_BOTH, SB_VERT] then begin
if bShow then if bShow then
NewPolicy:=GTK_POLICY_ALWAYS NewPolicy:=GTK_POLICY_ALWAYS
else else
NewPolicy:=GTK_POLICY_NEVER; NewPolicy:=GTK_POLICY_NEVER;
gtk_object_set(PGTKObject(Scroll), 'vscrollbar_policy', [NewPolicy,nil]); g_object_set(PGTKObject(Scroll), 'vscrollbar_policy', [NewPolicy,nil]);
end; end;
end end
else begin else begin
if (wBar = SB_CTL) if (wBar = SB_CTL)
and gtk_type_is_a(gtk_object_type({%H-}PGTKObject(Handle)),gtk_widget_get_type) and gtk_type_is_a(g_object_type({%H-}PGTKObject(Handle)),gtk_widget_get_type)
then begin then begin
if bShow if bShow
then gtk_widget_show(Scroll) then gtk_widget_show(Scroll)

10
lcl/interfaces/gtk2/gtk2wscustomlistview.inc
View File

@ -189,7 +189,7 @@ begin
NM.uNewState := LVIS_SELECTED; NM.uNewState := LVIS_SELECTED;
NM.uChanged := LVIF_STATE; NM.uChanged := LVIF_STATE;
msg.NMHdr := @NM.hdr; msg.NMHdr := @NM.hdr;
if gtk_object_get_data({%H-}PGtkObject(TWinControl(Target).Handle),'lcl_gtkwidget_in_update') = nil then if g_object_get_data({%H-}PGObject(TWinControl(Target).Handle),'lcl_gtkwidget_in_update') = nil then
DeliverMessage(Target, msg); DeliverMessage(Target, msg);
end; end;
@ -1635,7 +1635,7 @@ begin
Dispose(OrigScrollingData); Dispose(OrigScrollingData);
WidgetInfo^.CoreWidget := PGtkWidget(MainView); WidgetInfo^.CoreWidget := PGtkWidget(MainView);
gtk_object_set_data(Pointer(MainView), 'widgetinfo', WidgetInfo); g_object_set_data(Pointer(MainView), 'widgetinfo', WidgetInfo);
//SetMainWidget(ScrollWidget, MainView); //SetMainWidget(ScrollWidget, MainView);
//GetWidgetInfo(ScrollWidget, True)^.CoreWidget := PGtkWidget(MainView); //GetWidgetInfo(ScrollWidget, True)^.CoreWidget := PGtkWidget(MainView);
gtk_widget_show_all(PGtkWidget(MainView)); gtk_widget_show_all(PGtkWidget(MainView));
@ -1679,16 +1679,14 @@ class procedure TGtk2WSCustomListView.BeginUpdate(const ALV: TCustomListView);
begin begin
if not WSCheckHandleAllocated(ALV, 'BeginUpdate') then if not WSCheckHandleAllocated(ALV, 'BeginUpdate') then
exit; exit;
if gtk_object_get_data({%H-}PGtkObject(ALV.Handle),'lcl_gtkwidget_in_update') = nil then g_object_set_data({%H-}PGObject(ALV.Handle),'lcl_gtkwidget_in_update', ALV);
gtk_object_set_data({%H-}PGtkObject(ALV.Handle),'lcl_gtkwidget_in_update', ALV);
end; end;
class procedure TGtk2WSCustomListView.EndUpdate(const ALV: TCustomListView); class procedure TGtk2WSCustomListView.EndUpdate(const ALV: TCustomListView);
begin begin
if not WSCheckHandleAllocated(ALV, 'EndUpdate') then if not WSCheckHandleAllocated(ALV, 'EndUpdate') then
exit; exit;
if gtk_object_get_data({%H-}PGtkObject(ALV.Handle),'lcl_gtkwidget_in_update') <> nil then g_object_set_data({%H-}PGObject(ALV.Handle),'lcl_gtkwidget_in_update', nil);
gtk_object_remove_data({%H-}PGtkObject(ALV.Handle),'lcl_gtkwidget_in_update');
end; end;
class function TGtk2WSCustomListView.GetBoundingRect(const ALV: TCustomListView): TRect; class function TGtk2WSCustomListView.GetBoundingRect(const ALV: TCustomListView): TRect;

26
lcl/interfaces/gtk2/gtk2wsdialogs.pp
View File

@ -143,7 +143,7 @@ begin
(ExtractFilePath(Filename) <> ExtractFilePath(OldFilename)) then (ExtractFilePath(Filename) <> ExtractFilePath(OldFilename)) then
OpenDialog.DoFolderChange; OpenDialog.DoFolderChange;
// show some information // show some information
FileDetailLabel := gtk_object_get_data({%H-}PGtkObject(OpenDialog.Handle), 'FileDetailLabel'); FileDetailLabel := g_object_get_data({%H-}PGObject(OpenDialog.Handle), 'FileDetailLabel');
if FileDetailLabel = nil then if FileDetailLabel = nil then
Exit; Exit;
if FileExistsUTF8(Filename) then if FileExistsUTF8(Filename) then
@ -319,10 +319,10 @@ begin
FileSelWidget:={%H-}PGtkFileSelection(theDialog.Handle); FileSelWidget:={%H-}PGtkFileSelection(theDialog.Handle);
if (bevent <> nil) and (gdk_event_get_type(bevent) = GDK_2BUTTON_PRESS) if (bevent <> nil) and (gdk_event_get_type(bevent) = GDK_2BUTTON_PRESS)
and (FileSelWidget^.dir_list = widget) then begin and (FileSelWidget^.dir_list = widget) then begin
MenuWidget := gtk_object_get_data(PGtkObject(FileSelWidget), MenuWidget := g_object_get_data(PGObject(FileSelWidget),
'LCLFilterMenu'); 'LCLFilterMenu');
if MenuWidget <> nil then begin if MenuWidget <> nil then begin
AFilterEntry := TFileSelFilterEntry(gtk_object_get_data(PGtkObject( AFilterEntry := TFileSelFilterEntry(g_object_get_data(PGObject(
gtk_menu_get_active(PGtkMenu(MenuWidget))), 'LCLIsFilterMenuItem')); gtk_menu_get_active(PGtkMenu(MenuWidget))), 'LCLIsFilterMenuItem'));
if (AFilterEntry<>nil) and (AFilterEntry.Mask<>nil) then if (AFilterEntry<>nil) and (AFilterEntry.Mask<>nil) then
PopulateFileAndDirectoryLists(FileSelWidget,AFilterEntry.Mask); PopulateFileAndDirectoryLists(FileSelWidget,AFilterEntry.Mask);
@ -750,7 +750,7 @@ var
AFilterEntry: TFileSelFilterEntry; AFilterEntry: TFileSelFilterEntry;
begin begin
if FilterWidget=nil then exit; if FilterWidget=nil then exit;
AFilterEntry:=TFileSelFilterEntry(gtk_object_get_data(PGtkObject(FilterWidget), AFilterEntry:=TFileSelFilterEntry(g_object_get_data(PGObject(FilterWidget),
'LCLIsFilterMenuItem')); 'LCLIsFilterMenuItem'));
if (AFilterEntry<>nil) and (AFilterEntry.Mask<>nil) then if (AFilterEntry<>nil) and (AFilterEntry.Mask<>nil) then
begin begin
@ -769,7 +769,7 @@ begin
theDialog:=TCommonDialog(GetNearestLCLObject(Widget)); theDialog:=TCommonDialog(GetNearestLCLObject(Widget));
if (theDialog is TOpenDialog) then begin if (theDialog is TOpenDialog) then begin
// check if history activated // check if history activated
AHistoryEntry:=gtk_object_get_data(PGtkObject(Widget), AHistoryEntry:=g_object_get_data(PGObject(Widget),
'LCLIsHistoryMenuItem'); 'LCLIsHistoryMenuItem');
if (AHistoryEntry<>nil) and (AHistoryEntry^.Filename<>nil) then begin if (AHistoryEntry<>nil) and (AHistoryEntry^.Filename<>nil) then begin
// user has choosen a history file // user has choosen a history file
@ -827,7 +827,7 @@ begin
end; end;
FreeListOfFileSelFilterEntry(ListOfFileSelFilterEntry); FreeListOfFileSelFilterEntry(ListOfFileSelFilterEntry);
//gtk_object_set_data(PGtkObject(SelWidget), 'LCLFilterList', ListOfFileSelFilterEntry); //g_object_set_data(PGObject(SelWidget), 'LCLFilterList', ListOfFileSelFilterEntry);
if GtkSelFilter <> nil then if GtkSelFilter <> nil then
gtk_file_chooser_set_filter(SelWidget, GtkSelFilter); gtk_file_chooser_set_filter(SelWidget, GtkSelFilter);
@ -862,7 +862,7 @@ begin
// create a HBox so that the history is left justified // create a HBox so that the history is left justified
HBox:=gtk_hbox_new(false,0); HBox:=gtk_hbox_new(false,0);
gtk_object_set_data(PGtkObject(SelWidget), 'LCLHistoryHBox', HBox); g_object_set_data(PGObject(SelWidget), 'LCLHistoryHBox', HBox);
gtk_file_chooser_set_extra_widget(PGtkDialog(SelWidget),HBox); gtk_file_chooser_set_extra_widget(PGtkDialog(SelWidget),HBox);
// create the label 'History:' // create the label 'History:'
@ -873,7 +873,7 @@ begin
// create the pull down // create the pull down
HistoryPullDownWidget:=gtk_option_menu_new; HistoryPullDownWidget:=gtk_option_menu_new;
gtk_object_set_data(PGtkObject(SelWidget), 'LCLHistoryPullDown', g_object_set_data(PGObject(SelWidget), 'LCLHistoryPullDown',
HistoryPullDownWidget); HistoryPullDownWidget);
gtk_box_pack_start(GTK_BOX(HBox),HistoryPullDownWidget,false,false,5); gtk_box_pack_start(GTK_BOX(HBox),HistoryPullDownWidget,false,false,5);
gtk_widget_show(HistoryPullDownWidget); gtk_widget_show(HistoryPullDownWidget);
@ -887,7 +887,7 @@ begin
MenuItemWidget:=gtk_menu_item_new_with_label( MenuItemWidget:=gtk_menu_item_new_with_label(
PFileSelHistoryEntry(HistoryList[i])^.Filename); PFileSelHistoryEntry(HistoryList[i])^.Filename);
// connect the new MenuItem to the HistoryList entry // connect the new MenuItem to the HistoryList entry
gtk_object_set_data(PGtkObject(MenuItemWidget), 'LCLIsHistoryMenuItem', g_object_set_data(PGObject(MenuItemWidget), 'LCLIsHistoryMenuItem',
HistoryList[i]); HistoryList[i]);
// add activation signal and add to menu // add activation signal and add to menu
g_signal_connect(GTK_OBJECT(MenuItemWidget), 'activate', g_signal_connect(GTK_OBJECT(MenuItemWidget), 'activate',
@ -903,8 +903,8 @@ begin
MenuWidget:=nil; MenuWidget:=nil;
HistoryList:=nil HistoryList:=nil
end; end;
gtk_object_set_data(PGtkObject(SelWidget), 'LCLHistoryMenu', MenuWidget); g_object_set_data(PGObject(SelWidget), 'LCLHistoryMenu', MenuWidget);
gtk_object_set_data(PGtkObject(SelWidget), 'LCLHistoryList', HistoryList); g_object_set_data(PGObject(SelWidget), 'LCLHistoryList', HistoryList);
end; end;
class procedure TGtk2WSOpenDialog.CreatePreviewDialogControl( class procedure TGtk2WSOpenDialog.CreatePreviewDialogControl(
@ -921,7 +921,7 @@ begin
PreviewWidget := {%H-}PGtkWidget(AControl.Handle); PreviewWidget := {%H-}PGtkWidget(AControl.Handle);
gtk_object_set_data(PGtkObject(PreviewWidget),'LCLPreviewFixed', g_object_set_data(PGObject(PreviewWidget),'LCLPreviewFixed',
PreviewWidget); PreviewWidget);
gtk_widget_set_size_request(PreviewWidget,AControl.Width,AControl.Height); gtk_widget_set_size_request(PreviewWidget,AControl.Width,AControl.Height);
@ -1010,7 +1010,7 @@ begin
gtk_widget_show_all(HBox); gtk_widget_show_all(HBox);
end else end else
FileDetailLabel:=nil; FileDetailLabel:=nil;
gtk_object_set_data(PGtkObject(SelWidget), 'FileDetailLabel', g_object_set_data(PGObject(SelWidget), 'FileDetailLabel',
FileDetailLabel); FileDetailLabel);
*) *)
// preview // preview

6
lcl/interfaces/gtk2/gtk2wsforms.pp
View File

@ -806,7 +806,7 @@ begin
GTK_WIDGET_UNSET_FLAGS(Scrolled^.hscrollbar, GTK_CAN_FOCUS); GTK_WIDGET_UNSET_FLAGS(Scrolled^.hscrollbar, GTK_CAN_FOCUS);
GTK_WIDGET_UNSET_FLAGS(Scrolled^.vscrollbar, GTK_CAN_FOCUS); GTK_WIDGET_UNSET_FLAGS(Scrolled^.vscrollbar, GTK_CAN_FOCUS);
gtk_scrolled_window_set_policy(Scrolled, GTK_POLICY_NEVER, GTK_POLICY_NEVER); gtk_scrolled_window_set_policy(Scrolled, GTK_POLICY_NEVER, GTK_POLICY_NEVER);
gtk_object_set_data(PGtkObject(Scrolled), odnScrollArea, Scrolled); g_object_set_data(PGObject(Scrolled), odnScrollArea, Scrolled);
{$IFDEF DebugLCLComponents} {$IFDEF DebugLCLComponents}
DebugGtkWidgets.MarkCreated(Scrolled, dbgsName(AWinControl)); DebugGtkWidgets.MarkCreated(Scrolled, dbgsName(AWinControl));
@ -816,11 +816,11 @@ begin
Adjustment := gtk_scrolled_window_get_vadjustment(Scrolled); Adjustment := gtk_scrolled_window_get_vadjustment(Scrolled);
if Adjustment <> nil then if Adjustment <> nil then
gtk_object_set_data(PGTKObject(Adjustment), odnScrollBar, Scrolled^.vscrollbar); g_object_set_data(PGObject(Adjustment), odnScrollBar, Scrolled^.vscrollbar);
Adjustment := gtk_scrolled_window_get_hadjustment(Scrolled); Adjustment := gtk_scrolled_window_get_hadjustment(Scrolled);
if Adjustment <> nil then if Adjustment <> nil then
gtk_object_set_data(PGTKObject(Adjustment), odnScrollBar, Scrolled^.hscrollbar); g_object_set_data(PGObject(Adjustment), odnScrollBar, Scrolled^.hscrollbar);
// create a gtk_layout for the client area, so children can be added at // create a gtk_layout for the client area, so children can be added at
// free x,y positions and the scrollbars automatically scrolls the children // free x,y positions and the scrollbars automatically scrolls the children