mirror of
https://github.com/doublecmd/doublecmd.git
synced 2026-06-28 10:02:14 +00:00
FIX: wlxmodule and simplewlx plugin: error on gtk2 ws
This commit is contained in:
parent
86b14e5de2
commit
8de92dab08
2 changed files with 7 additions and 6 deletions
|
|
@ -2,7 +2,7 @@ library SimpleWlx;
|
|||
|
||||
{$mode objfpc}{$H+}
|
||||
|
||||
{$DEFINE GTK}
|
||||
{$DEFINE GTK2}
|
||||
|
||||
uses
|
||||
Classes,
|
||||
|
|
@ -61,10 +61,9 @@ function ListLoad(ParentWin:thandle;FileToLoad:pchar;ShowFlags:integer):thandle;
|
|||
var GFix,GButton1,Gbutton2:PGtkWidget;
|
||||
|
||||
begin
|
||||
{$IFDEF GTK}
|
||||
// gFix:=gtk_fixed_new;
|
||||
gFix:=gtk_vbox_new(true,5);
|
||||
gtk_container_add(GTK_CONTAINER(ParentWin),gFix);
|
||||
gtk_container_add(GTK_CONTAINER(PGtkWidget(ParentWin)),gFix);
|
||||
gtk_widget_show(gFix);
|
||||
|
||||
GButton1:=gtk_button_new_with_label('Yehoo1');
|
||||
|
|
@ -93,7 +92,6 @@ begin
|
|||
end;
|
||||
|
||||
Result:=integer(GFix);
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
procedure ListCloseWindow(ListWin:thandle); stdcall;
|
||||
|
|
|
|||
|
|
@ -34,6 +34,9 @@ uses
|
|||
{$IFDEF LCLGTK}
|
||||
,gtk,glib,gdk
|
||||
{$ENDIF}
|
||||
{$IFDEF LCLGTK2}
|
||||
,gtk2,glib2,gdk2
|
||||
{$ENDIF}
|
||||
{$IFDEF LCLQT}
|
||||
,qt4,qtwidgets
|
||||
// The Qt widgetset must be used to load plugins on qt
|
||||
|
|
@ -138,11 +141,11 @@ type
|
|||
implementation
|
||||
|
||||
function WlxPrepareContainer(Ahandle: THandle): boolean;
|
||||
{$IFDEF LCLGTK}
|
||||
{$IFNDEF LCLQT}
|
||||
var lst:PGList;
|
||||
{$ENDIF}
|
||||
begin
|
||||
{$IFDEF LCLGTK}
|
||||
{$IFNDEF LCLQT}
|
||||
//Hide controls from our gtk container
|
||||
lst:=gtk_container_children(GTK_CONTAINER(PGtkwidget(AHandle)));
|
||||
if lst<>nil then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue