Hello,Please ignore the Qt4 patch I sent about 2 weeks ago and apply this one instead.
Attached is a patch that changes the current Qt interface into a Qt4 interface. Also a new file qtprivate.pp must be included on lcl/interfaces/qt/ The following widgets work: TApplication, TCustomForm, TCustomButton, TCustomMemo. The following events work: OnClick, OnPaint.More information about the qt4 widgetset can be found here: http://wiki.lazarus.freepascal.org/index.php/Qt_Interface
TCanvas.Rectangle works but only inside OnPaint event. The following files are obsolete and should be removed: lcl/interfaces/qt/src/*.* lcl/interfaces/qt/include/*.* lcl/interfaces/qt/test/*.* lcl/interfaces/qt/build.sh The patch alone doesn't make the interface work. 2 other things are needed. A 400kb unit called qt4.pas, and the 800kb .so file. qt4.pas is too big for this mailling list and I already sent it to Mattias. Thanks, Felipe
{
*****************************************************************************
* QtPrivate.pp *
* -------------- *
* *
* *
*****************************************************************************
*****************************************************************************
* *
* This file is part of the Lazarus Component Library (LCL) *
* *
* See the file COPYING.LCL, included in this distribution, *
* for details about the copyright. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* *
*****************************************************************************
}
unit qtprivate;
{$mode objfpc}{$H+}
interface
uses
qt4, Classes, SysUtils, LMessages, Forms, Controls, LCLType;
type
{ TQtWidget }
TQtWidget = class(QWidgetH)
private
public
Widget: QWidgetH;
LCLObject: TWinControl;
end;
{ TQtButton }
TQtButton = class(TQtWidget)
private
public
constructor Create(const AWinControl: TWinControl; const AParams:
TCreateParams); virtual;
destructor Destroy; override;
procedure SetText(text: PWideString);
procedure SlotClicked; cdecl;
procedure Text(retval: PWideString);
end;
{ TQtBrush }
TQtBrush = class(QBrushH)
private
public
Widget: QBrushH;
public
constructor Create; virtual;
destructor Destroy; override;
end;
{ TQtDeviceContext }
TQtDeviceContext = class(QPainterH)
private
public
Widget: QPainterH;
Brush: TQtBrush;
public
constructor Create(WidgetHandle: HWND); virtual;
destructor Destroy; override;
procedure drawRect(x1: Integer; y1: Integer; w: Integer; h: Integer);
end;
{ TQtCustomForm }
TQtCustomForm = class(TQtWidget)
private
public
PaintBox : QWidgetH;
Splitter : QSplitterH;
public
constructor Create(const AWinControl: TWinControl; const AParams:
TCreateParams); virtual;
destructor Destroy; override;
function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
procedure SlotPaint; cdecl;
end;
implementation
{ TQtButton }
{------------------------------------------------------------------------------
Function: TQtButton.Create
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
constructor TQtButton.Create(const AWinControl: TWinControl; const AParams:
TCreateParams);
var
Str: WideString;
Parent: QWidgetH;
begin
// Initializes the properties
LCLObject := AWinControl;
// Creates the widget
{$ifdef VerboseQt}
WriteLn('Calling QPushButton_create');
{$endif}
Str := WideString(AWinControl.Caption);
Parent := TQtCustomForm(AWinControl.Parent.Handle).Widget;
Widget := QPushButton_create(@Str, Parent);
// Sets it´ s initial properties
QWidget_setGeometry(Widget, AWinControl.Left, AWinControl.Top,
AWinControl.Width, AWinControl.Height);
end;
{------------------------------------------------------------------------------
Function: TQtButton.Destroy
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
destructor TQtButton.Destroy;
begin
{$ifdef VerboseQt}
WriteLn('Calling QPushButton_destroy');
{$endif}
QPushButton_destroy(QPushButtonH(Widget));
inherited Destroy;
end;
{------------------------------------------------------------------------------
Function: TQtButton.SetText
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
procedure TQtButton.SetText(text: PWideString);
begin
QAbstractButton_setText(QAbstractButtonH(Widget), text);
end;
{------------------------------------------------------------------------------
Function: TQtButton.SlotClicked
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
procedure TQtButton.SlotClicked; cdecl;
var
Msg: TLMessage;
begin
Msg.Msg := LM_CLICKED;
try
LCLObject.WindowProc(TLMessage(Msg));
except
Application.HandleException(nil);
end;
{ if (TLMessage(AMessage).Msg=LM_PAINT)
or (TLMessage(AMessage).Msg=LM_INTERNALPAINT)
or (TLMessage(AMessage).Msg=LM_GtkPaint) then
CurrentSentPaintMessageTarget:=TObject(Target);
try
if TObject(Target) is TControl
then TControl(Target).WindowProc(TLMessage(Msg))
else TObject(Target).Dispatch(TLMessage(Msg));
except
Application.HandleException(nil);
end;
CurrentSentPaintMessageTarget:=nil;}
end;
{------------------------------------------------------------------------------
Function: TQtButton.Text
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
procedure TQtButton.Text(retval: PWideString);
begin
QAbstractButton_text(QAbstractButtonH(Widget), @retval);
end;
{ TQtDeviceContext }
{------------------------------------------------------------------------------
Function: TQtDeviceContext.Create
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
constructor TQtDeviceContext.Create(WidgetHandle: HWND);
var
parent: QWidgetH;
begin
// Creates the widget
{$ifdef VerboseQt}
WriteLn('Calling QPainter_create');
{$endif}
if WidgetHandle = 0 then Widget := QPainter_create
else
begin
Parent := TQtCustomForm(WidgetHandle).PaintBox;
Widget := QPainter_create(QWidget_to_QPaintDevice(Parent));
end;
// Creates the Brush
Brush := TQtBrush.Create;
end;
{------------------------------------------------------------------------------
Function: TQtDeviceContext.Destroy
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
destructor TQtDeviceContext.Destroy;
begin
Brush.Free;
{$ifdef VerboseQt}
WriteLn('Calling QPainter_destroy');
{$endif}
QPainter_destroy(Widget);
inherited Destroy;
end;
{------------------------------------------------------------------------------
Function: TQtDeviceContext.drawRect
Params: None
Returns: Nothing
Draws a rectangle. Helper function of winapi.Rectangle
------------------------------------------------------------------------------}
procedure TQtDeviceContext.drawRect(x1: Integer; y1: Integer; w: Integer; h:
Integer);
begin
QPainter_drawRect(Widget, x1, y1, w, h);
end;
{ TQtBrush }
{------------------------------------------------------------------------------
Function: TQtBrush.Create
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
constructor TQtBrush.Create;
begin
// Creates the widget
{$ifdef VerboseQt}
WriteLn('Calling QBrush_create');
{$endif}
Widget := QBrush_create;
end;
{------------------------------------------------------------------------------
Function: TQtBrush.Destroy
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
destructor TQtBrush.Destroy;
begin
{$ifdef VerboseQt}
WriteLn('Calling QBrush_destroy');
{$endif}
QBrush_destroy(Widget);
inherited Destroy;
end;
{ TQtCustomForm }
{------------------------------------------------------------------------------
Function: TQtCustomForm.Create
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
constructor TQtCustomForm.Create(const AWinControl: TWinControl; const AParams:
TCreateParams);
begin
// Initializes the properties
LCLObject := AWinControl;
// Creates the widget
{$ifdef VerboseQt}
WriteLn('Calling QMainWindow_Create');
{$endif}
Widget := QMainWindow_Create;
// Form initial position
QWidget_setGeometry(Widget, AWinControl.Left, AWinControl.Top,
AWinControl.Width, AWinControl.Height);
// Painting helper device
PaintBox := QWidget_create;
QWidget_setParent(PaintBox, Widget);
QWidget_setGeometry(PaintBox, AWinControl.Left, AWinControl.Top,
AWinControl.Width, AWinControl.Height);
end;
{------------------------------------------------------------------------------
Function: TQtCustomForm.Destroy
Params: None
Returns: Nothing
------------------------------------------------------------------------------}
destructor TQtCustomForm.Destroy;
begin
{$ifdef VerboseQt}
WriteLn('Calling QMainWindow_destroy');
{$endif}
QMainWindow_destroy(QMainWindowH(Widget));
inherited Destroy;
end;
{------------------------------------------------------------------------------
Function: TQtCustomForm.EventFilter
Params: None
Returns: Nothing
Receives various events from Qt and send the appropriate messages to the LCL
------------------------------------------------------------------------------}
function TQtCustomForm.EventFilter(Sender: QObjectH; Event: QEventH): Boolean;
cdecl;
begin
Result:=False;
if QEvent_type(Event) = QEventType_Paint then SlotPaint;
end;
{------------------------------------------------------------------------------
Function: TQtCustomForm.SlotPaint
Params: None
Returns: Nothing
Sends a LM_PAINT message to the LCL
------------------------------------------------------------------------------}
procedure TQtCustomForm.SlotPaint; cdecl;
var
Msg: TLMessage;
begin
FillChar(Msg, SizeOf(Msg), #0);
Msg.Msg := LM_PAINT;
try
LCLObject.WindowProc(TLMessage(Msg));
except
Application.HandleException(nil);
end;
end;
end.
qtpatch2.diff.gz
Description: GNU Zip compressed data
