paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 07:49:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt: don't set mainwindow statusbar. It is not needed now and what to do if form has > 1 statusbars

Browse Source 
git-svn-id: trunk@15146 -
This commit is contained in:
paul 2008-05-15 07:36:57 +00:00
parent 8692663c87
commit 53cd55a22a
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/interfaces/qt/qtwidgets.pas
View File

@ -411,13 +411,11 @@ type
MDIAreaHandle: QMDIAreaH;
MenuBar: TQtMenuBar;
ToolBar: TQtToolBar;
StatusBar: TQtStatusBar;
destructor Destroy; override;
function getText: WideString; override;
function getTextStatic: Boolean; override;
procedure setText(const W: WideString); override;
procedure setMenuBar(AMenuBar: QMenuBarH);
procedure setStatusBar(AStatusBar: QStatusBarH);
function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; override;
procedure OffsetMousePos(APoint: PQtPoint); override;
procedure SlotWindowStateChange; cdecl;
@ -3571,7 +3569,6 @@ begin
begin
IsMainForm := True;
StatusBar := nil;
Result := QMainWindow_create(nil, QtWindow);
{$ifdef darwin}
@ -3689,12 +3686,6 @@ begin
QLayout_setMenuBar(LayoutWidget, AMenuBar);
end;
procedure TQtMainWindow.setStatusBar(AStatusBar: QStatusBarH);
begin
if IsMainForm then
QMainWindow_setStatusBar(QMainWindowH(Widget), AStatusBar);
end;
{------------------------------------------------------------------------------
Function: TQtMainWindow.EventFilter
Params: None

22
lcl/interfaces/qt/qtwscomctrls.pp
View File

@ -47,7 +47,6 @@ type
class procedure ClearPanels(const Widget: TQtStatusBar);
class procedure RecreatePanels(const AStatusBar: TStatusBar; const Widget: TQtStatusBar);
public
class procedure AddControl(const AControl: TControl); override;
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
class procedure DestroyHandle(const AWinControl: TWinControl); override;
class procedure PanelUpdate(const AStatusBar: TStatusBar; PanelIndex: integer); override;
@ -498,27 +497,6 @@ begin
end;
end;
class procedure TQtWSStatusBar.AddControl(const AControl: TControl);
var
QtStatusBar: TQtStatusBar;
Parent: TQtWidget;
begin
if not WSCheckHandleAllocated(TStatusBar(AControl), 'AddControl') then
Exit;
TQtWSWinControl.AddControl(AControl);
QtStatusBar := TQtStatusBar(TWinControl(AControl).Handle);
Parent := TQtWidget(AControl.Parent.Handle);
if (Parent is TQtMainWindow) and (TQtMainWindow(Parent).IsMainForm) and
(TQtMainWindow(Parent).StatusBar = nil) then
begin
TQtMainWindow(Parent).StatusBar := QtStatusBar;
TQtMainWindow(Parent).setStatusBar(QStatusBarH(QtStatusBar.Widget));
end;
end;
class function TQtWSStatusBar.CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle;
var
AStatusBar: TStatusBar absolute AWinControl;