paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-02-19 19:56:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fixed menubar creation under macosx in ide & app runtime.

Browse Source 
git-svn-id: trunk@12288 -
This commit is contained in:
zeljko 2007-10-02 06:29:12 +00:00
parent 5608116547
commit c874dadef0
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3165,7 +3165,14 @@ begin
Result := QMainWindow_create(nil, QtWindow);
MenuBar := TQtMenuBar.Create(Result);
{$ifdef darwin}
if csDesigning in ComponentState then
MenuBar := TQtMenuBar.Create(nil)
else
MenuBar := TQtMenuBar.Create(Result);
{$else}
MenuBar := TQtMenuBar.Create(Result);
{$endif}
{$ifdef USE_QT_4_3}
if (Application.MainForm <> nil) and (Application.MainForm.FormStyle = fsMDIForm)
@ -3221,12 +3228,11 @@ begin
// Main menu bar
{TODO: remove this ifdef as soon as we create MenuBar on demand creation,
not per default !}
{$ifndef windows}
if Assigned(TCustomForm(LCLObject).Menu) then
{$ifdef darwin}
MenuBar := TQtMenuBar.Create(nil);
{$else}
MenuBar := TQtMenuBar.Create(Result);
{$endif}
MenuBar := TQtMenuBar.Create(Result);
FCentralWidget := QWidget_create(Result);
LayoutWidget := QBoxLayout_create(QBoxLayoutTopToBottom, Result);