diff --git a/.gitattributes b/.gitattributes index 122008db1b..13746a45e6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2678,7 +2678,7 @@ lcl/interfaces/gtk2/tests/checkbuttononfixed.lpr svneol=native#text/plain lcl/interfaces/qt/README.txt svneol=native#text/plain lcl/interfaces/qt/interfaces.pp svneol=native#text/pascal lcl/interfaces/qt/qt4.pas svneol=native#text/plain -lcl/interfaces/qt/qt42.pas -text +lcl/interfaces/qt/qt43.pas -text lcl/interfaces/qt/qtcallback.inc svneol=native#text/pascal lcl/interfaces/qt/qtint.pp svneol=native#text/pascal lcl/interfaces/qt/qtlclintf.inc svneol=native#text/pascal diff --git a/lcl/interfaces/qt/qt4.pas b/lcl/interfaces/qt/qt4.pas index ca9ac39d16..ee7407542f 100644 --- a/lcl/interfaces/qt/qt4.pas +++ b/lcl/interfaces/qt/qt4.pas @@ -14,7 +14,7 @@ uses Types; const - QT_VERSION = 4 shl 16 + 3 shl 8 + 0; + QT_VERSION = 4 shl 16 + 2 shl 8 + 3; {$IFDEF MSWINDOWS} QtIntf = 'libqt4intf.dll'; @@ -169,14 +169,12 @@ QGraphicsItemH = class(TObject) end; QGraphicsPathItemH = class(QAbstractGraphicsShapeItemH) end; QGraphicsPolygonItemH = class(QAbstractGraphicsShapeItemH) end; QGraphicsRectItemH = class(QAbstractGraphicsShapeItemH) end; - QGraphicsSimpleTextItemH = class(QAbstractGraphicsShapeItemH) end; QGraphicsItemGroupH = class(QGraphicsItemH) end; QGraphicsLineItemH = class(QGraphicsItemH) end; QGraphicsPixmapItemH = class(QGraphicsItemH) end; QGraphicsTextItemH = class(QGraphicsItemH) end; QIconH = class(TObject) end; QIconEngineH = class(TObject) end; - QIconEngineV2H = class(QIconEngineH) end; QImageIOHandlerH = class(TObject) end; QImageReaderH = class(TObject) end; QImageWriterH = class(TObject) end; @@ -209,7 +207,6 @@ QObjectH = class(TObject) end; QAbstractItemDelegateH = class(QObjectH) end; QAbstractItemModelH = class(QObjectH) end; QAbstractListModelH = class(QAbstractItemModelH) end; - QAbstractProxyModelH = class(QAbstractItemModelH) end; QAbstractTableModelH = class(QAbstractItemModelH) end; QStandardItemModelH = class(QAbstractItemModelH) end; QAbstractTextDocumentLayoutH = class(QObjectH) end; @@ -278,7 +275,6 @@ QObjectH = class(TObject) end; QTreeViewH = class(QAbstractItemViewH) end; QTreeWidgetH = class(QTreeViewH) end; QGraphicsViewH = class(QAbstractScrollAreaH) end; - QMdiAreaH = class(QAbstractScrollAreaH) end; QScrollAreaH = class(QAbstractScrollAreaH) end; QTextEditH = class(QAbstractScrollAreaH) end; QTextBrowserH = class(QTextEditH) end; @@ -289,7 +285,6 @@ QObjectH = class(TObject) end; QGroupBoxH = class(QWidgetH) end; QLineEditH = class(QWidgetH) end; QMainWindowH = class(QWidgetH) end; - QMdiSubWindowH = class(QWidgetH) end; QMenuH = class(QWidgetH) end; QMenuBarH = class(QWidgetH) end; QProgressBarH = class(QWidgetH) end; @@ -328,7 +323,6 @@ QStandardItemH = class(TObject) end; QStringH = class(TObject) end; QStyleHintReturnH = class(TObject) end; QStyleHintReturnMaskH = class(QStyleHintReturnH) end; - QStyleHintReturnVariantH = class(QStyleHintReturnH) end; QStyleOptionH = class(TObject) end; QStyleOptionButtonH = class(QStyleOptionH) end; QStyleOptionComplexH = class(QStyleOptionH) end; @@ -341,7 +335,6 @@ QStyleOptionH = class(TObject) end; QStyleOptionTitleBarH = class(QStyleOptionComplexH) end; QStyleOptionToolButtonH = class(QStyleOptionComplexH) end; QStyleOptionDockWidgetH = class(QStyleOptionH) end; - QStyleOptionDockWidgetV2H = class(QStyleOptionDockWidgetH) end; QStyleOptionFocusRectH = class(QStyleOptionH) end; QStyleOptionFrameH = class(QStyleOptionH) end; QStyleOptionFrameV2H = class(QStyleOptionFrameH) end; @@ -359,10 +352,8 @@ QStyleOptionH = class(TObject) end; QStyleOptionTabWidgetFrameH = class(QStyleOptionH) end; QStyleOptionToolBarH = class(QStyleOptionH) end; QStyleOptionToolBoxH = class(QStyleOptionH) end; - QStyleOptionToolBoxV2H = class(QStyleOptionToolBoxH) end; QStyleOptionViewItemH = class(QStyleOptionH) end; QStyleOptionViewItemV2H = class(QStyleOptionViewItemH) end; - QStyleOptionViewItemV3H = class(QStyleOptionViewItemV2H) end; QTextBlockH = class(TObject) end; QTextCursorH = class(TObject) end; QTextDocumentFragmentH = class(TObject) end; @@ -375,7 +366,6 @@ QTextFormatH = class(TObject) end; QTextOptionH = class(TObject) end; QTimeH = class(TObject) end; QToolTipH = class(TObject) end; -QTransformH = class(TObject) end; QTreeWidgetItemH = class(TObject) end; QUrlH = class(TObject) end; QVariantH = class(TObject) end; @@ -436,8 +426,6 @@ QProgressBar_hookH = class(QWidget_hookH) end; QStatusBar_hookH = class(QWidget_hookH) end; QToolBox_hookH = class(QFrame_hookH) end; QToolButton_hookH = class(QAbstractButton_hookH) end; -QMdiArea_hookH = class(QAbstractScrollArea_hookH) end; -QMdiSubWindow_hookH = class(QWidget_hookH) end; QCalendarWidget_hookH = class(QWidget_hookH) end; QAbstractItemView_hookH = class(QAbstractScrollArea_hookH) end; QListView_hookH = class(QAbstractItemView_hookH) end; @@ -505,7 +493,7 @@ type QtCaseInsensitive, QtCaseSensitive ); QtConnectionType = ( // Qt::ConnectionType (1) - QtAutoConnection, QtDirectConnection, QtQueuedConnection, QtAutoCompatConnection, QtBlockingQueuedConnection ); + QtAutoConnection, QtDirectConnection, QtQueuedConnection, QtAutoCompatConnection ); QtShortcutContext = ( // Qt::ShortcutContext (1) QtWidgetShortcut, QtWindowShortcut, QtApplicationShortcut ); @@ -513,18 +501,12 @@ type QtFillRule = ( // Qt::FillRule (1) QtOddEvenFill, QtWindingFill ); - QtMaskMode = ( // Qt::MaskMode (1) - QtMaskInColor, QtMaskOutColor ); - QtClipOperation = ( // Qt::ClipOperation (1) QtNoClip, QtReplaceClip, QtIntersectClip, QtUniteClip ); QtTransformationMode = ( // Qt::TransformationMode (1) QtFastTransformation, QtSmoothTransformation ); - QtAxis = ( // Qt::Axis (1) - QtXAxis, QtYAxis, QtZAxis ); - QtFocusReason = ( // Qt::FocusReason (1) QtMouseFocusReason, QtTabFocusReason, QtBacktabFocusReason, QtActiveWindowFocusReason, QtPopupFocusReason, QtShortcutFocusReason, QtMenuBarFocusReason, QtOtherFocusReason, QtNoFocusReason ); @@ -592,7 +574,6 @@ const type QtApplicationAttribute = ( //Qt::ApplicationAttribute (2) QtAA_ImmediateWidgetCreation = 0, - QtAA_MSWindowsUseDirect3DByDefault = 1, QtAA_AttributeCount ); type @@ -745,14 +726,11 @@ type QInternalRelayoutNormal, QInternalRelayoutDragging, QInternalRelayoutDropped ); QInternalCallback = ( // QInternal::Callback (1) - QInternalConnectCallback, QInternalDisconnectCallback, QInternalAdoptCurrentThread, QInternalEventNotifyCallback, QInternalLastCallback ); + QInternalConnectCallback, QInternalDisconnectCallback, QInternalAdoptCurrentThread, QInternalLastCallback ); QInternalInternalFunction = ( // QInternal::InternalFunction (1) QInternalCreateThreadForAdoption, QInternalRefAdoptedThread, QInternalDerefAdoptedThread, QInternalSetCurrentThreadToMainThread, QInternalLastInternalFunction ); - QInternalDockPosition = ( // QInternal::DockPosition (1) - QInternalLeftDock, QInternalRightDock, QInternalTopDock, QInternalBottomDock, QInternalDockCount ); - QInternalPaintDeviceFlags = ( //QInternal::PaintDeviceFlags (2s) QInternalUnknownDevice = $00, QInternalWidget = $01, @@ -869,7 +847,6 @@ const QtWA_Moved = 43 { $2b }; QtWA_PendingUpdate = 44 { $2c }; QtWA_InvalidSize = 45 { $2d }; - QtWA_MacBrushedMetal = 46 { $2e }; QtWA_MacMetalStyle = 46 { $2e }; QtWA_CustomWhatsThis = 47 { $2f }; QtWA_LayoutOnEntireRect = 48 { $30 }; @@ -911,18 +888,7 @@ const QtWA_AlwaysShowToolTips = 84 { $54 }; QtWA_MacOpaqueSizeGrip = 85 { $55 }; QtWA_SetStyle = 86 { $56 }; - QtWA_SetLocale = 87 { $57 }; - QtWA_MacShowFocusRect = 88 { $58 }; - QtWA_MacNormalSize = 89 { $59 }; - QtWA_MacSmallSize = 90 { $5a }; - QtWA_MacMiniSize = 91 { $5b }; - QtWA_LayoutUsesWidgetRect = 92 { $5c }; - QtWA_StyledBackground = 93 { $5d }; - QtWA_MSWindowsUseDirect3D = 94 { $5e }; - QtWA_CanHostQMdiSubWindowTitleBar = 95 { $5f }; - QtWA_MacAlwaysShowToolWindow = 96 { $60 }; - QtWA_StyleSheet = 97 { $61 }; - QtWA_AttributeCount = 98 { $62 }; + QtWA_AttributeCount = 87 { $57 }; type QtKey = cardinal; // Qt::Key (4) @@ -1323,14 +1289,6 @@ const QtTextEditorInteraction = 19 { $13 }; QtTextBrowserInteraction = 13 { $d }; -type - QtEventPriority = cardinal; // Qt::EventPriority (4) - -const - QtHighEventPriority = 1 { $1 }; - QtNormalEventPriority = 0 { $0 }; - QtLowEventPriority = 4294967295 { $ffffffff }; - function QObject_create(parent: QObjectH = nil): QObjectH; cdecl; external QtIntf name 'QObject_create'; @@ -1365,146 +1323,136 @@ function QObject_parent(handle: QObjectH): QObjectH; cdecl; external QtIntf name function QObject_inherits(handle: QObjectH; classname: PAnsiChar): Boolean; cdecl; external QtIntf name 'QObject_inherits'; procedure QObject_deleteLater(handle: QObjectH); cdecl; external QtIntf name 'QObject_deleteLater'; + type - QEventType = cardinal; // QEvent::Type (4) - -const - QEventNone = 0 { $0 }; - QEventTimer = 1 { $1 }; - QEventMouseButtonPress = 2 { $2 }; - QEventMouseButtonRelease = 3 { $3 }; - QEventMouseButtonDblClick = 4 { $4 }; - QEventMouseMove = 5 { $5 }; - QEventKeyPress = 6 { $6 }; - QEventKeyRelease = 7 { $7 }; - QEventFocusIn = 8 { $8 }; - QEventFocusOut = 9 { $9 }; - QEventEnter = 10 { $a }; - QEventLeave = 11 { $b }; - QEventPaint = 12 { $c }; - QEventMove = 13 { $d }; - QEventResize = 14 { $e }; - QEventCreate = 15 { $f }; - QEventDestroy = 16 { $10 }; - QEventShow = 17 { $11 }; - QEventHide = 18 { $12 }; - QEventClose = 19 { $13 }; - QEventQuit = 20 { $14 }; - QEventParentChange = 21 { $15 }; - QEventParentAboutToChange = 131 { $83 }; - QEventThreadChange = 22 { $16 }; - QEventWindowActivate = 24 { $18 }; - QEventWindowDeactivate = 25 { $19 }; - QEventShowToParent = 26 { $1a }; - QEventHideToParent = 27 { $1b }; - QEventWheel = 31 { $1f }; - QEventWindowTitleChange = 33 { $21 }; - QEventWindowIconChange = 34 { $22 }; - QEventApplicationWindowIconChange = 35 { $23 }; - QEventApplicationFontChange = 36 { $24 }; - QEventApplicationLayoutDirectionChange = 37 { $25 }; - QEventApplicationPaletteChange = 38 { $26 }; - QEventPaletteChange = 39 { $27 }; - QEventClipboard = 40 { $28 }; - QEventSpeech = 42 { $2a }; - QEventMetaCall = 43 { $2b }; - QEventSockAct = 50 { $32 }; - QEventWinEventAct = 132 { $84 }; - QEventDeferredDelete = 52 { $34 }; - QEventDragEnter = 60 { $3c }; - QEventDragMove = 61 { $3d }; - QEventDragLeave = 62 { $3e }; - QEventDrop = 63 { $3f }; - QEventDragResponse = 64 { $40 }; - QEventChildAdded = 68 { $44 }; - QEventChildPolished = 69 { $45 }; - QEventChildRemoved = 71 { $47 }; - QEventShowWindowRequest = 73 { $49 }; - QEventPolishRequest = 74 { $4a }; - QEventPolish = 75 { $4b }; - QEventLayoutRequest = 76 { $4c }; - QEventUpdateRequest = 77 { $4d }; - QEventUpdateLater = 78 { $4e }; - QEventEmbeddingControl = 79 { $4f }; - QEventActivateControl = 80 { $50 }; - QEventDeactivateControl = 81 { $51 }; - QEventContextMenu = 82 { $52 }; - QEventInputMethod = 83 { $53 }; - QEventAccessibilityPrepare = 86 { $56 }; - QEventTabletMove = 87 { $57 }; - QEventLocaleChange = 88 { $58 }; - QEventLanguageChange = 89 { $59 }; - QEventLayoutDirectionChange = 90 { $5a }; - QEventStyle = 91 { $5b }; - QEventTabletPress = 92 { $5c }; - QEventTabletRelease = 93 { $5d }; - QEventOkRequest = 94 { $5e }; - QEventHelpRequest = 95 { $5f }; - QEventIconDrag = 96 { $60 }; - QEventFontChange = 97 { $61 }; - QEventEnabledChange = 98 { $62 }; - QEventActivationChange = 99 { $63 }; - QEventStyleChange = 100 { $64 }; - QEventIconTextChange = 101 { $65 }; - QEventModifiedChange = 102 { $66 }; - QEventMouseTrackingChange = 109 { $6d }; - QEventWindowBlocked = 103 { $67 }; - QEventWindowUnblocked = 104 { $68 }; - QEventWindowStateChange = 105 { $69 }; - QEventToolTip = 110 { $6e }; - QEventWhatsThis = 111 { $6f }; - QEventStatusTip = 112 { $70 }; - QEventActionChanged = 113 { $71 }; - QEventActionAdded = 114 { $72 }; - QEventActionRemoved = 115 { $73 }; - QEventFileOpen = 116 { $74 }; - QEventShortcut = 117 { $75 }; - QEventShortcutOverride = 51 { $33 }; - QEventWhatsThisClicked = 118 { $76 }; - QEventToolBarChange = 120 { $78 }; - QEventApplicationActivate = 121 { $79 }; - QEventApplicationActivated = 121 { $79 }; - QEventApplicationDeactivate = 122 { $7a }; - QEventApplicationDeactivated = 122 { $7a }; - QEventQueryWhatsThis = 123 { $7b }; - QEventEnterWhatsThisMode = 124 { $7c }; - QEventLeaveWhatsThisMode = 125 { $7d }; - QEventZOrderChange = 126 { $7e }; - QEventHoverEnter = 127 { $7f }; - QEventHoverLeave = 128 { $80 }; - QEventHoverMove = 129 { $81 }; - QEventAccessibilityHelp = 119 { $77 }; - QEventAccessibilityDescription = 130 { $82 }; - QEventAcceptDropsChange = 152 { $98 }; - QEventMenubarUpdated = 153 { $99 }; - QEventZeroTimerEvent = 154 { $9a }; - QEventGraphicsSceneMouseMove = 155 { $9b }; - QEventGraphicsSceneMousePress = 156 { $9c }; - QEventGraphicsSceneMouseRelease = 157 { $9d }; - QEventGraphicsSceneMouseDoubleClick = 158 { $9e }; - QEventGraphicsSceneContextMenu = 159 { $9f }; - QEventGraphicsSceneHoverEnter = 160 { $a0 }; - QEventGraphicsSceneHoverMove = 161 { $a1 }; - QEventGraphicsSceneHoverLeave = 162 { $a2 }; - QEventGraphicsSceneHelp = 163 { $a3 }; - QEventGraphicsSceneDragEnter = 164 { $a4 }; - QEventGraphicsSceneDragMove = 165 { $a5 }; - QEventGraphicsSceneDragLeave = 166 { $a6 }; - QEventGraphicsSceneDrop = 167 { $a7 }; - QEventGraphicsSceneWheel = 168 { $a8 }; - QEventKeyboardLayoutChange = 169 { $a9 }; - QEventDynamicPropertyChange = 170 { $aa }; - QEventTabletEnterProximity = 171 { $ab }; - QEventTabletLeaveProximity = 172 { $ac }; - QEventNonClientAreaMouseMove = 173 { $ad }; - QEventNonClientAreaMouseButtonPress = 174 { $ae }; - QEventNonClientAreaMouseButtonRelease = 175 { $af }; - QEventNonClientAreaMouseButtonDblClick = 176 { $b0 }; - QEventMacSizeChange = 177 { $b1 }; - QEventContentsRectChange = 178 { $b2 }; - QEventUser = 1000 { $3e8 }; - QEventMaxUser = 65535 { $ffff }; - + QEventType = ( //QEvent::Type (2s) + QEventNone = 0, + QEventTimer = 1, + QEventMouseButtonPress = 2, + QEventMouseButtonRelease = 3, + QEventMouseButtonDblClick = 4, + QEventMouseMove = 5, + QEventKeyPress = 6, + QEventKeyRelease = 7, + QEventFocusIn = 8, + QEventFocusOut = 9, + QEventEnter = 10, + QEventLeave = 11, + QEventPaint = 12, + QEventMove = 13, + QEventResize = 14, + QEventCreate = 15, + QEventDestroy = 16, + QEventShow = 17, + QEventHide = 18, + QEventClose = 19, + QEventQuit = 20, + QEventParentChange = 21, + QEventThreadChange = 22, + QEventWindowActivate = 24, + QEventWindowDeactivate = 25, + QEventShowToParent = 26, + QEventHideToParent = 27, + QEventWheel = 31, + QEventWindowTitleChange = 33, + QEventWindowIconChange = 34, + QEventApplicationWindowIconChange = 35, + QEventApplicationFontChange = 36, + QEventApplicationLayoutDirectionChange = 37, + QEventApplicationPaletteChange = 38, + QEventPaletteChange = 39, + QEventClipboard = 40, + QEventSpeech = 42, + QEventMetaCall = 43, + QEventSockAct = 50, + QEventShortcutOverride = 51, + QEventDeferredDelete = 52, + QEventDragEnter = 60, + QEventDragMove = 61, + QEventDragLeave = 62, + QEventDrop = 63, + QEventDragResponse = 64, + QEventChildAdded = 68, + QEventChildPolished = 69, + QEventChildRemoved = 71, + QEventShowWindowRequest = 73, + QEventPolishRequest = 74, + QEventPolish = 75, + QEventLayoutRequest = 76, + QEventUpdateRequest = 77, + QEventUpdateLater = 78, + QEventEmbeddingControl = 79, + QEventActivateControl = 80, + QEventDeactivateControl = 81, + QEventContextMenu = 82, + QEventInputMethod = 83, + QEventAccessibilityPrepare = 86, + QEventTabletMove = 87, + QEventLocaleChange = 88, + QEventLanguageChange = 89, + QEventLayoutDirectionChange = 90, + QEventStyle = 91, + QEventTabletPress = 92, + QEventTabletRelease = 93, + QEventOkRequest = 94, + QEventHelpRequest = 95, + QEventIconDrag = 96, + QEventFontChange = 97, + QEventEnabledChange = 98, + QEventActivationChange = 99, + QEventStyleChange = 100, + QEventIconTextChange = 101, + QEventModifiedChange = 102, + QEventWindowBlocked = 103, + QEventWindowUnblocked = 104, + QEventWindowStateChange = 105, + QEventMouseTrackingChange = 109, + QEventToolTip = 110, + QEventWhatsThis = 111, + QEventStatusTip = 112, + QEventActionChanged = 113, + QEventActionAdded = 114, + QEventActionRemoved = 115, + QEventFileOpen = 116, + QEventShortcut = 117, + QEventWhatsThisClicked = 118, + QEventAccessibilityHelp = 119, + QEventToolBarChange = 120, + QEventApplicationActivated = 121, + QEventApplicationDeactivated = 122, + QEventQueryWhatsThis = 123, + QEventEnterWhatsThisMode = 124, + QEventLeaveWhatsThisMode = 125, + QEventZOrderChange = 126, + QEventHoverEnter = 127, + QEventHoverLeave = 128, + QEventHoverMove = 129, + QEventAccessibilityDescription = 130, + QEventParentAboutToChange = 131, + QEventWinEventAct = 132, + QEventAcceptDropsChange = 152, + QEventMenubarUpdated = 153, + QEventZeroTimerEvent = 154, + QEventGraphicsSceneMouseMove = 155, + QEventGraphicsSceneMousePress = 156, + QEventGraphicsSceneMouseRelease = 157, + QEventGraphicsSceneMouseDoubleClick = 158, + QEventGraphicsSceneContextMenu = 159, + QEventGraphicsSceneHoverEnter = 160, + QEventGraphicsSceneHoverMove = 161, + QEventGraphicsSceneHoverLeave = 162, + QEventGraphicsSceneHelp = 163, + QEventGraphicsSceneDragEnter = 164, + QEventGraphicsSceneDragMove = 165, + QEventGraphicsSceneDragLeave = 166, + QEventGraphicsSceneDrop = 167, + QEventGraphicsSceneWheel = 168, + QEventKeyboardLayoutChange = 169, + QEventDynamicPropertyChange = 170, + QEventTabletEnterProximity = 171, + QEventTabletLeaveProximity = 172, + QEventUser = 1000, + QEventMaxUser = 65535 ); function QEvent_create(_type: QEventType): QEventH; cdecl; external QtIntf name 'QEvent_create'; procedure QEvent_destroy(handle: QEventH); cdecl; external QtIntf name 'QEvent_destroy'; @@ -1577,12 +1525,10 @@ procedure QCoreApplication_processEvents(flags: QEventLoopProcessEventsFlags = Q procedure QCoreApplication_processEvents(flags: QEventLoopProcessEventsFlags; maxtime: Integer); overload; cdecl; external QtIntf name 'QCoreApplication_processEvents2'; procedure QCoreApplication_exit(retcode: Integer = 0); cdecl; external QtIntf name 'QCoreApplication_exit'; function QCoreApplication_sendEvent(receiver: QObjectH; event: QEventH): Boolean; cdecl; external QtIntf name 'QCoreApplication_sendEvent'; -procedure QCoreApplication_postEvent(receiver: QObjectH; event: QEventH); overload; cdecl; external QtIntf name 'QCoreApplication_postEvent'; -procedure QCoreApplication_postEvent(receiver: QObjectH; event: QEventH; priority: Integer); overload; cdecl; external QtIntf name 'QCoreApplication_postEvent2'; +procedure QCoreApplication_postEvent(receiver: QObjectH; event: QEventH); cdecl; external QtIntf name 'QCoreApplication_postEvent'; procedure QCoreApplication_sendPostedEvents(receiver: QObjectH; event_type: Integer); overload; cdecl; external QtIntf name 'QCoreApplication_sendPostedEvents'; procedure QCoreApplication_sendPostedEvents(); overload; cdecl; external QtIntf name 'QCoreApplication_sendPostedEvents2'; -procedure QCoreApplication_removePostedEvents(receiver: QObjectH); overload; cdecl; external QtIntf name 'QCoreApplication_removePostedEvents'; -procedure QCoreApplication_removePostedEvents(receiver: QObjectH; eventType: Integer); overload; cdecl; external QtIntf name 'QCoreApplication_removePostedEvents2'; +procedure QCoreApplication_removePostedEvents(receiver: QObjectH); cdecl; external QtIntf name 'QCoreApplication_removePostedEvents'; function QCoreApplication_hasPendingEvents(): Boolean; cdecl; external QtIntf name 'QCoreApplication_hasPendingEvents'; function QCoreApplication_notify(handle: QCoreApplicationH; p1: QObjectH; p2: QEventH): Boolean; cdecl; external QtIntf name 'QCoreApplication_notify'; function QCoreApplication_startingUp(): Boolean; cdecl; external QtIntf name 'QCoreApplication_startingUp'; @@ -1690,8 +1636,7 @@ const QVariantTextLength = 78 { $4e }; QVariantTextFormat = 79 { $4f }; QVariantMatrix = 80 { $50 }; - QVariantTransform = 81 { $51 }; - QVariantLastGuiType = 81 { $51 }; + QVariantLastGuiType = 80 { $50 }; QVariantUserType = 127 { $7f }; QVariantLastType = 4294967295 { $ffffffff }; @@ -2023,9 +1968,8 @@ function QRect_intersects(handle: QRectH; r: PRect): Boolean; cdecl; external Qt function QRectF_create(): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create'; procedure QRectF_destroy(handle: QRectFH); cdecl; external QtIntf name 'QRectF_destroy'; function QRectF_create(topleft: QPointFH; size: QSizeFH): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create2'; -function QRectF_create(topleft: QPointFH; bottomRight: QPointFH): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create3'; -function QRectF_create(left: Double; top: Double; width: Double; height: Double): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create4'; -function QRectF_create(rect: PRect): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create5'; +function QRectF_create(left: Double; top: Double; width: Double; height: Double): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create3'; +function QRectF_create(rect: PRect): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create4'; function QRectF_isNull(handle: QRectFH): Boolean; cdecl; external QtIntf name 'QRectF_isNull'; function QRectF_isEmpty(handle: QRectFH): Boolean; cdecl; external QtIntf name 'QRectF_isEmpty'; function QRectF_isValid(handle: QRectFH): Boolean; cdecl; external QtIntf name 'QRectF_isValid'; @@ -2087,7 +2031,6 @@ procedure QRectF_intersect(handle: QRectFH; retval: QRectFH; r: QRectFH); cdecl; procedure QRectF_intersected(handle: QRectFH; retval: QRectFH; other: QRectFH); cdecl; external QtIntf name 'QRectF_intersected'; function QRectF_intersects(handle: QRectFH; r: QRectFH): Boolean; cdecl; external QtIntf name 'QRectF_intersects'; procedure QRectF_toRect(handle: QRectFH; retval: PRect); cdecl; external QtIntf name 'QRectF_toRect'; -procedure QRectF_toAlignedRect(handle: QRectFH; retval: PRect); cdecl; external QtIntf name 'QRectF_toAlignedRect'; function QDate_create(): QDateH; overload; cdecl; external QtIntf name 'QDate_create'; procedure QDate_destroy(handle: QDateH); cdecl; external QtIntf name 'QDate_destroy'; @@ -2232,7 +2175,6 @@ function QApplication_topLevelAt(p: PPoint): QWidgetH; overload; cdecl; external function QApplication_topLevelAt(x: Integer; y: Integer): QWidgetH; overload; cdecl; external QtIntf name 'QApplication_topLevelAt2'; procedure QApplication_syncX(); cdecl; external QtIntf name 'QApplication_syncX'; procedure QApplication_beep(); cdecl; external QtIntf name 'QApplication_beep'; -procedure QApplication_alert(widget: QWidgetH; duration: Integer = 0); cdecl; external QtIntf name 'QApplication_alert'; function QApplication_keyboardModifiers(): QtKeyboardModifiers; cdecl; external QtIntf name 'QApplication_keyboardModifiers'; function QApplication_mouseButtons(): QtMouseButtons; cdecl; external QtIntf name 'QApplication_mouseButtons'; procedure QApplication_setDesktopSettingsAware(p1: Boolean); cdecl; external QtIntf name 'QApplication_setDesktopSettingsAware'; @@ -2376,7 +2318,6 @@ function QPalette_link(handle: QPaletteH): QBrushH; cdecl; external QtIntf name function QPalette_linkVisited(handle: QPaletteH): QBrushH; cdecl; external QtIntf name 'QPalette_linkVisited'; function QPalette_isCopyOf(handle: QPaletteH; p: QPaletteH): Boolean; cdecl; external QtIntf name 'QPalette_isCopyOf'; function QPalette_serialNumber(handle: QPaletteH): Integer; cdecl; external QtIntf name 'QPalette_serialNumber'; -function QPalette_cacheKey(handle: QPaletteH): int64; cdecl; external QtIntf name 'QPalette_cacheKey'; procedure QPalette_resolve(handle: QPaletteH; retval: QPaletteH; p1: QPaletteH); overload; cdecl; external QtIntf name 'QPalette_resolve'; function QPalette_resolve(handle: QPaletteH): LongWord; overload; cdecl; external QtIntf name 'QPalette_resolve2'; procedure QPalette_resolve(handle: QPaletteH; mask: LongWord); overload; cdecl; external QtIntf name 'QPalette_resolve3'; @@ -2389,26 +2330,6 @@ type QSizePolicyShrinkFlag = 4, QSizePolicyIgnoreFlag = 8 ); -type - QSizePolicyControlType = cardinal; // QSizePolicy::ControlType - QSizePolicyControlTypes = QSizePolicyControlType; //QFlags<> (3) -const - QSizePolicyDefaultType = $00000001; - QSizePolicyButtonBox = $00000002; - QSizePolicyCheckBox = $00000004; - QSizePolicyComboBox = $00000008; - QSizePolicyFrame = $00000010; - QSizePolicyGroupBox = $00000020; - QSizePolicyLabel = $00000040; - QSizePolicyLine = $00000080; - QSizePolicyLineEdit = $00000100; - QSizePolicyPushButton = $00000200; - QSizePolicyRadioButton = $00000400; - QSizePolicySlider = $00000800; - QSizePolicySpinBox = $00001000; - QSizePolicyTabWidget = $00002000; - QSizePolicyToolButton = $00004000; - type QSizePolicyPolicy = cardinal; // QSizePolicy::Policy (4) @@ -2455,14 +2376,6 @@ function QKeySequence_matches(handle: QKeySequenceH; seq: QKeySequenceH): QKeySe procedure QKeySequence_mnemonic(retval: QKeySequenceH; text: PWideString); cdecl; external QtIntf name 'QKeySequence_mnemonic'; function QKeySequence_isDetached(handle: QKeySequenceH): Boolean; cdecl; external QtIntf name 'QKeySequence_isDetached'; -type - QWidgetRenderFlag = cardinal; // QWidget::RenderFlag - QWidgetRenderFlags = QWidgetRenderFlag; //QFlags<> (3) -const - QWidgetDrawWindowBackground = $1; - QWidgetDrawChildren = $2; - QWidgetIgnoreMask = $4; - function QWidget_create(parent: QWidgetH = nil; f: QtWindowFlags = 0): QWidgetH; cdecl; external QtIntf name 'QWidget_create'; procedure QWidget_destroy(handle: QWidgetH); cdecl; external QtIntf name 'QWidget_destroy'; @@ -2548,7 +2461,6 @@ procedure QWidget_setMask(handle: QWidgetH; p1: QBitmapH); overload; cdecl; exte procedure QWidget_setMask(handle: QWidgetH; p1: QRegionH); overload; cdecl; external QtIntf name 'QWidget_setMask2'; procedure QWidget_mask(handle: QWidgetH; retval: QRegionH); cdecl; external QtIntf name 'QWidget_mask'; procedure QWidget_clearMask(handle: QWidgetH); cdecl; external QtIntf name 'QWidget_clearMask'; -procedure QWidget_render(handle: QWidgetH; target: QPaintDeviceH; targetOffset: PPoint; sourceRegion: QRegionH; renderFlags: QWidgetRenderFlags); cdecl; external QtIntf name 'QWidget_render'; procedure QWidget_setWindowTitle(handle: QWidgetH; p1: PWideString); cdecl; external QtIntf name 'QWidget_setWindowTitle'; procedure QWidget_setStyleSheet(handle: QWidgetH; styleSheet: PWideString); cdecl; external QtIntf name 'QWidget_setStyleSheet'; procedure QWidget_styleSheet(handle: QWidgetH; retval: PWideString); cdecl; external QtIntf name 'QWidget_styleSheet'; @@ -2575,9 +2487,6 @@ procedure QWidget_setAccessibleDescription(handle: QWidgetH; description: PWideS procedure QWidget_setLayoutDirection(handle: QWidgetH; direction: QtLayoutDirection); cdecl; external QtIntf name 'QWidget_setLayoutDirection'; function QWidget_layoutDirection(handle: QWidgetH): QtLayoutDirection; cdecl; external QtIntf name 'QWidget_layoutDirection'; procedure QWidget_unsetLayoutDirection(handle: QWidgetH); cdecl; external QtIntf name 'QWidget_unsetLayoutDirection'; -procedure QWidget_setLocale(handle: QWidgetH; locale: QLocaleH); cdecl; external QtIntf name 'QWidget_setLocale'; -procedure QWidget_locale(handle: QWidgetH; retval: QLocaleH); cdecl; external QtIntf name 'QWidget_locale'; -procedure QWidget_unsetLocale(handle: QWidgetH); cdecl; external QtIntf name 'QWidget_unsetLocale'; function QWidget_isRightToLeft(handle: QWidgetH): Boolean; cdecl; external QtIntf name 'QWidget_isRightToLeft'; function QWidget_isLeftToRight(handle: QWidgetH): Boolean; cdecl; external QtIntf name 'QWidget_isLeftToRight'; procedure QWidget_setFocus(handle: QWidgetH); overload; cdecl; external QtIntf name 'QWidget_setFocus'; @@ -2701,10 +2610,6 @@ procedure QWidget_inputMethodQuery(handle: QWidgetH; retval: QVariantH; p1: QtIn function QWidget_getDC(handle: QWidgetH): HDC; cdecl; external QtIntf name 'QWidget_getDC'; procedure QWidget_releaseDC(handle: QWidgetH; p1: HDC); cdecl; external QtIntf name 'QWidget_releaseDC'; {$endif} -{$ifdef DARWIN } -function QWidget_macQDHandle(handle: QWidgetH): QtHANDLE; cdecl; external QtIntf name 'QWidget_macQDHandle'; -function QWidget_macCGHandle(handle: QWidgetH): QtHANDLE; cdecl; external QtIntf name 'QWidget_macCGHandle'; -{$endif} function QWidget_to_QPaintDevice(handle: QWidgetH): QPaintDeviceH; cdecl; external QtIntf name 'QWidget_to_QPaintDevice'; type @@ -2727,7 +2632,6 @@ function QLayoutItem_layout(handle: QLayoutItemH): QLayoutH; cdecl; external QtI function QLayoutItem_spacerItem(handle: QLayoutItemH): QSpacerItemH; cdecl; external QtIntf name 'QLayoutItem_spacerItem'; function QLayoutItem_alignment(handle: QLayoutItemH): QtAlignment; cdecl; external QtIntf name 'QLayoutItem_alignment'; procedure QLayoutItem_setAlignment(handle: QLayoutItemH; a: QtAlignment); cdecl; external QtIntf name 'QLayoutItem_setAlignment'; -function QLayoutItem_controlTypes(handle: QLayoutItemH): QSizePolicyControlTypes; cdecl; external QtIntf name 'QLayoutItem_controlTypes'; function QSpacerItem_create(w: Integer; h: Integer; hData: QSizePolicyPolicy = QSizePolicyMinimum; vData: QSizePolicyPolicy = QSizePolicyMinimum): QSpacerItemH; cdecl; external QtIntf name 'QSpacerItem_create'; procedure QSpacerItem_destroy(handle: QSpacerItemH); cdecl; external QtIntf name 'QSpacerItem_destroy'; @@ -2763,9 +2667,6 @@ function QLayout_margin(handle: QLayoutH): Integer; cdecl; external QtIntf name function QLayout_spacing(handle: QLayoutH): Integer; cdecl; external QtIntf name 'QLayout_spacing'; procedure QLayout_setMargin(handle: QLayoutH; p1: Integer); cdecl; external QtIntf name 'QLayout_setMargin'; procedure QLayout_setSpacing(handle: QLayoutH; p1: Integer); cdecl; external QtIntf name 'QLayout_setSpacing'; -procedure QLayout_setContentsMargins(handle: QLayoutH; left: Integer; top: Integer; right: Integer; bottom: Integer); cdecl; external QtIntf name 'QLayout_setContentsMargins'; -procedure QLayout_getContentsMargins(handle: QLayoutH; left: PInteger; top: PInteger; right: PInteger; bottom: PInteger); cdecl; external QtIntf name 'QLayout_getContentsMargins'; -procedure QLayout_contentsRect(handle: QLayoutH; retval: PRect); cdecl; external QtIntf name 'QLayout_contentsRect'; function QLayout_setAlignment(handle: QLayoutH; w: QWidgetH; alignment: QtAlignment): Boolean; overload; cdecl; external QtIntf name 'QLayout_setAlignment'; function QLayout_setAlignment(handle: QLayoutH; l: QLayoutH; alignment: QtAlignment): Boolean; overload; cdecl; external QtIntf name 'QLayout_setAlignment2'; procedure QLayout_setSizeConstraint(handle: QLayoutH; p1: QLayoutSizeConstraint); cdecl; external QtIntf name 'QLayout_setSizeConstraint'; @@ -2825,8 +2726,6 @@ procedure QBoxLayout_insertSpacing(handle: QBoxLayoutH; index: Integer; size: In procedure QBoxLayout_insertStretch(handle: QBoxLayoutH; index: Integer; stretch: Integer = 0); cdecl; external QtIntf name 'QBoxLayout_insertStretch'; procedure QBoxLayout_insertWidget(handle: QBoxLayoutH; index: Integer; widget: QWidgetH; stretch: Integer = 0; alignment: QtAlignment = 0); cdecl; external QtIntf name 'QBoxLayout_insertWidget'; procedure QBoxLayout_insertLayout(handle: QBoxLayoutH; index: Integer; layout: QLayoutH; stretch: Integer = 0); cdecl; external QtIntf name 'QBoxLayout_insertLayout'; -function QBoxLayout_spacing(handle: QBoxLayoutH): Integer; cdecl; external QtIntf name 'QBoxLayout_spacing'; -procedure QBoxLayout_setSpacing(handle: QBoxLayoutH; spacing: Integer); cdecl; external QtIntf name 'QBoxLayout_setSpacing'; function QBoxLayout_setStretchFactor(handle: QBoxLayoutH; w: QWidgetH; stretch: Integer): Boolean; overload; cdecl; external QtIntf name 'QBoxLayout_setStretchFactor'; function QBoxLayout_setStretchFactor(handle: QBoxLayoutH; l: QLayoutH; stretch: Integer): Boolean; overload; cdecl; external QtIntf name 'QBoxLayout_setStretchFactor2'; procedure QBoxLayout_sizeHint(handle: QBoxLayoutH; retval: PSize); cdecl; external QtIntf name 'QBoxLayout_sizeHint'; @@ -3160,12 +3059,6 @@ function QGridLayout_create(): QGridLayoutH; overload; cdecl; external QtIntf na procedure QGridLayout_sizeHint(handle: QGridLayoutH; retval: PSize); cdecl; external QtIntf name 'QGridLayout_sizeHint'; procedure QGridLayout_minimumSize(handle: QGridLayoutH; retval: PSize); cdecl; external QtIntf name 'QGridLayout_minimumSize'; procedure QGridLayout_maximumSize(handle: QGridLayoutH; retval: PSize); cdecl; external QtIntf name 'QGridLayout_maximumSize'; -procedure QGridLayout_setHorizontalSpacing(handle: QGridLayoutH; spacing: Integer); cdecl; external QtIntf name 'QGridLayout_setHorizontalSpacing'; -function QGridLayout_horizontalSpacing(handle: QGridLayoutH): Integer; cdecl; external QtIntf name 'QGridLayout_horizontalSpacing'; -procedure QGridLayout_setVerticalSpacing(handle: QGridLayoutH; spacing: Integer); cdecl; external QtIntf name 'QGridLayout_setVerticalSpacing'; -function QGridLayout_verticalSpacing(handle: QGridLayoutH): Integer; cdecl; external QtIntf name 'QGridLayout_verticalSpacing'; -procedure QGridLayout_setSpacing(handle: QGridLayoutH; spacing: Integer); cdecl; external QtIntf name 'QGridLayout_setSpacing'; -function QGridLayout_spacing(handle: QGridLayoutH): Integer; cdecl; external QtIntf name 'QGridLayout_spacing'; procedure QGridLayout_setRowStretch(handle: QGridLayoutH; row: Integer; stretch: Integer); cdecl; external QtIntf name 'QGridLayout_setRowStretch'; procedure QGridLayout_setColumnStretch(handle: QGridLayoutH; column: Integer; stretch: Integer); cdecl; external QtIntf name 'QGridLayout_setColumnStretch'; function QGridLayout_rowStretch(handle: QGridLayoutH; row: Integer): Integer; cdecl; external QtIntf name 'QGridLayout_rowStretch'; @@ -3394,13 +3287,7 @@ procedure QColor_fromHsvF(retval: PQColor; h: Double; s: Double; v: Double; a: D procedure QColor_fromCmyk(retval: PQColor; c: Integer; m: Integer; y: Integer; k: Integer; a: Integer = 255); cdecl; external QtIntf name 'QColor_fromCmyk'; procedure QColor_fromCmykF(retval: PQColor; c: Double; m: Double; y: Double; k: Double; a: Double = 1.0); cdecl; external QtIntf name 'QColor_fromCmykF'; procedure QColor_light(handle: QColorH; retval: PQColor; f: Integer = 150); cdecl; external QtIntf name 'QColor_light'; -procedure QColor_lighter(handle: QColorH; retval: PQColor; f: Integer = 150); cdecl; external QtIntf name 'QColor_lighter'; procedure QColor_dark(handle: QColorH; retval: PQColor; f: Integer = 200); cdecl; external QtIntf name 'QColor_dark'; -procedure QColor_darker(handle: QColorH; retval: PQColor; f: Integer = 200); cdecl; external QtIntf name 'QColor_darker'; -{$ifdef LINUX } -function QColor_allowX11ColorNames(): Boolean; cdecl; external QtIntf name 'QColor_allowX11ColorNames'; -procedure QColor_setAllowX11ColorNames(enabled: Boolean); cdecl; external QtIntf name 'QColor_setAllowX11ColorNames'; -{$endif} function QMatrix_create(): QMatrixH; overload; cdecl; external QtIntf name 'QMatrix_create'; procedure QMatrix_destroy(handle: QMatrixH); cdecl; external QtIntf name 'QMatrix_destroy'; @@ -3445,7 +3332,7 @@ type QGradientPadSpread, QGradientReflectSpread, QGradientRepeatSpread ); QGradientCoordinateMode = ( // QGradient::CoordinateMode (1) - QGradientLogicalMode, QGradientStretchToDeviceMode, QGradientObjectBoundingMode ); + QGradientLogicalMode, QGradientStretchToDeviceMode ); function QBrush_create(): QBrushH; overload; cdecl; external QtIntf name 'QBrush_create'; procedure QBrush_destroy(handle: QBrushH); cdecl; external QtIntf name 'QBrush_destroy'; @@ -3462,8 +3349,6 @@ function QBrush_style(handle: QBrushH): QtBrushStyle; cdecl; external QtIntf nam procedure QBrush_setStyle(handle: QBrushH; p1: QtBrushStyle); cdecl; external QtIntf name 'QBrush_setStyle'; function QBrush_matrix(handle: QBrushH): QMatrixH; cdecl; external QtIntf name 'QBrush_matrix'; procedure QBrush_setMatrix(handle: QBrushH; mat: QMatrixH); cdecl; external QtIntf name 'QBrush_setMatrix'; -procedure QBrush_transform(handle: QBrushH; retval: QTransformH); cdecl; external QtIntf name 'QBrush_transform'; -procedure QBrush_setTransform(handle: QBrushH; p1: QTransformH); cdecl; external QtIntf name 'QBrush_setTransform'; procedure QBrush_texture(handle: QBrushH; retval: QPixmapH); cdecl; external QtIntf name 'QBrush_texture'; procedure QBrush_setTexture(handle: QBrushH; pixmap: QPixmapH); cdecl; external QtIntf name 'QBrush_setTexture'; procedure QBrush_textureImage(handle: QBrushH; retval: QImageH); cdecl; external QtIntf name 'QBrush_textureImage'; @@ -3473,7 +3358,6 @@ procedure QBrush_setColor(handle: QBrushH; color: PQColor); overload; cdecl; ext procedure QBrush_setColor(handle: QBrushH; color: QtGlobalColor); overload; cdecl; external QtIntf name 'QBrush_setColor2'; function QBrush_gradient(handle: QBrushH): QGradientH; cdecl; external QtIntf name 'QBrush_gradient'; function QBrush_isOpaque(handle: QBrushH): Boolean; cdecl; external QtIntf name 'QBrush_isOpaque'; -function QBrush_isDetached(handle: QBrushH): Boolean; cdecl; external QtIntf name 'QBrush_isDetached'; function QGradient_create(): QGradientH; cdecl; external QtIntf name 'QGradient_create'; procedure QGradient_destroy(handle: QGradientH); cdecl; external QtIntf name 'QGradient_destroy'; @@ -3528,8 +3412,6 @@ function QPen_create(brush: QBrushH; width: Double; s: QtPenStyle = QtSolidLine; function QPen_create(pen: QPenH): QPenH; overload; cdecl; external QtIntf name 'QPen_create5'; function QPen_style(handle: QPenH): QtPenStyle; cdecl; external QtIntf name 'QPen_style'; procedure QPen_setStyle(handle: QPenH; p1: QtPenStyle); cdecl; external QtIntf name 'QPen_setStyle'; -function QPen_dashOffset(handle: QPenH): Double; cdecl; external QtIntf name 'QPen_dashOffset'; -procedure QPen_setDashOffset(handle: QPenH; doffset: Double); cdecl; external QtIntf name 'QPen_setDashOffset'; function QPen_miterLimit(handle: QPenH): Double; cdecl; external QtIntf name 'QPen_miterLimit'; procedure QPen_setMiterLimit(handle: QPenH; limit: Double); cdecl; external QtIntf name 'QPen_setMiterLimit'; function QPen_widthF(handle: QPenH): Double; cdecl; external QtIntf name 'QPen_widthF'; @@ -3545,8 +3427,6 @@ function QPen_capStyle(handle: QPenH): QtPenCapStyle; cdecl; external QtIntf nam procedure QPen_setCapStyle(handle: QPenH; pcs: QtPenCapStyle); cdecl; external QtIntf name 'QPen_setCapStyle'; function QPen_joinStyle(handle: QPenH): QtPenJoinStyle; cdecl; external QtIntf name 'QPen_joinStyle'; procedure QPen_setJoinStyle(handle: QPenH; pcs: QtPenJoinStyle); cdecl; external QtIntf name 'QPen_setJoinStyle'; -function QPen_isCosmetic(handle: QPenH): Boolean; cdecl; external QtIntf name 'QPen_isCosmetic'; -procedure QPen_setCosmetic(handle: QPenH; cosmetic: Boolean); cdecl; external QtIntf name 'QPen_setCosmetic'; function QPen_isDetached(handle: QPenH): Boolean; cdecl; external QtIntf name 'QPen_isDetached'; function QPolygon_create(): QPolygonH; overload; cdecl; external QtIntf name 'QPolygon_create'; @@ -3565,10 +3445,6 @@ procedure QPolygon_setPoint(handle: QPolygonH; index: Integer; p: PPoint); overl procedure QPolygon_setPoints(handle: QPolygonH; nPoints: Integer; points: PInteger); overload; cdecl; external QtIntf name 'QPolygon_setPoints'; procedure QPolygon_putPoints(handle: QPolygonH; index: Integer; nPoints: Integer; points: PInteger); overload; cdecl; external QtIntf name 'QPolygon_putPoints'; procedure QPolygon_putPoints(handle: QPolygonH; index: Integer; nPoints: Integer; from: QPolygonH; fromIndex: Integer = 0); overload; cdecl; external QtIntf name 'QPolygon_putPoints3'; -function QPolygon_containsPoint(handle: QPolygonH; pt: PPoint; fillRule: QtFillRule): Boolean; cdecl; external QtIntf name 'QPolygon_containsPoint'; -procedure QPolygon_united(handle: QPolygonH; retval: QPolygonH; r: QPolygonH); cdecl; external QtIntf name 'QPolygon_united'; -procedure QPolygon_intersected(handle: QPolygonH; retval: QPolygonH; r: QPolygonH); cdecl; external QtIntf name 'QPolygon_intersected'; -procedure QPolygon_subtracted(handle: QPolygonH; retval: QPolygonH; r: QPolygonH); cdecl; external QtIntf name 'QPolygon_subtracted'; function QPolygonF_create(): QPolygonFH; overload; cdecl; external QtIntf name 'QPolygonF_create'; procedure QPolygonF_destroy(handle: QPolygonFH); cdecl; external QtIntf name 'QPolygonF_destroy'; @@ -3581,19 +3457,13 @@ procedure QPolygonF_translate(handle: QPolygonFH; offset: QPointFH); overload; c procedure QPolygonF_toPolygon(handle: QPolygonFH; retval: QPolygonH); cdecl; external QtIntf name 'QPolygonF_toPolygon'; function QPolygonF_isClosed(handle: QPolygonFH): Boolean; cdecl; external QtIntf name 'QPolygonF_isClosed'; procedure QPolygonF_boundingRect(handle: QPolygonFH; retval: QRectFH); cdecl; external QtIntf name 'QPolygonF_boundingRect'; -function QPolygonF_containsPoint(handle: QPolygonFH; pt: QPointFH; fillRule: QtFillRule): Boolean; cdecl; external QtIntf name 'QPolygonF_containsPoint'; -procedure QPolygonF_united(handle: QPolygonFH; retval: QPolygonFH; r: QPolygonFH); cdecl; external QtIntf name 'QPolygonF_united'; -procedure QPolygonF_intersected(handle: QPolygonFH; retval: QPolygonFH; r: QPolygonFH); cdecl; external QtIntf name 'QPolygonF_intersected'; -procedure QPolygonF_subtracted(handle: QPolygonFH; retval: QPolygonFH; r: QPolygonFH); cdecl; external QtIntf name 'QPolygonF_subtracted'; type QPainterCompositionMode = ( // QPainter::CompositionMode (1) QPainterCompositionMode_SourceOver, QPainterCompositionMode_DestinationOver, QPainterCompositionMode_Clear, QPainterCompositionMode_Source, QPainterCompositionMode_Destination, QPainterCompositionMode_SourceIn, QPainterCompositionMode_DestinationIn, QPainterCompositionMode_SourceOut, QPainterCompositionMode_DestinationOut, QPainterCompositionMode_SourceAtop, QPainterCompositionMode_DestinationAtop, - QPainterCompositionMode_Xor, QPainterCompositionMode_Plus, QPainterCompositionMode_Multiply, QPainterCompositionMode_Screen, QPainterCompositionMode_Overlay, QPainterCompositionMode_Darken, - QPainterCompositionMode_Lighten, QPainterCompositionMode_ColorDodge, QPainterCompositionMode_ColorBurn, QPainterCompositionMode_HardLight, QPainterCompositionMode_SoftLight, QPainterCompositionMode_Difference, - QPainterCompositionMode_Exclusion ); + QPainterCompositionMode_Xor ); type QPainterRenderHint = cardinal; // QPainter::RenderHint @@ -3602,7 +3472,6 @@ const QPainterAntialiasing = $01; QPainterTextAntialiasing = $02; QPainterSmoothPixmapTransform = $04; - QPainterHighQualityAntialiasing = $08; function QPainter_create(): QPainterH; overload; cdecl; external QtIntf name 'QPainter_create'; procedure QPainter_destroy(handle: QPainterH); cdecl; external QtIntf name 'QPainter_destroy'; @@ -3650,16 +3519,9 @@ procedure QPainter_setMatrix(handle: QPainterH; matrix: QMatrixH; combine: Boole function QPainter_matrix(handle: QPainterH): QMatrixH; cdecl; external QtIntf name 'QPainter_matrix'; function QPainter_deviceMatrix(handle: QPainterH): QMatrixH; cdecl; external QtIntf name 'QPainter_deviceMatrix'; procedure QPainter_resetMatrix(handle: QPainterH); cdecl; external QtIntf name 'QPainter_resetMatrix'; -procedure QPainter_setTransform(handle: QPainterH; transform: QTransformH; combine: Boolean = False); cdecl; external QtIntf name 'QPainter_setTransform'; -function QPainter_transform(handle: QPainterH): QTransformH; cdecl; external QtIntf name 'QPainter_transform'; -function QPainter_deviceTransform(handle: QPainterH): QTransformH; cdecl; external QtIntf name 'QPainter_deviceTransform'; -procedure QPainter_resetTransform(handle: QPainterH); cdecl; external QtIntf name 'QPainter_resetTransform'; procedure QPainter_setWorldMatrix(handle: QPainterH; matrix: QMatrixH; combine: Boolean = False); cdecl; external QtIntf name 'QPainter_setWorldMatrix'; function QPainter_worldMatrix(handle: QPainterH): QMatrixH; cdecl; external QtIntf name 'QPainter_worldMatrix'; -procedure QPainter_setWorldTransform(handle: QPainterH; matrix: QTransformH; combine: Boolean = False); cdecl; external QtIntf name 'QPainter_setWorldTransform'; -function QPainter_worldTransform(handle: QPainterH): QTransformH; cdecl; external QtIntf name 'QPainter_worldTransform'; procedure QPainter_combinedMatrix(handle: QPainterH; retval: QMatrixH); cdecl; external QtIntf name 'QPainter_combinedMatrix'; -procedure QPainter_combinedTransform(handle: QPainterH; retval: QTransformH); cdecl; external QtIntf name 'QPainter_combinedTransform'; procedure QPainter_setMatrixEnabled(handle: QPainterH; enabled: Boolean); cdecl; external QtIntf name 'QPainter_setMatrixEnabled'; function QPainter_matrixEnabled(handle: QPainterH): Boolean; cdecl; external QtIntf name 'QPainter_matrixEnabled'; procedure QPainter_setWorldMatrixEnabled(handle: QPainterH; enabled: Boolean); cdecl; external QtIntf name 'QPainter_setWorldMatrixEnabled'; @@ -3777,7 +3639,6 @@ procedure QPainter_eraseRect(handle: QPainterH; p1: PRect); overload; cdecl; ext procedure QPainter_setRenderHint(handle: QPainterH; hint: QPainterRenderHint; _on: Boolean = True); cdecl; external QtIntf name 'QPainter_setRenderHint'; procedure QPainter_setRenderHints(handle: QPainterH; hints: QPainterRenderHints; _on: Boolean = True); cdecl; external QtIntf name 'QPainter_setRenderHints'; function QPainter_renderHints(handle: QPainterH): QPainterRenderHints; cdecl; external QtIntf name 'QPainter_renderHints'; -function QPainter_testRenderHint(handle: QPainterH; hint: QPainterRenderHint): Boolean; cdecl; external QtIntf name 'QPainter_testRenderHint'; function QPainter_paintEngine(handle: QPainterH): QPaintEngineH; cdecl; external QtIntf name 'QPainter_paintEngine'; procedure QPainter_setRedirected(device: QPaintDeviceH; replacement: QPaintDeviceH; offset: PPoint = nil); cdecl; external QtIntf name 'QPainter_setRedirected'; function QPainter_redirected(device: QPaintDeviceH; offset: PPoint = nil): QPaintDeviceH; cdecl; external QtIntf name 'QPainter_redirected'; @@ -3806,8 +3667,6 @@ const QPaintEngineBrushStroke = $00000800; QPaintEngineConstantOpacity = $00001000; QPaintEngineMaskedBrush = $00002000; - QPaintEnginePerspectiveTransform = $00004000; - QPaintEngineBlendModes = $00008000; QPaintEnginePaintOutsidePaintEvent = $20000000; QPaintEngineAllFeatures = $ffffffff; @@ -3844,7 +3703,6 @@ type QPaintEnginePicture, QPaintEngineSVG, QPaintEngineRaster, - QPaintEngineDirect3D, QPaintEngineUser = 50, QPaintEngineMaxUser = 100 ); @@ -3976,7 +3834,7 @@ type QPrinterPaperSource = ( // QPrinter::PaperSource (1) QPrinterOnlyOne, QPrinterLower, QPrinterMiddle, QPrinterManual, QPrinterEnvelope, QPrinterEnvelopeManual, QPrinterAuto, QPrinterTractor, QPrinterSmallFormat, QPrinterLargeFormat, QPrinterLargeCapacity, - QPrinterCassette, QPrinterFormSource, QPrinterMaxPageSource ); + QPrinterCassette, QPrinterFormSource ); QPrinterPrinterState = ( // QPrinter::PrinterState (1) QPrinterIdle, QPrinterActive, QPrinterAborted, QPrinterError ); @@ -4118,36 +3976,20 @@ procedure QPainterPath_addText(handle: QPainterPathH; point: QPointFH; f: QFontH procedure QPainterPath_addText(handle: QPainterPathH; x: Double; y: Double; f: QFontH; text: PWideString); overload; cdecl; external QtIntf name 'QPainterPath_addText2'; procedure QPainterPath_addPath(handle: QPainterPathH; path: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_addPath'; procedure QPainterPath_addRegion(handle: QPainterPathH; region: QRegionH); cdecl; external QtIntf name 'QPainterPath_addRegion'; -procedure QPainterPath_addRoundRect(handle: QPainterPathH; rect: QRectFH; xRnd: Integer; yRnd: Integer); overload; cdecl; external QtIntf name 'QPainterPath_addRoundRect'; -procedure QPainterPath_addRoundRect(handle: QPainterPathH; x: Double; y: Double; w: Double; h: Double; xRnd: Integer; yRnd: Integer); overload; cdecl; external QtIntf name 'QPainterPath_addRoundRect2'; -procedure QPainterPath_addRoundRect(handle: QPainterPathH; rect: QRectFH; roundness: Integer); overload; cdecl; external QtIntf name 'QPainterPath_addRoundRect3'; -procedure QPainterPath_addRoundRect(handle: QPainterPathH; x: Double; y: Double; w: Double; h: Double; roundness: Integer); overload; cdecl; external QtIntf name 'QPainterPath_addRoundRect4'; procedure QPainterPath_connectPath(handle: QPainterPathH; path: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_connectPath'; function QPainterPath_contains(handle: QPainterPathH; pt: QPointFH): Boolean; overload; cdecl; external QtIntf name 'QPainterPath_contains'; function QPainterPath_contains(handle: QPainterPathH; rect: QRectFH): Boolean; overload; cdecl; external QtIntf name 'QPainterPath_contains2'; -function QPainterPath_intersects(handle: QPainterPathH; rect: QRectFH): Boolean; overload; cdecl; external QtIntf name 'QPainterPath_intersects'; +function QPainterPath_intersects(handle: QPainterPathH; rect: QRectFH): Boolean; cdecl; external QtIntf name 'QPainterPath_intersects'; procedure QPainterPath_boundingRect(handle: QPainterPathH; retval: QRectFH); cdecl; external QtIntf name 'QPainterPath_boundingRect'; procedure QPainterPath_controlPointRect(handle: QPainterPathH; retval: QRectFH); cdecl; external QtIntf name 'QPainterPath_controlPointRect'; function QPainterPath_fillRule(handle: QPainterPathH): QtFillRule; cdecl; external QtIntf name 'QPainterPath_fillRule'; procedure QPainterPath_setFillRule(handle: QPainterPathH; fillRule: QtFillRule); cdecl; external QtIntf name 'QPainterPath_setFillRule'; function QPainterPath_isEmpty(handle: QPainterPathH): Boolean; cdecl; external QtIntf name 'QPainterPath_isEmpty'; procedure QPainterPath_toReversed(handle: QPainterPathH; retval: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_toReversed'; -procedure QPainterPath_toFillPolygon(handle: QPainterPathH; retval: QPolygonFH; matrix: QMatrixH = nil); overload; cdecl; external QtIntf name 'QPainterPath_toFillPolygon'; -procedure QPainterPath_toFillPolygon(handle: QPainterPathH; retval: QPolygonFH; matrix: QTransformH); overload; cdecl; external QtIntf name 'QPainterPath_toFillPolygon2'; +procedure QPainterPath_toFillPolygon(handle: QPainterPathH; retval: QPolygonFH; matrix: QMatrixH = nil); cdecl; external QtIntf name 'QPainterPath_toFillPolygon'; function QPainterPath_elementCount(handle: QPainterPathH): Integer; cdecl; external QtIntf name 'QPainterPath_elementCount'; function QPainterPath_elementAt(handle: QPainterPathH; i: Integer): QPainterPathElementH; cdecl; external QtIntf name 'QPainterPath_elementAt'; procedure QPainterPath_setElementPositionAt(handle: QPainterPathH; i: Integer; x: Double; y: Double); cdecl; external QtIntf name 'QPainterPath_setElementPositionAt'; -function QPainterPath_length(handle: QPainterPathH): Double; cdecl; external QtIntf name 'QPainterPath_length'; -function QPainterPath_percentAtLength(handle: QPainterPathH; t: Double): Double; cdecl; external QtIntf name 'QPainterPath_percentAtLength'; -procedure QPainterPath_pointAtPercent(handle: QPainterPathH; retval: QPointFH; t: Double); cdecl; external QtIntf name 'QPainterPath_pointAtPercent'; -function QPainterPath_angleAtPercent(handle: QPainterPathH; t: Double): Double; cdecl; external QtIntf name 'QPainterPath_angleAtPercent'; -function QPainterPath_slopeAtPercent(handle: QPainterPathH; t: Double): Double; cdecl; external QtIntf name 'QPainterPath_slopeAtPercent'; -function QPainterPath_intersects(handle: QPainterPathH; p: QPainterPathH): Boolean; overload; cdecl; external QtIntf name 'QPainterPath_intersects2'; -function QPainterPath_contains(handle: QPainterPathH; p: QPainterPathH): Boolean; overload; cdecl; external QtIntf name 'QPainterPath_contains3'; -procedure QPainterPath_united(handle: QPainterPathH; retval: QPainterPathH; r: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_united'; -procedure QPainterPath_intersected(handle: QPainterPathH; retval: QPainterPathH; r: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_intersected'; -procedure QPainterPath_subtracted(handle: QPainterPathH; retval: QPainterPathH; r: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_subtracted'; -procedure QPainterPath_subtractedInverted(handle: QPainterPathH; retval: QPainterPathH; r: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_subtractedInverted'; function QPainterPathStroker_create(): QPainterPathStrokerH; cdecl; external QtIntf name 'QPainterPathStroker_create'; @@ -4163,8 +4005,6 @@ function QPainterPathStroker_miterLimit(handle: QPainterPathStrokerH): Double; c procedure QPainterPathStroker_setCurveThreshold(handle: QPainterPathStrokerH; threshold: Double); cdecl; external QtIntf name 'QPainterPathStroker_setCurveThreshold'; function QPainterPathStroker_curveThreshold(handle: QPainterPathStrokerH): Double; cdecl; external QtIntf name 'QPainterPathStroker_curveThreshold'; procedure QPainterPathStroker_setDashPattern(handle: QPainterPathStrokerH; p1: QtPenStyle); cdecl; external QtIntf name 'QPainterPathStroker_setDashPattern'; -procedure QPainterPathStroker_setDashOffset(handle: QPainterPathStrokerH; offset: Double); cdecl; external QtIntf name 'QPainterPathStroker_setDashOffset'; -function QPainterPathStroker_dashOffset(handle: QPainterPathStrokerH): Double; cdecl; external QtIntf name 'QPainterPathStroker_dashOffset'; procedure QPainterPathStroker_createStroke(handle: QPainterPathStrokerH; retval: QPainterPathH; path: QPainterPathH); cdecl; external QtIntf name 'QPainterPathStroker_createStroke'; @@ -4286,9 +4126,6 @@ procedure QFont_resolve(handle: QFontH; mask: LongWord); overload; cdecl; extern {$ifdef MSWINDOWS } function QFont_handle(handle: QFontH): HFONT; overload; cdecl; external QtIntf name 'QFont_handle2'; {$endif} -{$ifdef DARWIN } -function QFont_macFontID(handle: QFontH): LongWord; cdecl; external QtIntf name 'QFont_macFontID'; -{$endif} type QFontDatabaseWritingSystem = cardinal; // QFontDatabase::WritingSystem (4) @@ -4485,7 +4322,6 @@ procedure QFontMetrics_boundingRect(handle: QFontMetricsH; retval: PRect; text: procedure QFontMetrics_boundingRect(handle: QFontMetricsH; retval: PRect; r: PRect; flags: Integer; text: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); overload; cdecl; external QtIntf name 'QFontMetrics_boundingRect3'; procedure QFontMetrics_boundingRect(handle: QFontMetricsH; retval: PRect; x: Integer; y: Integer; w: Integer; h: Integer; flags: Integer; text: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); overload; cdecl; external QtIntf name 'QFontMetrics_boundingRect4'; procedure QFontMetrics_size(handle: QFontMetricsH; retval: PSize; flags: Integer; str: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); cdecl; external QtIntf name 'QFontMetrics_size'; -procedure QFontMetrics_tightBoundingRect(handle: QFontMetricsH; retval: PRect; text: PWideString); cdecl; external QtIntf name 'QFontMetrics_tightBoundingRect'; procedure QFontMetrics_elidedText(handle: QFontMetricsH; retval: PWideString; text: PWideString; mode: QtTextElideMode; width: Integer; flags: Integer = 0); cdecl; external QtIntf name 'QFontMetrics_elidedText'; function QFontMetrics_underlinePos(handle: QFontMetricsH): Integer; cdecl; external QtIntf name 'QFontMetrics_underlinePos'; function QFontMetrics_overlinePos(handle: QFontMetricsH): Integer; cdecl; external QtIntf name 'QFontMetrics_overlinePos'; @@ -4515,7 +4351,6 @@ procedure QFontMetricsF_boundingRect(handle: QFontMetricsFH; retval: QRectFH; _s procedure QFontMetricsF_boundingRect(handle: QFontMetricsFH; retval: QRectFH; p1: PWideChar); overload; cdecl; external QtIntf name 'QFontMetricsF_boundingRect2'; procedure QFontMetricsF_boundingRect(handle: QFontMetricsFH; retval: QRectFH; r: QRectFH; flags: Integer; _string: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); overload; cdecl; external QtIntf name 'QFontMetricsF_boundingRect3'; procedure QFontMetricsF_size(handle: QFontMetricsFH; retval: QSizeFH; flags: Integer; str: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); cdecl; external QtIntf name 'QFontMetricsF_size'; -procedure QFontMetricsF_tightBoundingRect(handle: QFontMetricsFH; retval: QRectFH; text: PWideString); cdecl; external QtIntf name 'QFontMetricsF_tightBoundingRect'; procedure QFontMetricsF_elidedText(handle: QFontMetricsFH; retval: PWideString; text: PWideString; mode: QtTextElideMode; width: Double; flags: Integer = 0); cdecl; external QtIntf name 'QFontMetricsF_elidedText'; function QFontMetricsF_underlinePos(handle: QFontMetricsFH): Double; cdecl; external QtIntf name 'QFontMetricsF_underlinePos'; function QFontMetricsF_overlinePos(handle: QFontMetricsFH): Double; cdecl; external QtIntf name 'QFontMetricsF_overlinePos'; @@ -4616,8 +4451,6 @@ procedure QTextDocument_undo(handle: QTextDocumentH; cursor: QTextCursorH); over procedure QTextDocument_redo(handle: QTextDocumentH; cursor: QTextCursorH); overload; cdecl; external QtIntf name 'QTextDocument_redo'; function QTextDocument_maximumBlockCount(handle: QTextDocumentH): Integer; cdecl; external QtIntf name 'QTextDocument_maximumBlockCount'; procedure QTextDocument_setMaximumBlockCount(handle: QTextDocumentH; maximum: Integer); cdecl; external QtIntf name 'QTextDocument_setMaximumBlockCount'; -procedure QTextDocument_defaultTextOption(handle: QTextDocumentH; retval: QTextOptionH); cdecl; external QtIntf name 'QTextDocument_defaultTextOption'; -procedure QTextDocument_setDefaultTextOption(handle: QTextDocumentH; option: QTextOptionH); cdecl; external QtIntf name 'QTextDocument_setDefaultTextOption'; procedure QTextDocument_undo(handle: QTextDocumentH); overload; cdecl; external QtIntf name 'QTextDocument_undo2'; procedure QTextDocument_redo(handle: QTextDocumentH); overload; cdecl; external QtIntf name 'QTextDocument_redo2'; procedure QTextDocument_setModified(handle: QTextDocumentH; m: Boolean = True); cdecl; external QtIntf name 'QTextDocument_setModified'; @@ -4636,7 +4469,6 @@ function QIcon_create(pixmap: QPixmapH): QIconH; overload; cdecl; external QtInt function QIcon_create(other: QIconH): QIconH; overload; cdecl; external QtIntf name 'QIcon_create3'; function QIcon_create(fileName: PWideString): QIconH; overload; cdecl; external QtIntf name 'QIcon_create4'; function QIcon_create(engine: QIconEngineH): QIconH; overload; cdecl; external QtIntf name 'QIcon_create5'; -function QIcon_create(engine: QIconEngineV2H): QIconH; overload; cdecl; external QtIntf name 'QIcon_create6'; procedure QIcon_pixmap(handle: QIconH; retval: QPixmapH; size: PSize; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); overload; cdecl; external QtIntf name 'QIcon_pixmap'; procedure QIcon_pixmap(handle: QIconH; retval: QPixmapH; w: Integer; h: Integer; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); overload; cdecl; external QtIntf name 'QIcon_pixmap2'; procedure QIcon_pixmap(handle: QIconH; retval: QPixmapH; extent: Integer; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); overload; cdecl; external QtIntf name 'QIcon_pixmap3'; @@ -4645,9 +4477,7 @@ procedure QIcon_paint(handle: QIconH; painter: QPainterH; rect: PRect; alignment procedure QIcon_paint(handle: QIconH; painter: QPainterH; x: Integer; y: Integer; w: Integer; h: Integer; alignment: QtAlignment = QtAlignCenter; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); overload; cdecl; external QtIntf name 'QIcon_paint2'; function QIcon_isNull(handle: QIconH): Boolean; cdecl; external QtIntf name 'QIcon_isNull'; function QIcon_isDetached(handle: QIconH): Boolean; cdecl; external QtIntf name 'QIcon_isDetached'; -procedure QIcon_detach(handle: QIconH); cdecl; external QtIntf name 'QIcon_detach'; function QIcon_serialNumber(handle: QIconH): Integer; cdecl; external QtIntf name 'QIcon_serialNumber'; -function QIcon_cacheKey(handle: QIconH): int64; cdecl; external QtIntf name 'QIcon_cacheKey'; procedure QIcon_addPixmap(handle: QIconH; pixmap: QPixmapH; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); cdecl; external QtIntf name 'QIcon_addPixmap'; procedure QIcon_addFile(handle: QIconH; fileName: PWideString; size: PSize = nil; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); cdecl; external QtIntf name 'QIcon_addFile'; @@ -4683,8 +4513,7 @@ procedure QPixmap_setAlphaChannel(handle: QPixmapH; p1: QPixmapH); cdecl; extern function QPixmap_hasAlpha(handle: QPixmapH): Boolean; cdecl; external QtIntf name 'QPixmap_hasAlpha'; function QPixmap_hasAlphaChannel(handle: QPixmapH): Boolean; cdecl; external QtIntf name 'QPixmap_hasAlphaChannel'; procedure QPixmap_createHeuristicMask(handle: QPixmapH; retval: QBitmapH; clipTight: Boolean = True); cdecl; external QtIntf name 'QPixmap_createHeuristicMask'; -procedure QPixmap_createMaskFromColor(handle: QPixmapH; retval: QBitmapH; maskColor: PQColor); overload; cdecl; external QtIntf name 'QPixmap_createMaskFromColor'; -procedure QPixmap_createMaskFromColor(handle: QPixmapH; retval: QBitmapH; maskColor: PQColor; mode: QtMaskMode); overload; cdecl; external QtIntf name 'QPixmap_createMaskFromColor2'; +procedure QPixmap_createMaskFromColor(handle: QPixmapH; retval: QBitmapH; maskColor: PQColor); cdecl; external QtIntf name 'QPixmap_createMaskFromColor'; procedure QPixmap_grabWindow(retval: QPixmapH; p1: LongWord; x: Integer = 0; y: Integer = 0; w: Integer = -1; h: Integer = -1); cdecl; external QtIntf name 'QPixmap_grabWindow'; procedure QPixmap_grabWidget(retval: QPixmapH; widget: QWidgetH; rect: PRect); overload; cdecl; external QtIntf name 'QPixmap_grabWidget'; procedure QPixmap_grabWidget(retval: QPixmapH; widget: QWidgetH; x: Integer = 0; y: Integer = 0; w: Integer = -1; h: Integer = -1); overload; cdecl; external QtIntf name 'QPixmap_grabWidget2'; @@ -4692,10 +4521,8 @@ procedure QPixmap_scaled(handle: QPixmapH; retval: QPixmapH; w: Integer; h: Inte procedure QPixmap_scaled(handle: QPixmapH; retval: QPixmapH; s: PSize; aspectMode: QtAspectRatioMode = QtIgnoreAspectRatio; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QPixmap_scaled2'; procedure QPixmap_scaledToWidth(handle: QPixmapH; retval: QPixmapH; w: Integer; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QPixmap_scaledToWidth'; procedure QPixmap_scaledToHeight(handle: QPixmapH; retval: QPixmapH; h: Integer; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QPixmap_scaledToHeight'; -procedure QPixmap_transformed(handle: QPixmapH; retval: QPixmapH; p1: QMatrixH; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QPixmap_transformed'; -procedure QPixmap_trueMatrix(retval: QMatrixH; m: QMatrixH; w: Integer; h: Integer); overload; cdecl; external QtIntf name 'QPixmap_trueMatrix'; -procedure QPixmap_transformed(handle: QPixmapH; retval: QPixmapH; p1: QTransformH; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QPixmap_transformed2'; -procedure QPixmap_trueMatrix(retval: QTransformH; m: QTransformH; w: Integer; h: Integer); overload; cdecl; external QtIntf name 'QPixmap_trueMatrix2'; +procedure QPixmap_transformed(handle: QPixmapH; retval: QPixmapH; p1: QMatrixH; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QPixmap_transformed'; +procedure QPixmap_trueMatrix(retval: QMatrixH; m: QMatrixH; w: Integer; h: Integer); cdecl; external QtIntf name 'QPixmap_trueMatrix'; procedure QPixmap_toImage(handle: QPixmapH; retval: QImageH); cdecl; external QtIntf name 'QPixmap_toImage'; procedure QPixmap_fromImage(retval: QPixmapH; image: QImageH; flags: QtImageConversionFlags = QtAutoColor); cdecl; external QtIntf name 'QPixmap_fromImage'; function QPixmap_load(handle: QPixmapH; fileName: PWideString; format: PAnsiChar = nil; flags: QtImageConversionFlags = QtAutoColor): Boolean; cdecl; external QtIntf name 'QPixmap_load'; @@ -4706,7 +4533,6 @@ function QPixmap_save(handle: QPixmapH; device: QIODeviceH; format: PAnsiChar = procedure QPixmap_copy(handle: QPixmapH; retval: QPixmapH; x: Integer; y: Integer; width: Integer; height: Integer); overload; cdecl; external QtIntf name 'QPixmap_copy'; procedure QPixmap_copy(handle: QPixmapH; retval: QPixmapH; rect: PRect = nil); overload; cdecl; external QtIntf name 'QPixmap_copy2'; function QPixmap_serialNumber(handle: QPixmapH): Integer; cdecl; external QtIntf name 'QPixmap_serialNumber'; -function QPixmap_cacheKey(handle: QPixmapH): int64; cdecl; external QtIntf name 'QPixmap_cacheKey'; function QPixmap_isDetached(handle: QPixmapH): Boolean; cdecl; external QtIntf name 'QPixmap_isDetached'; procedure QPixmap_detach(handle: QPixmapH); cdecl; external QtIntf name 'QPixmap_detach'; function QPixmap_isQBitmap(handle: QPixmapH): Boolean; cdecl; external QtIntf name 'QPixmap_isQBitmap'; @@ -4744,11 +4570,9 @@ procedure QImage_destroy(handle: QImageH); cdecl; external QtIntf name 'QImage_d function QImage_create(size: PSize; format: QImageFormat): QImageH; overload; cdecl; external QtIntf name 'QImage_create2'; function QImage_create(width: Integer; height: Integer; format: QImageFormat): QImageH; overload; cdecl; external QtIntf name 'QImage_create3'; function QImage_create(data: PByte; width: Integer; height: Integer; format: QImageFormat): QImageH; overload; cdecl; external QtIntf name 'QImage_create4'; -function QImage_create(data: PByte; width: Integer; height: Integer; bytesPerLine: Integer; format: QImageFormat): QImageH; overload; cdecl; external QtIntf name 'QImage_create6'; -function QImage_create(xpm: PAnsiChar): QImageH; overload; cdecl; external QtIntf name 'QImage_create8'; -function QImage_create(fileName: PWideString; format: PAnsiChar = nil): QImageH; overload; cdecl; external QtIntf name 'QImage_create9'; -function QImage_create(fileName: PAnsiChar; format: PAnsiChar = nil): QImageH; overload; cdecl; external QtIntf name 'QImage_create10'; -function QImage_create(p1: QImageH): QImageH; overload; cdecl; external QtIntf name 'QImage_create11'; +function QImage_create(xpm: PAnsiChar): QImageH; overload; cdecl; external QtIntf name 'QImage_create6'; +function QImage_create(fileName: PAnsiChar; format: PAnsiChar = nil): QImageH; overload; cdecl; external QtIntf name 'QImage_create8'; +function QImage_create(p1: QImageH): QImageH; overload; cdecl; external QtIntf name 'QImage_create9'; function QImage_isNull(handle: QImageH): Boolean; cdecl; external QtIntf name 'QImage_isNull'; function QImage_devType(handle: QImageH): Integer; cdecl; external QtIntf name 'QImage_devType'; procedure QImage_detach(handle: QImageH); cdecl; external QtIntf name 'QImage_detach'; @@ -4786,15 +4610,12 @@ procedure QImage_setAlphaChannel(handle: QImageH; alphaChannel: QImageH); cdecl; procedure QImage_alphaChannel(handle: QImageH; retval: QImageH); cdecl; external QtIntf name 'QImage_alphaChannel'; procedure QImage_createAlphaMask(handle: QImageH; retval: QImageH; flags: QtImageConversionFlags = QtAutoColor); cdecl; external QtIntf name 'QImage_createAlphaMask'; procedure QImage_createHeuristicMask(handle: QImageH; retval: QImageH; clipTight: Boolean = True); cdecl; external QtIntf name 'QImage_createHeuristicMask'; -procedure QImage_createMaskFromColor(handle: QImageH; retval: QImageH; color: QRgb; mode: QtMaskMode = QtMaskInColor); cdecl; external QtIntf name 'QImage_createMaskFromColor'; procedure QImage_scaled(handle: QImageH; retval: QImageH; w: Integer; h: Integer; aspectMode: QtAspectRatioMode = QtIgnoreAspectRatio; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QImage_scaled'; procedure QImage_scaled(handle: QImageH; retval: QImageH; s: PSize; aspectMode: QtAspectRatioMode = QtIgnoreAspectRatio; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QImage_scaled2'; procedure QImage_scaledToWidth(handle: QImageH; retval: QImageH; w: Integer; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QImage_scaledToWidth'; procedure QImage_scaledToHeight(handle: QImageH; retval: QImageH; h: Integer; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QImage_scaledToHeight'; -procedure QImage_transformed(handle: QImageH; retval: QImageH; matrix: QMatrixH; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QImage_transformed'; -procedure QImage_trueMatrix(retval: QMatrixH; p1: QMatrixH; w: Integer; h: Integer); overload; cdecl; external QtIntf name 'QImage_trueMatrix'; -procedure QImage_transformed(handle: QImageH; retval: QImageH; matrix: QTransformH; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QImage_transformed2'; -procedure QImage_trueMatrix(retval: QTransformH; p1: QTransformH; w: Integer; h: Integer); overload; cdecl; external QtIntf name 'QImage_trueMatrix2'; +procedure QImage_transformed(handle: QImageH; retval: QImageH; matrix: QMatrixH; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QImage_transformed'; +procedure QImage_trueMatrix(retval: QMatrixH; p1: QMatrixH; w: Integer; h: Integer); cdecl; external QtIntf name 'QImage_trueMatrix'; procedure QImage_mirrored(handle: QImageH; retval: QImageH; horizontally: Boolean = False; vertically: Boolean = True); cdecl; external QtIntf name 'QImage_mirrored'; procedure QImage_rgbSwapped(handle: QImageH; retval: QImageH); cdecl; external QtIntf name 'QImage_rgbSwapped'; procedure QImage_invertPixels(handle: QImageH; p1: QImageInvertMode = QImageInvertRgb); cdecl; external QtIntf name 'QImage_invertPixels'; @@ -4807,7 +4628,6 @@ function QImage_save(handle: QImageH; device: QIODeviceH; format: PAnsiChar = ni procedure QImage_fromData(retval: QImageH; data: PByte; size: Integer; format: PAnsiChar = nil); overload; cdecl; external QtIntf name 'QImage_fromData'; procedure QImage_fromData(retval: QImageH; data: QByteArrayH; format: PAnsiChar = nil); overload; cdecl; external QtIntf name 'QImage_fromData2'; function QImage_serialNumber(handle: QImageH): Integer; cdecl; external QtIntf name 'QImage_serialNumber'; -function QImage_cacheKey(handle: QImageH): int64; cdecl; external QtIntf name 'QImage_cacheKey'; function QImage_paintEngine(handle: QImageH): QPaintEngineH; cdecl; external QtIntf name 'QImage_paintEngine'; function QImage_dotsPerMeterX(handle: QImageH): Integer; cdecl; external QtIntf name 'QImage_dotsPerMeterX'; function QImage_dotsPerMeterY(handle: QImageH): Integer; cdecl; external QtIntf name 'QImage_dotsPerMeterY'; @@ -4831,8 +4651,7 @@ function QBitmap_create(fileName: PWideString; format: PAnsiChar = nil): QBitmap procedure QBitmap_clear(handle: QBitmapH); cdecl; external QtIntf name 'QBitmap_clear'; procedure QBitmap_fromImage(retval: QBitmapH; image: QImageH; flags: QtImageConversionFlags = QtAutoColor); cdecl; external QtIntf name 'QBitmap_fromImage'; procedure QBitmap_fromData(retval: QBitmapH; size: PSize; bits: PByte; monoFormat: QImageFormat = QImageFormat_MonoLSB); cdecl; external QtIntf name 'QBitmap_fromData'; -procedure QBitmap_transformed(handle: QBitmapH; retval: QBitmapH; p1: QMatrixH); overload; cdecl; external QtIntf name 'QBitmap_transformed'; -procedure QBitmap_transformed(handle: QBitmapH; retval: QBitmapH; matrix: QTransformH); overload; cdecl; external QtIntf name 'QBitmap_transformed2'; +procedure QBitmap_transformed(handle: QBitmapH; retval: QBitmapH; p1: QMatrixH); cdecl; external QtIntf name 'QBitmap_transformed'; function QPicture_create(formatVersion: Integer = -1): QPictureH; overload; cdecl; external QtIntf name 'QPicture_create'; procedure QPicture_destroy(handle: QPictureH); cdecl; external QtIntf name 'QPicture_destroy'; @@ -4971,8 +4790,6 @@ procedure QImageWriter_setFileName(handle: QImageWriterH; fileName: PWideString) procedure QImageWriter_fileName(handle: QImageWriterH; retval: PWideString); cdecl; external QtIntf name 'QImageWriter_fileName'; procedure QImageWriter_setQuality(handle: QImageWriterH; quality: Integer); cdecl; external QtIntf name 'QImageWriter_setQuality'; function QImageWriter_quality(handle: QImageWriterH): Integer; cdecl; external QtIntf name 'QImageWriter_quality'; -procedure QImageWriter_setCompression(handle: QImageWriterH; compression: Integer); cdecl; external QtIntf name 'QImageWriter_setCompression'; -function QImageWriter_compression(handle: QImageWriterH): Integer; cdecl; external QtIntf name 'QImageWriter_compression'; procedure QImageWriter_setGamma(handle: QImageWriterH; gamma: Single); cdecl; external QtIntf name 'QImageWriter_setGamma'; function QImageWriter_gamma(handle: QImageWriterH): Single; cdecl; external QtIntf name 'QImageWriter_gamma'; procedure QImageWriter_setDescription(handle: QImageWriterH; description: PWideString); cdecl; external QtIntf name 'QImageWriter_setDescription'; @@ -4989,13 +4806,6 @@ type QValidatorState = ( // QValidator::State (1) QValidatorInvalid, QValidatorIntermediate, QValidatorAcceptable ); - -type - QDoubleValidatorNotation = ( // QDoubleValidator::Notation (1) - QDoubleValidatorStandardNotation, QDoubleValidatorScientificNotation ); - -procedure QValidator_setLocale(handle: QValidatorH; locale: QLocaleH); cdecl; external QtIntf name 'QValidator_setLocale'; -procedure QValidator_locale(handle: QValidatorH; retval: QLocaleH); cdecl; external QtIntf name 'QValidator_locale'; function QValidator_validate(handle: QValidatorH; p1: PWideString; p2: PInteger): QValidatorState; cdecl; external QtIntf name 'QValidator_validate'; procedure QValidator_fixup(handle: QValidatorH; p1: PWideString); cdecl; external QtIntf name 'QValidator_fixup'; @@ -5017,11 +4827,9 @@ procedure QDoubleValidator_setRange(handle: QDoubleValidatorH; bottom: Double; t procedure QDoubleValidator_setBottom(handle: QDoubleValidatorH; p1: Double); cdecl; external QtIntf name 'QDoubleValidator_setBottom'; procedure QDoubleValidator_setTop(handle: QDoubleValidatorH; p1: Double); cdecl; external QtIntf name 'QDoubleValidator_setTop'; procedure QDoubleValidator_setDecimals(handle: QDoubleValidatorH; p1: Integer); cdecl; external QtIntf name 'QDoubleValidator_setDecimals'; -procedure QDoubleValidator_setNotation(handle: QDoubleValidatorH; p1: QDoubleValidatorNotation); cdecl; external QtIntf name 'QDoubleValidator_setNotation'; function QDoubleValidator_bottom(handle: QDoubleValidatorH): Double; cdecl; external QtIntf name 'QDoubleValidator_bottom'; function QDoubleValidator_top(handle: QDoubleValidatorH): Double; cdecl; external QtIntf name 'QDoubleValidator_top'; function QDoubleValidator_decimals(handle: QDoubleValidatorH): Integer; cdecl; external QtIntf name 'QDoubleValidator_decimals'; -function QDoubleValidator_notation(handle: QDoubleValidatorH): QDoubleValidatorNotation; cdecl; external QtIntf name 'QDoubleValidator_notation'; function QRegExpValidator_create(parent: QObjectH): QRegExpValidatorH; overload; cdecl; external QtIntf name 'QRegExpValidator_create'; procedure QRegExpValidator_destroy(handle: QRegExpValidatorH); cdecl; external QtIntf name 'QRegExpValidator_destroy'; @@ -5208,7 +5016,6 @@ procedure QMenuBar_actionGeometry(handle: QMenuBarH; retval: PRect; p1: QActionH function QMenuBar_actionAt(handle: QMenuBarH; p1: PPoint): QActionH; cdecl; external QtIntf name 'QMenuBar_actionAt'; procedure QMenuBar_setCornerWidget(handle: QMenuBarH; w: QWidgetH; corner: QtCorner = QtTopRightCorner); cdecl; external QtIntf name 'QMenuBar_setCornerWidget'; function QMenuBar_cornerWidget(handle: QMenuBarH; corner: QtCorner = QtTopRightCorner): QWidgetH; cdecl; external QtIntf name 'QMenuBar_cornerWidget'; -procedure QMenuBar_setVisible(handle: QMenuBarH; visible: Boolean); cdecl; external QtIntf name 'QMenuBar_setVisible'; {$ifdef DARWIN } function QMenuBar_macMenu(handle: QMenuBarH): MenuRef; cdecl; external QtIntf name 'QMenuBar_macMenu'; {$endif} @@ -5284,7 +5091,6 @@ procedure QPushButton_destroy(handle: QPushButtonH); cdecl; external QtIntf name function QPushButton_create(text: PWideString; parent: QWidgetH = nil): QPushButtonH; overload; cdecl; external QtIntf name 'QPushButton_create2'; function QPushButton_create(icon: QIconH; text: PWideString; parent: QWidgetH = nil): QPushButtonH; overload; cdecl; external QtIntf name 'QPushButton_create3'; procedure QPushButton_sizeHint(handle: QPushButtonH; retval: PSize); cdecl; external QtIntf name 'QPushButton_sizeHint'; -procedure QPushButton_minimumSizeHint(handle: QPushButtonH; retval: PSize); cdecl; external QtIntf name 'QPushButton_minimumSizeHint'; function QPushButton_autoDefault(handle: QPushButtonH): Boolean; cdecl; external QtIntf name 'QPushButton_autoDefault'; procedure QPushButton_setAutoDefault(handle: QPushButtonH; p1: Boolean); cdecl; external QtIntf name 'QPushButton_setAutoDefault'; function QPushButton_isDefault(handle: QPushButtonH): Boolean; cdecl; external QtIntf name 'QPushButton_isDefault'; @@ -5443,7 +5249,6 @@ function QTextEdit_acceptRichText(handle: QTextEditH): Boolean; cdecl; external procedure QTextEdit_setAcceptRichText(handle: QTextEditH; accept: Boolean); cdecl; external QtIntf name 'QTextEdit_setAcceptRichText'; procedure QTextEdit_moveCursor(handle: QTextEditH; operation: QTextCursorMoveOperation; mode: QTextCursorMoveMode = QTextCursorMoveAnchor); cdecl; external QtIntf name 'QTextEdit_moveCursor'; function QTextEdit_canPaste(handle: QTextEditH): Boolean; cdecl; external QtIntf name 'QTextEdit_canPaste'; -procedure QTextEdit_print(handle: QTextEditH; printer: QPrinterH); cdecl; external QtIntf name 'QTextEdit_print'; procedure QTextEdit_setFontPointSize(handle: QTextEditH; s: Double); cdecl; external QtIntf name 'QTextEdit_setFontPointSize'; procedure QTextEdit_setFontFamily(handle: QTextEditH; fontFamily: PWideString); cdecl; external QtIntf name 'QTextEdit_setFontFamily'; procedure QTextEdit_setFontWeight(handle: QTextEditH; w: Integer); cdecl; external QtIntf name 'QTextEdit_setFontWeight'; @@ -5480,16 +5285,6 @@ type QTextEdit_cursorPositionChanged_Event = procedure () of object cdecl; -type - QMainWindowDockOption = cardinal; // QMainWindow::DockOption - QMainWindowDockOptions = QMainWindowDockOption; //QFlags<> (3) -const - QMainWindowAnimatedDocks = $01; - QMainWindowAllowNestedDocks = $02; - QMainWindowAllowTabbedDocks = $04; - QMainWindowForceTabbedDocks = $08; - QMainWindowVerticalTabs = $10; - function QMainWindow_create(parent: QWidgetH = nil; flags: QtWindowFlags = 0): QMainWindowH; cdecl; external QtIntf name 'QMainWindow_create'; procedure QMainWindow_destroy(handle: QMainWindowH); cdecl; external QtIntf name 'QMainWindow_destroy'; procedure QMainWindow_iconSize(handle: QMainWindowH; retval: PSize); cdecl; external QtIntf name 'QMainWindow_iconSize'; @@ -5498,8 +5293,6 @@ function QMainWindow_toolButtonStyle(handle: QMainWindowH): QtToolButtonStyle; c procedure QMainWindow_setToolButtonStyle(handle: QMainWindowH; toolButtonStyle: QtToolButtonStyle); cdecl; external QtIntf name 'QMainWindow_setToolButtonStyle'; function QMainWindow_isAnimated(handle: QMainWindowH): Boolean; cdecl; external QtIntf name 'QMainWindow_isAnimated'; function QMainWindow_isDockNestingEnabled(handle: QMainWindowH): Boolean; cdecl; external QtIntf name 'QMainWindow_isDockNestingEnabled'; -procedure QMainWindow_setDockOptions(handle: QMainWindowH; options: QMainWindowDockOptions); cdecl; external QtIntf name 'QMainWindow_setDockOptions'; -function QMainWindow_dockOptions(handle: QMainWindowH): QMainWindowDockOptions; cdecl; external QtIntf name 'QMainWindow_dockOptions'; function QMainWindow_isSeparator(handle: QMainWindowH; pos: PPoint): Boolean; cdecl; external QtIntf name 'QMainWindow_isSeparator'; function QMainWindow_menuBar(handle: QMainWindowH): QMenuBarH; cdecl; external QtIntf name 'QMainWindow_menuBar'; procedure QMainWindow_setMenuBar(handle: QMainWindowH; menubar: QMenuBarH); cdecl; external QtIntf name 'QMainWindow_setMenuBar'; @@ -5518,11 +5311,7 @@ procedure QMainWindow_addToolBar(handle: QMainWindowH; toolbar: QToolBarH); over function QMainWindow_addToolBar(handle: QMainWindowH; title: PWideString): QToolBarH; overload; cdecl; external QtIntf name 'QMainWindow_addToolBar3'; procedure QMainWindow_insertToolBar(handle: QMainWindowH; before: QToolBarH; toolbar: QToolBarH); cdecl; external QtIntf name 'QMainWindow_insertToolBar'; procedure QMainWindow_removeToolBar(handle: QMainWindowH; toolbar: QToolBarH); cdecl; external QtIntf name 'QMainWindow_removeToolBar'; -procedure QMainWindow_removeToolBarBreak(handle: QMainWindowH; before: QToolBarH); cdecl; external QtIntf name 'QMainWindow_removeToolBarBreak'; -procedure QMainWindow_setUnifiedTitleAndToolBarOnMac(handle: QMainWindowH; _set: Boolean); cdecl; external QtIntf name 'QMainWindow_setUnifiedTitleAndToolBarOnMac'; -function QMainWindow_unifiedTitleAndToolBarOnMac(handle: QMainWindowH): Boolean; cdecl; external QtIntf name 'QMainWindow_unifiedTitleAndToolBarOnMac'; function QMainWindow_toolBarArea(handle: QMainWindowH; toolbar: QToolBarH): QtToolBarArea; cdecl; external QtIntf name 'QMainWindow_toolBarArea'; -function QMainWindow_toolBarBreak(handle: QMainWindowH; toolbar: QToolBarH): Boolean; cdecl; external QtIntf name 'QMainWindow_toolBarBreak'; procedure QMainWindow_addDockWidget(handle: QMainWindowH; area: QtDockWidgetArea; dockwidget: QDockWidgetH); overload; cdecl; external QtIntf name 'QMainWindow_addDockWidget'; procedure QMainWindow_addDockWidget(handle: QMainWindowH; area: QtDockWidgetArea; dockwidget: QDockWidgetH; orientation: QtOrientation); overload; cdecl; external QtIntf name 'QMainWindow_addDockWidget2'; procedure QMainWindow_splitDockWidget(handle: QMainWindowH; after: QDockWidgetH; dockwidget: QDockWidgetH; orientation: QtOrientation); cdecl; external QtIntf name 'QMainWindow_splitDockWidget'; @@ -5567,9 +5356,6 @@ function QToolBar_toggleViewAction(handle: QToolBarH): QActionH; cdecl; external procedure QToolBar_iconSize(handle: QToolBarH; retval: PSize); cdecl; external QtIntf name 'QToolBar_iconSize'; function QToolBar_toolButtonStyle(handle: QToolBarH): QtToolButtonStyle; cdecl; external QtIntf name 'QToolBar_toolButtonStyle'; function QToolBar_widgetForAction(handle: QToolBarH; action: QActionH): QWidgetH; cdecl; external QtIntf name 'QToolBar_widgetForAction'; -function QToolBar_isFloatable(handle: QToolBarH): Boolean; cdecl; external QtIntf name 'QToolBar_isFloatable'; -procedure QToolBar_setFloatable(handle: QToolBarH; floatable: Boolean); cdecl; external QtIntf name 'QToolBar_setFloatable'; -function QToolBar_isFloating(handle: QToolBarH): Boolean; cdecl; external QtIntf name 'QToolBar_isFloating'; procedure QToolBar_setIconSize(handle: QToolBarH; iconSize: PSize); cdecl; external QtIntf name 'QToolBar_setIconSize'; procedure QToolBar_setToolButtonStyle(handle: QToolBarH; toolButtonStyle: QtToolButtonStyle); cdecl; external QtIntf name 'QToolBar_setToolButtonStyle'; @@ -5628,7 +5414,7 @@ type type QAbstractSpinBoxButtonSymbols = ( // QAbstractSpinBox::ButtonSymbols (1) - QAbstractSpinBoxUpDownArrows, QAbstractSpinBoxPlusMinus, QAbstractSpinBoxNoButtons ); + QAbstractSpinBoxUpDownArrows, QAbstractSpinBoxPlusMinus ); QAbstractSpinBoxCorrectionMode = ( // QAbstractSpinBox::CorrectionMode (1) QAbstractSpinBoxCorrectToPreviousValue, QAbstractSpinBoxCorrectToNearestValue ); @@ -5655,8 +5441,6 @@ function QAbstractSpinBox_wrapping(handle: QAbstractSpinBoxH): Boolean; cdecl; e procedure QAbstractSpinBox_setWrapping(handle: QAbstractSpinBoxH; w: Boolean); cdecl; external QtIntf name 'QAbstractSpinBox_setWrapping'; procedure QAbstractSpinBox_setReadOnly(handle: QAbstractSpinBoxH; r: Boolean); cdecl; external QtIntf name 'QAbstractSpinBox_setReadOnly'; function QAbstractSpinBox_isReadOnly(handle: QAbstractSpinBoxH): Boolean; cdecl; external QtIntf name 'QAbstractSpinBox_isReadOnly'; -procedure QAbstractSpinBox_setKeyboardTracking(handle: QAbstractSpinBoxH; kt: Boolean); cdecl; external QtIntf name 'QAbstractSpinBox_setKeyboardTracking'; -function QAbstractSpinBox_keyboardTracking(handle: QAbstractSpinBoxH): Boolean; cdecl; external QtIntf name 'QAbstractSpinBox_keyboardTracking'; procedure QAbstractSpinBox_setAlignment(handle: QAbstractSpinBoxH; flag: QtAlignment); cdecl; external QtIntf name 'QAbstractSpinBox_setAlignment'; function QAbstractSpinBox_alignment(handle: QAbstractSpinBoxH): QtAlignment; cdecl; external QtIntf name 'QAbstractSpinBox_alignment'; procedure QAbstractSpinBox_setFrame(handle: QAbstractSpinBoxH; p1: Boolean); cdecl; external QtIntf name 'QAbstractSpinBox_setFrame'; @@ -5809,7 +5593,7 @@ type QComboBoxNoInsert, QComboBoxInsertAtTop, QComboBoxInsertAtCurrent, QComboBoxInsertAtBottom, QComboBoxInsertAfterCurrent, QComboBoxInsertBeforeCurrent, QComboBoxInsertAlphabetically ); QComboBoxSizeAdjustPolicy = ( // QComboBox::SizeAdjustPolicy (1) - QComboBoxAdjustToContents, QComboBoxAdjustToContentsOnFirstShow, QComboBoxAdjustToMinimumContentsLength, QComboBoxAdjustToMinimumContentsLengthWithIcon ); + QComboBoxAdjustToContents, QComboBoxAdjustToContentsOnFirstShow, QComboBoxAdjustToMinimumContentsLength ); function QComboBox_create(parent: QWidgetH = nil): QComboBoxH; cdecl; external QtIntf name 'QComboBox_create'; procedure QComboBox_destroy(handle: QComboBoxH); cdecl; external QtIntf name 'QComboBox_destroy'; @@ -5938,8 +5722,6 @@ function QTextBrowser_isForwardAvailable(handle: QTextBrowserH): Boolean; cdecl; procedure QTextBrowser_clearHistory(handle: QTextBrowserH); cdecl; external QtIntf name 'QTextBrowser_clearHistory'; function QTextBrowser_openExternalLinks(handle: QTextBrowserH): Boolean; cdecl; external QtIntf name 'QTextBrowser_openExternalLinks'; procedure QTextBrowser_setOpenExternalLinks(handle: QTextBrowserH; open: Boolean); cdecl; external QtIntf name 'QTextBrowser_setOpenExternalLinks'; -function QTextBrowser_openLinks(handle: QTextBrowserH): Boolean; cdecl; external QtIntf name 'QTextBrowser_openLinks'; -procedure QTextBrowser_setOpenLinks(handle: QTextBrowserH; open: Boolean); cdecl; external QtIntf name 'QTextBrowser_setOpenLinks'; procedure QTextBrowser_setSource(handle: QTextBrowserH; name: QUrlH); cdecl; external QtIntf name 'QTextBrowser_setSource'; procedure QTextBrowser_backward(handle: QTextBrowserH); cdecl; external QtIntf name 'QTextBrowser_backward'; procedure QTextBrowser_forward(handle: QTextBrowserH); cdecl; external QtIntf name 'QTextBrowser_forward'; @@ -6064,7 +5846,6 @@ procedure QTabWidget_iconSize(handle: QTabWidgetH; retval: PSize); cdecl; extern procedure QTabWidget_setIconSize(handle: QTabWidgetH; size: PSize); cdecl; external QtIntf name 'QTabWidget_setIconSize'; function QTabWidget_usesScrollButtons(handle: QTabWidgetH): Boolean; cdecl; external QtIntf name 'QTabWidget_usesScrollButtons'; procedure QTabWidget_setUsesScrollButtons(handle: QTabWidgetH; useButtons: Boolean); cdecl; external QtIntf name 'QTabWidget_setUsesScrollButtons'; -procedure QTabWidget_clear(handle: QTabWidgetH); cdecl; external QtIntf name 'QTabWidget_clear'; procedure QTabWidget_setCurrentIndex(handle: QTabWidgetH; index: Integer); cdecl; external QtIntf name 'QTabWidget_setCurrentIndex'; procedure QTabWidget_setCurrentWidget(handle: QTabWidgetH; widget: QWidgetH); cdecl; external QtIntf name 'QTabWidget_setCurrentWidget'; @@ -6104,7 +5885,6 @@ procedure QTabBar_tabWhatsThis(handle: QTabBarH; retval: PWideString; index: Int procedure QTabBar_setTabData(handle: QTabBarH; index: Integer; data: QVariantH); cdecl; external QtIntf name 'QTabBar_setTabData'; procedure QTabBar_tabData(handle: QTabBarH; retval: QVariantH; index: Integer); cdecl; external QtIntf name 'QTabBar_tabData'; procedure QTabBar_tabRect(handle: QTabBarH; retval: PRect; index: Integer); cdecl; external QtIntf name 'QTabBar_tabRect'; -function QTabBar_tabAt(handle: QTabBarH; pos: PPoint): Integer; cdecl; external QtIntf name 'QTabBar_tabAt'; function QTabBar_currentIndex(handle: QTabBarH): Integer; cdecl; external QtIntf name 'QTabBar_currentIndex'; function QTabBar_count(handle: QTabBarH): Integer; cdecl; external QtIntf name 'QTabBar_count'; procedure QTabBar_sizeHint(handle: QTabBarH; retval: PSize); cdecl; external QtIntf name 'QTabBar_sizeHint'; @@ -6131,6 +5911,7 @@ function QProgressBar_create(parent: QWidgetH = nil): QProgressBarH; cdecl; exte procedure QProgressBar_destroy(handle: QProgressBarH); cdecl; external QtIntf name 'QProgressBar_destroy'; function QProgressBar_minimum(handle: QProgressBarH): Integer; cdecl; external QtIntf name 'QProgressBar_minimum'; function QProgressBar_maximum(handle: QProgressBarH): Integer; cdecl; external QtIntf name 'QProgressBar_maximum'; +procedure QProgressBar_setRange(handle: QProgressBarH; minimum: Integer; maximum: Integer); cdecl; external QtIntf name 'QProgressBar_setRange'; function QProgressBar_value(handle: QProgressBarH): Integer; cdecl; external QtIntf name 'QProgressBar_value'; procedure QProgressBar_text(handle: QProgressBarH; retval: PWideString); cdecl; external QtIntf name 'QProgressBar_text'; procedure QProgressBar_setTextVisible(handle: QProgressBarH; visible: Boolean); cdecl; external QtIntf name 'QProgressBar_setTextVisible'; @@ -6147,7 +5928,6 @@ function QProgressBar_textDirection(handle: QProgressBarH): QProgressBarDirectio procedure QProgressBar_setFormat(handle: QProgressBarH; format: PWideString); cdecl; external QtIntf name 'QProgressBar_setFormat'; procedure QProgressBar_format(handle: QProgressBarH; retval: PWideString); cdecl; external QtIntf name 'QProgressBar_format'; procedure QProgressBar_reset(handle: QProgressBarH); cdecl; external QtIntf name 'QProgressBar_reset'; -procedure QProgressBar_setRange(handle: QProgressBarH; minimum: Integer; maximum: Integer); cdecl; external QtIntf name 'QProgressBar_setRange'; procedure QProgressBar_setMinimum(handle: QProgressBarH; minimum: Integer); cdecl; external QtIntf name 'QProgressBar_setMinimum'; procedure QProgressBar_setMaximum(handle: QProgressBarH; maximum: Integer); cdecl; external QtIntf name 'QProgressBar_setMaximum'; procedure QProgressBar_setValue(handle: QProgressBarH; value: Integer); cdecl; external QtIntf name 'QProgressBar_setValue'; @@ -6247,78 +6027,6 @@ procedure QScrollArea_ensureVisible(handle: QScrollAreaH; x: Integer; y: Integer procedure QScrollArea_ensureWidgetVisible(handle: QScrollAreaH; childWidget: QWidgetH; xmargin: Integer = 50; ymargin: Integer = 50); cdecl; external QtIntf name 'QScrollArea_ensureWidgetVisible'; -type - QMdiAreaWindowOrder = ( // QMdiArea::WindowOrder (1) - QMdiAreaCreationOrder, QMdiAreaStackingOrder ); - -type - QMdiAreaAreaOption = cardinal; // QMdiArea::AreaOption - QMdiAreaAreaOptions = QMdiAreaAreaOption; //QFlags<> (3) -const - QMdiAreaDontMaximizeSubWindowOnActivation = $1; - -function QMdiArea_create(parent: QWidgetH = nil): QMdiAreaH; cdecl; external QtIntf name 'QMdiArea_create'; -procedure QMdiArea_destroy(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_destroy'; -procedure QMdiArea_sizeHint(handle: QMdiAreaH; retval: PSize); cdecl; external QtIntf name 'QMdiArea_sizeHint'; -procedure QMdiArea_minimumSizeHint(handle: QMdiAreaH; retval: PSize); cdecl; external QtIntf name 'QMdiArea_minimumSizeHint'; -function QMdiArea_currentSubWindow(handle: QMdiAreaH): QMdiSubWindowH; cdecl; external QtIntf name 'QMdiArea_currentSubWindow'; -function QMdiArea_activeSubWindow(handle: QMdiAreaH): QMdiSubWindowH; cdecl; external QtIntf name 'QMdiArea_activeSubWindow'; -procedure QMdiArea_subWindowList(handle: QMdiAreaH; retval: PIntArray; order: QMdiAreaWindowOrder = QMdiAreaCreationOrder); cdecl; external QtIntf name 'QMdiArea_subWindowList'; -function QMdiArea_addSubWindow(handle: QMdiAreaH; widget: QWidgetH; flags: QtWindowFlags = 0): QMdiSubWindowH; cdecl; external QtIntf name 'QMdiArea_addSubWindow'; -procedure QMdiArea_removeSubWindow(handle: QMdiAreaH; widget: QWidgetH); cdecl; external QtIntf name 'QMdiArea_removeSubWindow'; -procedure QMdiArea_background(handle: QMdiAreaH; retval: QBrushH); cdecl; external QtIntf name 'QMdiArea_background'; -procedure QMdiArea_setBackground(handle: QMdiAreaH; background: QBrushH); cdecl; external QtIntf name 'QMdiArea_setBackground'; -procedure QMdiArea_setOption(handle: QMdiAreaH; option: QMdiAreaAreaOption; _on: Boolean = True); cdecl; external QtIntf name 'QMdiArea_setOption'; -function QMdiArea_testOption(handle: QMdiAreaH; opton: QMdiAreaAreaOption): Boolean; cdecl; external QtIntf name 'QMdiArea_testOption'; -procedure QMdiArea_setActiveSubWindow(handle: QMdiAreaH; window: QMdiSubWindowH); cdecl; external QtIntf name 'QMdiArea_setActiveSubWindow'; -procedure QMdiArea_tileSubWindows(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_tileSubWindows'; -procedure QMdiArea_cascadeSubWindows(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_cascadeSubWindows'; -procedure QMdiArea_closeActiveSubWindow(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_closeActiveSubWindow'; -procedure QMdiArea_closeAllSubWindows(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_closeAllSubWindows'; -procedure QMdiArea_activateNextSubWindow(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_activateNextSubWindow'; -procedure QMdiArea_activatePreviousSubWindow(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_activatePreviousSubWindow'; - - -type - QMdiArea_subWindowActivated_Event = procedure (p1: QMdiSubWindowH) of object cdecl; - - -type - QMdiSubWindowSubWindowOption = cardinal; // QMdiSubWindow::SubWindowOption - QMdiSubWindowSubWindowOptions = QMdiSubWindowSubWindowOption; //QFlags<> (3) -const - QMdiSubWindowAllowOutsideAreaHorizontally = $1; - QMdiSubWindowAllowOutsideAreaVertically = $2; - QMdiSubWindowRubberBandResize = $4; - QMdiSubWindowRubberBandMove = $8; - -function QMdiSubWindow_create(parent: QWidgetH = nil; flags: QtWindowFlags = 0): QMdiSubWindowH; cdecl; external QtIntf name 'QMdiSubWindow_create'; -procedure QMdiSubWindow_destroy(handle: QMdiSubWindowH); cdecl; external QtIntf name 'QMdiSubWindow_destroy'; -procedure QMdiSubWindow_sizeHint(handle: QMdiSubWindowH; retval: PSize); cdecl; external QtIntf name 'QMdiSubWindow_sizeHint'; -procedure QMdiSubWindow_minimumSizeHint(handle: QMdiSubWindowH; retval: PSize); cdecl; external QtIntf name 'QMdiSubWindow_minimumSizeHint'; -procedure QMdiSubWindow_setWidget(handle: QMdiSubWindowH; widget: QWidgetH); cdecl; external QtIntf name 'QMdiSubWindow_setWidget'; -function QMdiSubWindow_widget(handle: QMdiSubWindowH): QWidgetH; cdecl; external QtIntf name 'QMdiSubWindow_widget'; -function QMdiSubWindow_maximizedButtonsWidget(handle: QMdiSubWindowH): QWidgetH; cdecl; external QtIntf name 'QMdiSubWindow_maximizedButtonsWidget'; -function QMdiSubWindow_maximizedSystemMenuIconWidget(handle: QMdiSubWindowH): QWidgetH; cdecl; external QtIntf name 'QMdiSubWindow_maximizedSystemMenuIconWidget'; -function QMdiSubWindow_isShaded(handle: QMdiSubWindowH): Boolean; cdecl; external QtIntf name 'QMdiSubWindow_isShaded'; -procedure QMdiSubWindow_setOption(handle: QMdiSubWindowH; option: QMdiSubWindowSubWindowOption; _on: Boolean = True); cdecl; external QtIntf name 'QMdiSubWindow_setOption'; -function QMdiSubWindow_testOption(handle: QMdiSubWindowH; p1: QMdiSubWindowSubWindowOption): Boolean; cdecl; external QtIntf name 'QMdiSubWindow_testOption'; -procedure QMdiSubWindow_setKeyboardSingleStep(handle: QMdiSubWindowH; step: Integer); cdecl; external QtIntf name 'QMdiSubWindow_setKeyboardSingleStep'; -function QMdiSubWindow_keyboardSingleStep(handle: QMdiSubWindowH): Integer; cdecl; external QtIntf name 'QMdiSubWindow_keyboardSingleStep'; -procedure QMdiSubWindow_setKeyboardPageStep(handle: QMdiSubWindowH; step: Integer); cdecl; external QtIntf name 'QMdiSubWindow_setKeyboardPageStep'; -function QMdiSubWindow_keyboardPageStep(handle: QMdiSubWindowH): Integer; cdecl; external QtIntf name 'QMdiSubWindow_keyboardPageStep'; -procedure QMdiSubWindow_setSystemMenu(handle: QMdiSubWindowH; systemMenu: QMenuH); cdecl; external QtIntf name 'QMdiSubWindow_setSystemMenu'; -function QMdiSubWindow_systemMenu(handle: QMdiSubWindowH): QMenuH; cdecl; external QtIntf name 'QMdiSubWindow_systemMenu'; -procedure QMdiSubWindow_showSystemMenu(handle: QMdiSubWindowH); cdecl; external QtIntf name 'QMdiSubWindow_showSystemMenu'; -procedure QMdiSubWindow_showShaded(handle: QMdiSubWindowH); cdecl; external QtIntf name 'QMdiSubWindow_showShaded'; - - -type - QMdiSubWindow_windowStateChanged_Event = procedure (oldState: QtWindowStates; newState: QtWindowStates) of object cdecl; - QMdiSubWindow_aboutToActivate_Event = procedure () of object cdecl; - - - type QCalendarWidgetHorizontalHeaderFormat = ( // QCalendarWidget::HorizontalHeaderFormat (1) QCalendarWidgetNoHorizontalHeader, QCalendarWidgetSingleLetterDayNames, QCalendarWidgetShortDayNames, QCalendarWidgetLongDayNames ); @@ -6344,8 +6052,8 @@ function QCalendarWidget_firstDayOfWeek(handle: QCalendarWidgetH): QtDayOfWeek; procedure QCalendarWidget_setFirstDayOfWeek(handle: QCalendarWidgetH; dayOfWeek: QtDayOfWeek); cdecl; external QtIntf name 'QCalendarWidget_setFirstDayOfWeek'; function QCalendarWidget_isHeaderVisible(handle: QCalendarWidgetH): Boolean; cdecl; external QtIntf name 'QCalendarWidget_isHeaderVisible'; procedure QCalendarWidget_setHeaderVisible(handle: QCalendarWidgetH; show: Boolean); cdecl; external QtIntf name 'QCalendarWidget_setHeaderVisible'; -function QCalendarWidget_isNavigationBarVisible(handle: QCalendarWidgetH): Boolean; cdecl; external QtIntf name 'QCalendarWidget_isNavigationBarVisible'; function QCalendarWidget_isGridVisible(handle: QCalendarWidgetH): Boolean; cdecl; external QtIntf name 'QCalendarWidget_isGridVisible'; +procedure QCalendarWidget_setGridVisible(handle: QCalendarWidgetH; show: Boolean); cdecl; external QtIntf name 'QCalendarWidget_setGridVisible'; function QCalendarWidget_selectionMode(handle: QCalendarWidgetH): QCalendarWidgetSelectionMode; cdecl; external QtIntf name 'QCalendarWidget_selectionMode'; procedure QCalendarWidget_setSelectionMode(handle: QCalendarWidgetH; mode: QCalendarWidgetSelectionMode); cdecl; external QtIntf name 'QCalendarWidget_setSelectionMode'; function QCalendarWidget_horizontalHeaderFormat(handle: QCalendarWidgetH): QCalendarWidgetHorizontalHeaderFormat; cdecl; external QtIntf name 'QCalendarWidget_horizontalHeaderFormat'; @@ -6358,15 +6066,9 @@ procedure QCalendarWidget_weekdayTextFormat(handle: QCalendarWidgetH; retval: QT procedure QCalendarWidget_setWeekdayTextFormat(handle: QCalendarWidgetH; dayOfWeek: QtDayOfWeek; format: QTextCharFormatH); cdecl; external QtIntf name 'QCalendarWidget_setWeekdayTextFormat'; procedure QCalendarWidget_dateTextFormat(handle: QCalendarWidgetH; retval: QTextCharFormatH; date: QDateH); overload; cdecl; external QtIntf name 'QCalendarWidget_dateTextFormat2'; procedure QCalendarWidget_setDateTextFormat(handle: QCalendarWidgetH; date: QDateH; color: QTextCharFormatH); cdecl; external QtIntf name 'QCalendarWidget_setDateTextFormat'; -function QCalendarWidget_isDateEditEnabled(handle: QCalendarWidgetH): Boolean; cdecl; external QtIntf name 'QCalendarWidget_isDateEditEnabled'; -procedure QCalendarWidget_setDateEditEnabled(handle: QCalendarWidgetH; enable: Boolean); cdecl; external QtIntf name 'QCalendarWidget_setDateEditEnabled'; -function QCalendarWidget_dateEditAcceptDelay(handle: QCalendarWidgetH): Integer; cdecl; external QtIntf name 'QCalendarWidget_dateEditAcceptDelay'; -procedure QCalendarWidget_setDateEditAcceptDelay(handle: QCalendarWidgetH; delay: Integer); cdecl; external QtIntf name 'QCalendarWidget_setDateEditAcceptDelay'; procedure QCalendarWidget_setSelectedDate(handle: QCalendarWidgetH; date: QDateH); cdecl; external QtIntf name 'QCalendarWidget_setSelectedDate'; procedure QCalendarWidget_setDateRange(handle: QCalendarWidgetH; min: QDateH; max: QDateH); cdecl; external QtIntf name 'QCalendarWidget_setDateRange'; procedure QCalendarWidget_setCurrentPage(handle: QCalendarWidgetH; year: Integer; month: Integer); cdecl; external QtIntf name 'QCalendarWidget_setCurrentPage'; -procedure QCalendarWidget_setGridVisible(handle: QCalendarWidgetH; show: Boolean); cdecl; external QtIntf name 'QCalendarWidget_setGridVisible'; -procedure QCalendarWidget_setNavigationBarVisible(handle: QCalendarWidgetH; visible: Boolean); cdecl; external QtIntf name 'QCalendarWidget_setNavigationBarVisible'; procedure QCalendarWidget_showNextMonth(handle: QCalendarWidgetH); cdecl; external QtIntf name 'QCalendarWidget_showNextMonth'; procedure QCalendarWidget_showPreviousMonth(handle: QCalendarWidgetH); cdecl; external QtIntf name 'QCalendarWidget_showPreviousMonth'; procedure QCalendarWidget_showNextYear(handle: QCalendarWidgetH); cdecl; external QtIntf name 'QCalendarWidget_showNextYear'; @@ -6473,7 +6175,6 @@ procedure QAbstractItemView_clearSelection(handle: QAbstractItemViewH); cdecl; e procedure QAbstractItemView_setCurrentIndex(handle: QAbstractItemViewH; index: QModelIndexH); cdecl; external QtIntf name 'QAbstractItemView_setCurrentIndex'; procedure QAbstractItemView_scrollToTop(handle: QAbstractItemViewH); cdecl; external QtIntf name 'QAbstractItemView_scrollToTop'; procedure QAbstractItemView_scrollToBottom(handle: QAbstractItemViewH); cdecl; external QtIntf name 'QAbstractItemView_scrollToBottom'; -procedure QAbstractItemView_update(handle: QAbstractItemViewH; index: QModelIndexH); cdecl; external QtIntf name 'QAbstractItemView_update'; type @@ -6531,8 +6232,6 @@ procedure QListView_setUniformItemSizes(handle: QListViewH; enable: Boolean); cd function QListView_uniformItemSizes(handle: QListViewH): Boolean; cdecl; external QtIntf name 'QListView_uniformItemSizes'; procedure QListView_setWordWrap(handle: QListViewH; _on: Boolean); cdecl; external QtIntf name 'QListView_setWordWrap'; function QListView_wordWrap(handle: QListViewH): Boolean; cdecl; external QtIntf name 'QListView_wordWrap'; -procedure QListView_setSelectionRectVisible(handle: QListViewH; show: Boolean); cdecl; external QtIntf name 'QListView_setSelectionRectVisible'; -function QListView_isSelectionRectVisible(handle: QListViewH): Boolean; cdecl; external QtIntf name 'QListView_isSelectionRectVisible'; procedure QListView_visualRect(handle: QListViewH; retval: PRect; index: QModelIndexH); cdecl; external QtIntf name 'QListView_visualRect'; procedure QListView_scrollTo(handle: QListViewH; index: QModelIndexH; hint: QAbstractItemViewScrollHint); cdecl; external QtIntf name 'QListView_scrollTo'; procedure QListView_indexAt(handle: QListViewH; retval: QModelIndexH; p: PPoint); cdecl; external QtIntf name 'QListView_indexAt'; @@ -6618,7 +6317,6 @@ procedure QListWidget_openPersistentEditor(handle: QListWidgetH; item: QListWidg procedure QListWidget_closePersistentEditor(handle: QListWidgetH; item: QListWidgetItemH); cdecl; external QtIntf name 'QListWidget_closePersistentEditor'; function QListWidget_itemWidget(handle: QListWidgetH; item: QListWidgetItemH): QWidgetH; cdecl; external QtIntf name 'QListWidget_itemWidget'; procedure QListWidget_setItemWidget(handle: QListWidgetH; item: QListWidgetItemH; widget: QWidgetH); cdecl; external QtIntf name 'QListWidget_setItemWidget'; -procedure QListWidget_removeItemWidget(handle: QListWidgetH; item: QListWidgetItemH); cdecl; external QtIntf name 'QListWidget_removeItemWidget'; function QListWidget_isItemSelected(handle: QListWidgetH; item: QListWidgetItemH): Boolean; cdecl; external QtIntf name 'QListWidget_isItemSelected'; procedure QListWidget_setItemSelected(handle: QListWidgetH; item: QListWidgetItemH; select: Boolean); cdecl; external QtIntf name 'QListWidget_setItemSelected'; procedure QListWidget_selectedItems(handle: QListWidgetH; retval: PIntArray); cdecl; external QtIntf name 'QListWidget_selectedItems'; @@ -6650,8 +6348,6 @@ procedure QTreeView_setRootIndex(handle: QTreeViewH; index: QModelIndexH); cdecl procedure QTreeView_setSelectionModel(handle: QTreeViewH; selectionModel: QItemSelectionModelH); cdecl; external QtIntf name 'QTreeView_setSelectionModel'; function QTreeView_header(handle: QTreeViewH): QHeaderViewH; cdecl; external QtIntf name 'QTreeView_header'; procedure QTreeView_setHeader(handle: QTreeViewH; header: QHeaderViewH); cdecl; external QtIntf name 'QTreeView_setHeader'; -function QTreeView_autoExpandDelay(handle: QTreeViewH): Integer; cdecl; external QtIntf name 'QTreeView_autoExpandDelay'; -procedure QTreeView_setAutoExpandDelay(handle: QTreeViewH; delay: Integer); cdecl; external QtIntf name 'QTreeView_setAutoExpandDelay'; function QTreeView_indentation(handle: QTreeViewH): Integer; cdecl; external QtIntf name 'QTreeView_indentation'; procedure QTreeView_setIndentation(handle: QTreeViewH; i: Integer); cdecl; external QtIntf name 'QTreeView_setIndentation'; function QTreeView_rootIsDecorated(handle: QTreeViewH): Boolean; cdecl; external QtIntf name 'QTreeView_rootIsDecorated'; @@ -6668,8 +6364,6 @@ function QTreeView_isColumnHidden(handle: QTreeViewH; column: Integer): Boolean; procedure QTreeView_setColumnHidden(handle: QTreeViewH; column: Integer; hide: Boolean); cdecl; external QtIntf name 'QTreeView_setColumnHidden'; function QTreeView_isRowHidden(handle: QTreeViewH; row: Integer; parent: QModelIndexH): Boolean; cdecl; external QtIntf name 'QTreeView_isRowHidden'; procedure QTreeView_setRowHidden(handle: QTreeViewH; row: Integer; parent: QModelIndexH; hide: Boolean); cdecl; external QtIntf name 'QTreeView_setRowHidden'; -function QTreeView_isFirstColumnSpanned(handle: QTreeViewH; row: Integer; parent: QModelIndexH): Boolean; cdecl; external QtIntf name 'QTreeView_isFirstColumnSpanned'; -procedure QTreeView_setFirstColumnSpanned(handle: QTreeViewH; row: Integer; parent: QModelIndexH; span: Boolean); cdecl; external QtIntf name 'QTreeView_setFirstColumnSpanned'; function QTreeView_isExpanded(handle: QTreeViewH; index: QModelIndexH): Boolean; cdecl; external QtIntf name 'QTreeView_isExpanded'; procedure QTreeView_setExpanded(handle: QTreeViewH; index: QModelIndexH; expand: Boolean); cdecl; external QtIntf name 'QTreeView_setExpanded'; procedure QTreeView_setSortingEnabled(handle: QTreeViewH; enable: Boolean); cdecl; external QtIntf name 'QTreeView_setSortingEnabled'; @@ -6678,8 +6372,6 @@ procedure QTreeView_setAnimated(handle: QTreeViewH; enable: Boolean); cdecl; ext function QTreeView_isAnimated(handle: QTreeViewH): Boolean; cdecl; external QtIntf name 'QTreeView_isAnimated'; procedure QTreeView_setAllColumnsShowFocus(handle: QTreeViewH; enable: Boolean); cdecl; external QtIntf name 'QTreeView_setAllColumnsShowFocus'; function QTreeView_allColumnsShowFocus(handle: QTreeViewH): Boolean; cdecl; external QtIntf name 'QTreeView_allColumnsShowFocus'; -procedure QTreeView_setWordWrap(handle: QTreeViewH; _on: Boolean); cdecl; external QtIntf name 'QTreeView_setWordWrap'; -function QTreeView_wordWrap(handle: QTreeViewH): Boolean; cdecl; external QtIntf name 'QTreeView_wordWrap'; procedure QTreeView_keyboardSearch(handle: QTreeViewH; search: PWideString); cdecl; external QtIntf name 'QTreeView_keyboardSearch'; procedure QTreeView_visualRect(handle: QTreeViewH; retval: PRect; index: QModelIndexH); cdecl; external QtIntf name 'QTreeView_visualRect'; procedure QTreeView_scrollTo(handle: QTreeViewH; index: QModelIndexH; hint: QAbstractItemViewScrollHint); cdecl; external QtIntf name 'QTreeView_scrollTo'; @@ -6699,7 +6391,6 @@ procedure QTreeView_sortByColumn(handle: QTreeViewH; column: Integer); overload; procedure QTreeView_selectAll(handle: QTreeViewH); cdecl; external QtIntf name 'QTreeView_selectAll'; procedure QTreeView_expandAll(handle: QTreeViewH); cdecl; external QtIntf name 'QTreeView_expandAll'; procedure QTreeView_collapseAll(handle: QTreeViewH); cdecl; external QtIntf name 'QTreeView_collapseAll'; -procedure QTreeView_expandToDepth(handle: QTreeViewH; depth: Integer); cdecl; external QtIntf name 'QTreeView_expandToDepth'; type @@ -6709,9 +6400,6 @@ type type - QTreeWidgetItemChildIndicatorPolicy = ( // QTreeWidgetItem::ChildIndicatorPolicy (1) - QTreeWidgetItemShowIndicator, QTreeWidgetItemDontShowIndicator, QTreeWidgetItemDontShowIndicatorWhenChildless ); - QTreeWidgetItemItemType = ( //QTreeWidgetItem::ItemType (2s) QTreeWidgetItemType = 0, QTreeWidgetItemUserType = 1000 ); @@ -6734,12 +6422,6 @@ procedure QTreeWidgetItem_setHidden(handle: QTreeWidgetItemH; hide: Boolean); cd function QTreeWidgetItem_isHidden(handle: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidgetItem_isHidden'; procedure QTreeWidgetItem_setExpanded(handle: QTreeWidgetItemH; expand: Boolean); cdecl; external QtIntf name 'QTreeWidgetItem_setExpanded'; function QTreeWidgetItem_isExpanded(handle: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidgetItem_isExpanded'; -procedure QTreeWidgetItem_setFirstColumnSpanned(handle: QTreeWidgetItemH; span: Boolean); cdecl; external QtIntf name 'QTreeWidgetItem_setFirstColumnSpanned'; -function QTreeWidgetItem_isFirstColumnSpanned(handle: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidgetItem_isFirstColumnSpanned'; -procedure QTreeWidgetItem_setDisabled(handle: QTreeWidgetItemH; disabled: Boolean); cdecl; external QtIntf name 'QTreeWidgetItem_setDisabled'; -function QTreeWidgetItem_isDisabled(handle: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidgetItem_isDisabled'; -procedure QTreeWidgetItem_setChildIndicatorPolicy(handle: QTreeWidgetItemH; policy: QTreeWidgetItemChildIndicatorPolicy); cdecl; external QtIntf name 'QTreeWidgetItem_setChildIndicatorPolicy'; -function QTreeWidgetItem_childIndicatorPolicy(handle: QTreeWidgetItemH): QTreeWidgetItemChildIndicatorPolicy; cdecl; external QtIntf name 'QTreeWidgetItem_childIndicatorPolicy'; function QTreeWidgetItem_flags(handle: QTreeWidgetItemH): QtItemFlags; cdecl; external QtIntf name 'QTreeWidgetItem_flags'; procedure QTreeWidgetItem_setFlags(handle: QTreeWidgetItemH; flags: QtItemFlags); cdecl; external QtIntf name 'QTreeWidgetItem_setFlags'; procedure QTreeWidgetItem_text(handle: QTreeWidgetItemH; retval: PWideString; column: Integer); cdecl; external QtIntf name 'QTreeWidgetItem_text'; @@ -6779,7 +6461,6 @@ function QTreeWidgetItem_columnCount(handle: QTreeWidgetItemH): Integer; cdecl; function QTreeWidgetItem_indexOfChild(handle: QTreeWidgetItemH; child: QTreeWidgetItemH): Integer; cdecl; external QtIntf name 'QTreeWidgetItem_indexOfChild'; procedure QTreeWidgetItem_addChild(handle: QTreeWidgetItemH; child: QTreeWidgetItemH); cdecl; external QtIntf name 'QTreeWidgetItem_addChild'; procedure QTreeWidgetItem_insertChild(handle: QTreeWidgetItemH; index: Integer; child: QTreeWidgetItemH); cdecl; external QtIntf name 'QTreeWidgetItem_insertChild'; -procedure QTreeWidgetItem_removeChild(handle: QTreeWidgetItemH; child: QTreeWidgetItemH); cdecl; external QtIntf name 'QTreeWidgetItem_removeChild'; function QTreeWidgetItem_takeChild(handle: QTreeWidgetItemH; index: Integer): QTreeWidgetItemH; cdecl; external QtIntf name 'QTreeWidgetItem_takeChild'; procedure QTreeWidgetItem_addChildren(handle: QTreeWidgetItemH; children: PIntArray); cdecl; external QtIntf name 'QTreeWidgetItem_addChildren'; procedure QTreeWidgetItem_insertChildren(handle: QTreeWidgetItemH; index: Integer; children: PIntArray); cdecl; external QtIntf name 'QTreeWidgetItem_insertChildren'; @@ -6820,7 +6501,6 @@ procedure QTreeWidget_openPersistentEditor(handle: QTreeWidgetH; item: QTreeWidg procedure QTreeWidget_closePersistentEditor(handle: QTreeWidgetH; item: QTreeWidgetItemH; column: Integer = 0); cdecl; external QtIntf name 'QTreeWidget_closePersistentEditor'; function QTreeWidget_itemWidget(handle: QTreeWidgetH; item: QTreeWidgetItemH; column: Integer): QWidgetH; cdecl; external QtIntf name 'QTreeWidget_itemWidget'; procedure QTreeWidget_setItemWidget(handle: QTreeWidgetH; item: QTreeWidgetItemH; column: Integer; widget: QWidgetH); cdecl; external QtIntf name 'QTreeWidget_setItemWidget'; -procedure QTreeWidget_removeItemWidget(handle: QTreeWidgetH; item: QTreeWidgetItemH; column: Integer); cdecl; external QtIntf name 'QTreeWidget_removeItemWidget'; function QTreeWidget_isItemSelected(handle: QTreeWidgetH; item: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidget_isItemSelected'; procedure QTreeWidget_setItemSelected(handle: QTreeWidgetH; item: QTreeWidgetItemH; select: Boolean); cdecl; external QtIntf name 'QTreeWidget_setItemSelected'; procedure QTreeWidget_selectedItems(handle: QTreeWidgetH; retval: PIntArray); cdecl; external QtIntf name 'QTreeWidget_selectedItems'; @@ -6829,10 +6509,6 @@ function QTreeWidget_isItemHidden(handle: QTreeWidgetH; item: QTreeWidgetItemH): procedure QTreeWidget_setItemHidden(handle: QTreeWidgetH; item: QTreeWidgetItemH; hide: Boolean); cdecl; external QtIntf name 'QTreeWidget_setItemHidden'; function QTreeWidget_isItemExpanded(handle: QTreeWidgetH; item: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidget_isItemExpanded'; procedure QTreeWidget_setItemExpanded(handle: QTreeWidgetH; item: QTreeWidgetItemH; expand: Boolean); cdecl; external QtIntf name 'QTreeWidget_setItemExpanded'; -function QTreeWidget_isFirstItemColumnSpanned(handle: QTreeWidgetH; item: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidget_isFirstItemColumnSpanned'; -procedure QTreeWidget_setFirstItemColumnSpanned(handle: QTreeWidgetH; item: QTreeWidgetItemH; span: Boolean); cdecl; external QtIntf name 'QTreeWidget_setFirstItemColumnSpanned'; -function QTreeWidget_itemAbove(handle: QTreeWidgetH; item: QTreeWidgetItemH): QTreeWidgetItemH; cdecl; external QtIntf name 'QTreeWidget_itemAbove'; -function QTreeWidget_itemBelow(handle: QTreeWidgetH; item: QTreeWidgetItemH): QTreeWidgetItemH; cdecl; external QtIntf name 'QTreeWidget_itemBelow'; procedure QTreeWidget_scrollToItem(handle: QTreeWidgetH; item: QTreeWidgetItemH; hint: QAbstractItemViewScrollHint); cdecl; external QtIntf name 'QTreeWidget_scrollToItem'; procedure QTreeWidget_expandItem(handle: QTreeWidgetH; item: QTreeWidgetItemH); cdecl; external QtIntf name 'QTreeWidget_expandItem'; procedure QTreeWidget_collapseItem(handle: QTreeWidgetH; item: QTreeWidgetItemH); cdecl; external QtIntf name 'QTreeWidget_collapseItem'; @@ -6918,12 +6594,8 @@ procedure QHeaderView_setDefaultAlignment(handle: QHeaderViewH; alignment: QtAli procedure QHeaderView_doItemsLayout(handle: QHeaderViewH); cdecl; external QtIntf name 'QHeaderView_doItemsLayout'; function QHeaderView_sectionsMoved(handle: QHeaderViewH): Boolean; cdecl; external QtIntf name 'QHeaderView_sectionsMoved'; function QHeaderView_sectionsHidden(handle: QHeaderViewH): Boolean; cdecl; external QtIntf name 'QHeaderView_sectionsHidden'; -procedure QHeaderView_saveState(handle: QHeaderViewH; retval: QByteArrayH); cdecl; external QtIntf name 'QHeaderView_saveState'; -function QHeaderView_restoreState(handle: QHeaderViewH; state: QByteArrayH): Boolean; cdecl; external QtIntf name 'QHeaderView_restoreState'; -procedure QHeaderView_reset(handle: QHeaderViewH); cdecl; external QtIntf name 'QHeaderView_reset'; procedure QHeaderView_setOffset(handle: QHeaderViewH; offset: Integer); cdecl; external QtIntf name 'QHeaderView_setOffset'; procedure QHeaderView_setOffsetToSectionPosition(handle: QHeaderViewH; visualIndex: Integer); cdecl; external QtIntf name 'QHeaderView_setOffsetToSectionPosition'; -procedure QHeaderView_setOffsetToLastSection(handle: QHeaderViewH); cdecl; external QtIntf name 'QHeaderView_setOffsetToLastSection'; procedure QHeaderView_headerDataChanged(handle: QHeaderViewH; orientation: QtOrientation; logicalFirst: Integer; logicalLast: Integer); cdecl; external QtIntf name 'QHeaderView_headerDataChanged'; @@ -6932,13 +6604,11 @@ type QHeaderView_sectionResized_Event = procedure (logicalIndex: Integer; oldSize: Integer; newSize: Integer) of object cdecl; QHeaderView_sectionPressed_Event = procedure (logicalIndex: Integer) of object cdecl; QHeaderView_sectionClicked_Event = procedure (logicalIndex: Integer) of object cdecl; - QHeaderView_sectionEntered_Event = procedure (logicalIndex: Integer) of object cdecl; QHeaderView_sectionDoubleClicked_Event = procedure (logicalIndex: Integer) of object cdecl; QHeaderView_sectionCountChanged_Event = procedure (oldCount: Integer; newCount: Integer) of object cdecl; QHeaderView_sectionHandleDoubleClicked_Event = procedure (logicalIndex: Integer) of object cdecl; QHeaderView_sectionAutoResize_Event = procedure (logicalIndex: Integer; mode: QHeaderViewResizeMode) of object cdecl; QHeaderView_geometriesChanged_Event = procedure () of object cdecl; - QHeaderView_sortIndicatorChanged_Event = procedure (logicalIndex: Integer; order: QtSortOrder) of object cdecl; @@ -7011,15 +6681,13 @@ procedure QStandardItem_setChild(handle: QStandardItemH; row: Integer; column: I procedure QStandardItem_setChild(handle: QStandardItemH; row: Integer; item: QStandardItemH); overload; cdecl; external QtIntf name 'QStandardItem_setChild2'; procedure QStandardItem_insertRow(handle: QStandardItemH; row: Integer; items: PIntArray); overload; cdecl; external QtIntf name 'QStandardItem_insertRow'; procedure QStandardItem_insertColumn(handle: QStandardItemH; column: Integer; items: PIntArray); cdecl; external QtIntf name 'QStandardItem_insertColumn'; -procedure QStandardItem_insertRows(handle: QStandardItemH; row: Integer; items: PIntArray); overload; cdecl; external QtIntf name 'QStandardItem_insertRows'; -procedure QStandardItem_insertRows(handle: QStandardItemH; row: Integer; count: Integer); overload; cdecl; external QtIntf name 'QStandardItem_insertRows2'; +procedure QStandardItem_insertRows(handle: QStandardItemH; row: Integer; count: Integer); cdecl; external QtIntf name 'QStandardItem_insertRows'; procedure QStandardItem_insertColumns(handle: QStandardItemH; column: Integer; count: Integer); cdecl; external QtIntf name 'QStandardItem_insertColumns'; procedure QStandardItem_removeRow(handle: QStandardItemH; row: Integer); cdecl; external QtIntf name 'QStandardItem_removeRow'; procedure QStandardItem_removeColumn(handle: QStandardItemH; column: Integer); cdecl; external QtIntf name 'QStandardItem_removeColumn'; procedure QStandardItem_removeRows(handle: QStandardItemH; row: Integer; count: Integer); cdecl; external QtIntf name 'QStandardItem_removeRows'; procedure QStandardItem_removeColumns(handle: QStandardItemH; column: Integer; count: Integer); cdecl; external QtIntf name 'QStandardItem_removeColumns'; procedure QStandardItem_appendRow(handle: QStandardItemH; items: PIntArray); overload; cdecl; external QtIntf name 'QStandardItem_appendRow'; -procedure QStandardItem_appendRows(handle: QStandardItemH; items: PIntArray); cdecl; external QtIntf name 'QStandardItem_appendRows'; procedure QStandardItem_appendColumn(handle: QStandardItemH; items: PIntArray); cdecl; external QtIntf name 'QStandardItem_appendColumn'; procedure QStandardItem_insertRow(handle: QStandardItemH; row: Integer; item: QStandardItemH); overload; cdecl; external QtIntf name 'QStandardItem_insertRow2'; procedure QStandardItem_appendRow(handle: QStandardItemH; item: QStandardItemH); overload; cdecl; external QtIntf name 'QStandardItem_appendRow2'; @@ -7197,11 +6865,9 @@ function QMessageBox_standardButtons(handle: QMessageBoxH): QMessageBoxStandardB function QMessageBox_standardButton(handle: QMessageBoxH; button: QAbstractButtonH): QMessageBoxStandardButton; cdecl; external QtIntf name 'QMessageBox_standardButton'; function QMessageBox_button(handle: QMessageBoxH; which: QMessageBoxStandardButton): QAbstractButtonH; cdecl; external QtIntf name 'QMessageBox_button'; function QMessageBox_defaultButton(handle: QMessageBoxH): QPushButtonH; cdecl; external QtIntf name 'QMessageBox_defaultButton'; -procedure QMessageBox_setDefaultButton(handle: QMessageBoxH; button: QPushButtonH); overload; cdecl; external QtIntf name 'QMessageBox_setDefaultButton'; -procedure QMessageBox_setDefaultButton(handle: QMessageBoxH; button: QMessageBoxStandardButton); overload; cdecl; external QtIntf name 'QMessageBox_setDefaultButton2'; +procedure QMessageBox_setDefaultButton(handle: QMessageBoxH; button: QPushButtonH); cdecl; external QtIntf name 'QMessageBox_setDefaultButton'; function QMessageBox_escapeButton(handle: QMessageBoxH): QAbstractButtonH; cdecl; external QtIntf name 'QMessageBox_escapeButton'; -procedure QMessageBox_setEscapeButton(handle: QMessageBoxH; button: QAbstractButtonH); overload; cdecl; external QtIntf name 'QMessageBox_setEscapeButton'; -procedure QMessageBox_setEscapeButton(handle: QMessageBoxH; button: QMessageBoxStandardButton); overload; cdecl; external QtIntf name 'QMessageBox_setEscapeButton2'; +procedure QMessageBox_setEscapeButton(handle: QMessageBoxH; button: QAbstractButtonH); cdecl; external QtIntf name 'QMessageBox_setEscapeButton'; function QMessageBox_clickedButton(handle: QMessageBoxH): QAbstractButtonH; cdecl; external QtIntf name 'QMessageBox_clickedButton'; procedure QMessageBox_text(handle: QMessageBoxH; retval: PWideString); cdecl; external QtIntf name 'QMessageBox_text'; procedure QMessageBox_setText(handle: QMessageBoxH; text: PWideString); cdecl; external QtIntf name 'QMessageBox_setText'; @@ -7239,7 +6905,7 @@ function QInputDialog_getDouble(parent: QWidgetH; title: PWideString; _label: PW procedure QInputDialog_getItem(retval: PWideString; parent: QWidgetH; title: PWideString; _label: PWideString; list: QStringListH; current: Integer = 0; editable: Boolean = True; ok: PBoolean = nil; f: QtWindowFlags = 0); cdecl; external QtIntf name 'QInputDialog_getItem'; procedure QColorDialog_getColor(retval: PQColor; init: PQColor; parent: QWidgetH = nil); cdecl; external QtIntf name 'QColorDialog_getColor'; -function QColorDialog_getRgba(p1: QRgb = 4294967295; ok: PBoolean = nil; parent: QWidgetH = nil): QRgb; cdecl; external QtIntf name 'QColorDialog_getRgba'; +function QColorDialog_getRgba(p1: QRgb; ok: PBoolean = nil; parent: QWidgetH = nil): QRgb; cdecl; external QtIntf name 'QColorDialog_getRgba'; function QColorDialog_customCount(): Integer; cdecl; external QtIntf name 'QColorDialog_customCount'; function QColorDialog_customColor(p1: Integer): QRgb; cdecl; external QtIntf name 'QColorDialog_customColor'; procedure QColorDialog_setCustomColor(p1: Integer; p2: QRgb); cdecl; external QtIntf name 'QColorDialog_setCustomColor'; @@ -7292,8 +6958,6 @@ procedure QFileDialog_setReadOnly(handle: QFileDialogH; enabled: Boolean); cdecl function QFileDialog_isReadOnly(handle: QFileDialogH): Boolean; cdecl; external QtIntf name 'QFileDialog_isReadOnly'; procedure QFileDialog_setResolveSymlinks(handle: QFileDialogH; enabled: Boolean); cdecl; external QtIntf name 'QFileDialog_setResolveSymlinks'; function QFileDialog_resolveSymlinks(handle: QFileDialogH): Boolean; cdecl; external QtIntf name 'QFileDialog_resolveSymlinks'; -procedure QFileDialog_saveState(handle: QFileDialogH; retval: QByteArrayH); cdecl; external QtIntf name 'QFileDialog_saveState'; -function QFileDialog_restoreState(handle: QFileDialogH; state: QByteArrayH): Boolean; cdecl; external QtIntf name 'QFileDialog_restoreState'; procedure QFileDialog_setConfirmOverwrite(handle: QFileDialogH; enabled: Boolean); cdecl; external QtIntf name 'QFileDialog_setConfirmOverwrite'; function QFileDialog_confirmOverwrite(handle: QFileDialogH): Boolean; cdecl; external QtIntf name 'QFileDialog_confirmOverwrite'; procedure QFileDialog_setDefaultSuffix(handle: QFileDialogH; suffix: PWideString); cdecl; external QtIntf name 'QFileDialog_setDefaultSuffix'; @@ -7306,8 +6970,6 @@ procedure QFileDialog_setIconProvider(handle: QFileDialogH; provider: QFileIconP function QFileDialog_iconProvider(handle: QFileDialogH): QFileIconProviderH; cdecl; external QtIntf name 'QFileDialog_iconProvider'; procedure QFileDialog_setLabelText(handle: QFileDialogH; _label: QFileDialogDialogLabel; text: PWideString); cdecl; external QtIntf name 'QFileDialog_setLabelText'; procedure QFileDialog_labelText(handle: QFileDialogH; retval: PWideString; _label: QFileDialogDialogLabel); cdecl; external QtIntf name 'QFileDialog_labelText'; -procedure QFileDialog_setProxyModel(handle: QFileDialogH; model: QAbstractProxyModelH); cdecl; external QtIntf name 'QFileDialog_setProxyModel'; -function QFileDialog_proxyModel(handle: QFileDialogH): QAbstractProxyModelH; cdecl; external QtIntf name 'QFileDialog_proxyModel'; procedure QFileDialog_getOpenFileName(retval: PWideString; parent: QWidgetH = nil; caption: PWideString = nil; dir: PWideString = nil; filter: PWideString = nil; selectedFilter: PWideString = nil; options: QFileDialogOptions = 0); cdecl; external QtIntf name 'QFileDialog_getOpenFileName'; procedure QFileDialog_getSaveFileName(retval: PWideString; parent: QWidgetH = nil; caption: PWideString = nil; dir: PWideString = nil; filter: PWideString = nil; selectedFilter: PWideString = nil; options: QFileDialogOptions = 0); cdecl; external QtIntf name 'QFileDialog_getSaveFileName'; procedure QFileDialog_getExistingDirectory(retval: PWideString; parent: QWidgetH = nil; caption: PWideString = nil; dir: PWideString = nil; options: QFileDialogOptions = QFileDialogShowDirsOnly); cdecl; external QtIntf name 'QFileDialog_getExistingDirectory'; @@ -7322,6 +6984,7 @@ procedure QProgressDialog_setBar(handle: QProgressDialogH; bar: QProgressBarH); function QProgressDialog_wasCanceled(handle: QProgressDialogH): Boolean; cdecl; external QtIntf name 'QProgressDialog_wasCanceled'; function QProgressDialog_minimum(handle: QProgressDialogH): Integer; cdecl; external QtIntf name 'QProgressDialog_minimum'; function QProgressDialog_maximum(handle: QProgressDialogH): Integer; cdecl; external QtIntf name 'QProgressDialog_maximum'; +procedure QProgressDialog_setRange(handle: QProgressDialogH; minimum: Integer; maximum: Integer); cdecl; external QtIntf name 'QProgressDialog_setRange'; function QProgressDialog_value(handle: QProgressDialogH): Integer; cdecl; external QtIntf name 'QProgressDialog_value'; procedure QProgressDialog_sizeHint(handle: QProgressDialogH; retval: PSize); cdecl; external QtIntf name 'QProgressDialog_sizeHint'; procedure QProgressDialog_labelText(handle: QProgressDialogH; retval: PWideString); cdecl; external QtIntf name 'QProgressDialog_labelText'; @@ -7334,7 +6997,6 @@ procedure QProgressDialog_cancel(handle: QProgressDialogH); cdecl; external QtIn procedure QProgressDialog_reset(handle: QProgressDialogH); cdecl; external QtIntf name 'QProgressDialog_reset'; procedure QProgressDialog_setMaximum(handle: QProgressDialogH; maximum: Integer); cdecl; external QtIntf name 'QProgressDialog_setMaximum'; procedure QProgressDialog_setMinimum(handle: QProgressDialogH; minimum: Integer); cdecl; external QtIntf name 'QProgressDialog_setMinimum'; -procedure QProgressDialog_setRange(handle: QProgressDialogH; minimum: Integer; maximum: Integer); cdecl; external QtIntf name 'QProgressDialog_setRange'; procedure QProgressDialog_setValue(handle: QProgressDialogH; progress: Integer); cdecl; external QtIntf name 'QProgressDialog_setValue'; procedure QProgressDialog_setLabelText(handle: QProgressDialogH; p1: PWideString); cdecl; external QtIntf name 'QProgressDialog_setLabelText'; procedure QProgressDialog_setCancelButtonText(handle: QProgressDialogH; p1: PWideString); cdecl; external QtIntf name 'QProgressDialog_setCancelButtonText'; @@ -7399,7 +7061,6 @@ procedure QSystemTrayIcon_setToolTip(handle: QSystemTrayIconH; tip: PWideString) function QSystemTrayIcon_isSystemTrayAvailable(): Boolean; cdecl; external QtIntf name 'QSystemTrayIcon_isSystemTrayAvailable'; function QSystemTrayIcon_supportsMessages(): Boolean; cdecl; external QtIntf name 'QSystemTrayIcon_supportsMessages'; procedure QSystemTrayIcon_showMessage(handle: QSystemTrayIconH; title: PWideString; msg: PWideString; icon: QSystemTrayIconMessageIcon = QSystemTrayIconInformation; msecs: Integer = 10000); cdecl; external QtIntf name 'QSystemTrayIcon_showMessage'; -procedure QSystemTrayIcon_geometry(handle: QSystemTrayIconH; retval: PRect); cdecl; external QtIntf name 'QSystemTrayIcon_geometry'; function QSystemTrayIcon_isVisible(handle: QSystemTrayIconH): Boolean; cdecl; external QtIntf name 'QSystemTrayIcon_isVisible'; procedure QSystemTrayIcon_setVisible(handle: QSystemTrayIconH; visible: Boolean); cdecl; external QtIntf name 'QSystemTrayIcon_setVisible'; procedure QSystemTrayIcon_show(handle: QSystemTrayIconH); cdecl; external QtIntf name 'QSystemTrayIcon_show'; @@ -7433,7 +7094,6 @@ const QStyleState_UpArrow = $00004000; QStyleState_Selected = $00008000; QStyleState_Active = $00010000; - QStyleState_Window = $00020000; QStyleState_Open = $00040000; QStyleState_Children = $00080000; QStyleState_Item = $00100000; @@ -7441,8 +7101,6 @@ const QStyleState_Editing = $00400000; QStyleState_KeyboardFocusChange = $00800000; QStyleState_ReadOnly = $02000000; - QStyleState_Small = $04000000; - QStyleState_Mini = $08000000; type @@ -7494,7 +7152,6 @@ type QStylePE_IndicatorTabTear, QStylePE_PanelScrollAreaCorner, QStylePE_Widget, - QStylePE_IndicatorColumnViewArrow, QStylePE_CustomBase = $f000000 ); QStyleControlElement = ( //QStyle::ControlElement (2) @@ -7540,10 +7197,6 @@ type QStyleCE_FocusFrame, QStyleCE_ComboBoxLabel, QStyleCE_ToolBar, - QStyleCE_ToolBoxTabShape, - QStyleCE_ToolBoxTabLabel, - QStyleCE_HeaderEmptyArea, - QStyleCE_ColumnViewGrip, QStyleCE_CustomBase = $f0000000 ); QStyleSubElement = ( //QStyle::SubElement (2) @@ -7585,24 +7238,6 @@ type QStyleSE_TreeViewDisclosureItem, QStyleSE_LineEditContents, QStyleSE_FrameContents, - QStyleSE_DockWidgetCloseButton, - QStyleSE_DockWidgetFloatButton, - QStyleSE_DockWidgetTitleBarText, - QStyleSE_DockWidgetIcon, - QStyleSE_CheckBoxLayoutItem, - QStyleSE_ComboBoxLayoutItem, - QStyleSE_DateTimeEditLayoutItem, - QStyleSE_DialogButtonBoxLayoutItem, - QStyleSE_LabelLayoutItem, - QStyleSE_ProgressBarLayoutItem, - QStyleSE_PushButtonLayoutItem, - QStyleSE_RadioButtonLayoutItem, - QStyleSE_SliderLayoutItem, - QStyleSE_SpinBoxLayoutItem, - QStyleSE_ToolButtonLayoutItem, - QStyleSE_FrameLayoutItem, - QStyleSE_GroupBoxLayoutItem, - QStyleSE_TabWidgetLayoutItem, QStyleSE_CustomBase = $f0000000 ); QStyleComplexControl = ( //QStyle::ComplexControl (2) @@ -7615,7 +7250,6 @@ type QStyleCC_Q3ListView, QStyleCC_Dial, QStyleCC_GroupBox, - QStyleCC_MdiControls, QStyleCC_CustomBase = $f0000000 ); type @@ -7663,13 +7297,91 @@ const QStyleSC_GroupBoxLabel = $00000002; QStyleSC_GroupBoxContents = $00000004; QStyleSC_GroupBoxFrame = $00000008; - QStyleSC_MdiMinButton = $00000001; - QStyleSC_MdiNormalButton = $00000002; - QStyleSC_MdiCloseButton = $00000004; QStyleSC_All = $ffffffff; type + QStylePixelMetric = ( //QStyle::PixelMetric (2) + QStylePM_ButtonMargin, + QStylePM_ButtonDefaultIndicator, + QStylePM_MenuButtonIndicator, + QStylePM_ButtonShiftHorizontal, + QStylePM_ButtonShiftVertical, + QStylePM_DefaultFrameWidth, + QStylePM_SpinBoxFrameWidth, + QStylePM_ComboBoxFrameWidth, + QStylePM_MaximumDragDistance, + QStylePM_ScrollBarExtent, + QStylePM_ScrollBarSliderMin, + QStylePM_SliderThickness, + QStylePM_SliderControlThickness, + QStylePM_SliderLength, + QStylePM_SliderTickmarkOffset, + QStylePM_SliderSpaceAvailable, + QStylePM_DockWidgetSeparatorExtent, + QStylePM_DockWidgetHandleExtent, + QStylePM_DockWidgetFrameWidth, + QStylePM_TabBarTabOverlap, + QStylePM_TabBarTabHSpace, + QStylePM_TabBarTabVSpace, + QStylePM_TabBarBaseHeight, + QStylePM_TabBarBaseOverlap, + QStylePM_ProgressBarChunkWidth, + QStylePM_SplitterWidth, + QStylePM_TitleBarHeight, + QStylePM_MenuScrollerHeight, + QStylePM_MenuHMargin, + QStylePM_MenuVMargin, + QStylePM_MenuPanelWidth, + QStylePM_MenuTearoffHeight, + QStylePM_MenuDesktopFrameWidth, + QStylePM_MenuBarPanelWidth, + QStylePM_MenuBarItemSpacing, + QStylePM_MenuBarVMargin, + QStylePM_MenuBarHMargin, + QStylePM_IndicatorWidth, + QStylePM_IndicatorHeight, + QStylePM_ExclusiveIndicatorWidth, + QStylePM_ExclusiveIndicatorHeight, + QStylePM_CheckListButtonSize, + QStylePM_CheckListControllerSize, + QStylePM_DialogButtonsSeparator, + QStylePM_DialogButtonsButtonWidth, + QStylePM_DialogButtonsButtonHeight, + QStylePM_MDIFrameWidth, + QStylePM_MDIMinimizedWidth, + QStylePM_HeaderMargin, + QStylePM_HeaderMarkSize, + QStylePM_HeaderGripMargin, + QStylePM_TabBarTabShiftHorizontal, + QStylePM_TabBarTabShiftVertical, + QStylePM_TabBarScrollButtonWidth, + QStylePM_ToolBarFrameWidth, + QStylePM_ToolBarHandleExtent, + QStylePM_ToolBarItemSpacing, + QStylePM_ToolBarItemMargin, + QStylePM_ToolBarSeparatorExtent, + QStylePM_ToolBarExtensionExtent, + QStylePM_SpinBoxSliderHeight, + QStylePM_DefaultTopLevelMargin, + QStylePM_DefaultChildMargin, + QStylePM_DefaultLayoutSpacing, + QStylePM_ToolBarIconSize, + QStylePM_ListViewIconSize, + QStylePM_IconViewIconSize, + QStylePM_SmallIconSize, + QStylePM_LargeIconSize, + QStylePM_FocusFrameVMargin, + QStylePM_FocusFrameHMargin, + QStylePM_ToolTipLabelFrameWidth, + QStylePM_CheckBoxLabelSpacing, + QStylePM_TabBarIconSize, + QStylePM_SizeGripSize, + QStylePM_DockWidgetTitleMargin, + QStylePM_MessageBoxIconSize, + QStylePM_ButtonIconSize, + QStylePM_CustomBase = $f0000000 ); + QStyleContentsType = ( //QStyle::ContentsType (2) QStyleCT_PushButton, QStyleCT_CheckBox, @@ -7694,7 +7406,6 @@ type QStyleCT_DialogButtons, QStyleCT_HeaderSection, QStyleCT_GroupBox, - QStyleCT_MdiControls, QStyleCT_CustomBase = $f0000000 ); QStyleStandardPixmap = ( //QStyle::StandardPixmap (2) @@ -7753,105 +7464,8 @@ type QStyleSP_ArrowRight, QStyleSP_ArrowBack, QStyleSP_ArrowForward, - QStyleSP_DirHomeIcon, - QStyleSP_CommandLink, - QStyleSP_VistaShield, QStyleSP_CustomBase = $f0000000 ); -type - QStylePixelMetric = cardinal; // QStyle::PixelMetric (4) - -const - QStylePM_ButtonMargin = 0 { $0 }; - QStylePM_ButtonDefaultIndicator = 1 { $1 }; - QStylePM_MenuButtonIndicator = 2 { $2 }; - QStylePM_ButtonShiftHorizontal = 3 { $3 }; - QStylePM_ButtonShiftVertical = 4 { $4 }; - QStylePM_DefaultFrameWidth = 5 { $5 }; - QStylePM_SpinBoxFrameWidth = 6 { $6 }; - QStylePM_ComboBoxFrameWidth = 7 { $7 }; - QStylePM_MaximumDragDistance = 8 { $8 }; - QStylePM_ScrollBarExtent = 9 { $9 }; - QStylePM_ScrollBarSliderMin = 10 { $a }; - QStylePM_SliderThickness = 11 { $b }; - QStylePM_SliderControlThickness = 12 { $c }; - QStylePM_SliderLength = 13 { $d }; - QStylePM_SliderTickmarkOffset = 14 { $e }; - QStylePM_SliderSpaceAvailable = 15 { $f }; - QStylePM_DockWidgetSeparatorExtent = 16 { $10 }; - QStylePM_DockWidgetHandleExtent = 17 { $11 }; - QStylePM_DockWidgetFrameWidth = 18 { $12 }; - QStylePM_TabBarTabOverlap = 19 { $13 }; - QStylePM_TabBarTabHSpace = 20 { $14 }; - QStylePM_TabBarTabVSpace = 21 { $15 }; - QStylePM_TabBarBaseHeight = 22 { $16 }; - QStylePM_TabBarBaseOverlap = 23 { $17 }; - QStylePM_ProgressBarChunkWidth = 24 { $18 }; - QStylePM_SplitterWidth = 25 { $19 }; - QStylePM_TitleBarHeight = 26 { $1a }; - QStylePM_MenuScrollerHeight = 27 { $1b }; - QStylePM_MenuHMargin = 28 { $1c }; - QStylePM_MenuVMargin = 29 { $1d }; - QStylePM_MenuPanelWidth = 30 { $1e }; - QStylePM_MenuTearoffHeight = 31 { $1f }; - QStylePM_MenuDesktopFrameWidth = 32 { $20 }; - QStylePM_MenuBarPanelWidth = 33 { $21 }; - QStylePM_MenuBarItemSpacing = 34 { $22 }; - QStylePM_MenuBarVMargin = 35 { $23 }; - QStylePM_MenuBarHMargin = 36 { $24 }; - QStylePM_IndicatorWidth = 37 { $25 }; - QStylePM_IndicatorHeight = 38 { $26 }; - QStylePM_ExclusiveIndicatorWidth = 39 { $27 }; - QStylePM_ExclusiveIndicatorHeight = 40 { $28 }; - QStylePM_CheckListButtonSize = 41 { $29 }; - QStylePM_CheckListControllerSize = 42 { $2a }; - QStylePM_DialogButtonsSeparator = 43 { $2b }; - QStylePM_DialogButtonsButtonWidth = 44 { $2c }; - QStylePM_DialogButtonsButtonHeight = 45 { $2d }; - QStylePM_MdiSubWindowFrameWidth = 46 { $2e }; - QStylePM_MDIFrameWidth = 46 { $2e }; - QStylePM_MdiSubWindowMinimizedWidth = 47 { $2f }; - QStylePM_MDIMinimizedWidth = 47 { $2f }; - QStylePM_HeaderMargin = 48 { $30 }; - QStylePM_HeaderMarkSize = 49 { $31 }; - QStylePM_HeaderGripMargin = 50 { $32 }; - QStylePM_TabBarTabShiftHorizontal = 51 { $33 }; - QStylePM_TabBarTabShiftVertical = 52 { $34 }; - QStylePM_TabBarScrollButtonWidth = 53 { $35 }; - QStylePM_ToolBarFrameWidth = 54 { $36 }; - QStylePM_ToolBarHandleExtent = 55 { $37 }; - QStylePM_ToolBarItemSpacing = 56 { $38 }; - QStylePM_ToolBarItemMargin = 57 { $39 }; - QStylePM_ToolBarSeparatorExtent = 58 { $3a }; - QStylePM_ToolBarExtensionExtent = 59 { $3b }; - QStylePM_SpinBoxSliderHeight = 60 { $3c }; - QStylePM_DefaultTopLevelMargin = 61 { $3d }; - QStylePM_DefaultChildMargin = 62 { $3e }; - QStylePM_DefaultLayoutSpacing = 63 { $3f }; - QStylePM_ToolBarIconSize = 64 { $40 }; - QStylePM_ListViewIconSize = 65 { $41 }; - QStylePM_IconViewIconSize = 66 { $42 }; - QStylePM_SmallIconSize = 67 { $43 }; - QStylePM_LargeIconSize = 68 { $44 }; - QStylePM_FocusFrameVMargin = 69 { $45 }; - QStylePM_FocusFrameHMargin = 70 { $46 }; - QStylePM_ToolTipLabelFrameWidth = 71 { $47 }; - QStylePM_CheckBoxLabelSpacing = 72 { $48 }; - QStylePM_TabBarIconSize = 73 { $49 }; - QStylePM_SizeGripSize = 74 { $4a }; - QStylePM_DockWidgetTitleMargin = 75 { $4b }; - QStylePM_MessageBoxIconSize = 76 { $4c }; - QStylePM_ButtonIconSize = 77 { $4d }; - QStylePM_DockWidgetTitleBarButtonMargin = 78 { $4e }; - QStylePM_RadioButtonLabelSpacing = 79 { $4f }; - QStylePM_LayoutLeftMargin = 80 { $50 }; - QStylePM_LayoutTopMargin = 81 { $51 }; - QStylePM_LayoutRightMargin = 82 { $52 }; - QStylePM_LayoutBottomMargin = 83 { $53 }; - QStylePM_LayoutHorizontalSpacing = 84 { $54 }; - QStylePM_LayoutVerticalSpacing = 85 { $55 }; - QStylePM_CustomBase = 4026531840 { $f0000000 }; - type QStyleStyleHint = cardinal; // QStyle::StyleHint (4) @@ -7934,11 +7548,6 @@ const QStyleSH_MessageBox_CenterButtons = 74 { $4a }; QStyleSH_Menu_SelectionWrap = 75 { $4b }; QStyleSH_ItemView_MovementWithoutUpdatingSelection = 76 { $4c }; - QStyleSH_ToolTip_Mask = 77 { $4d }; - QStyleSH_FocusFrame_AboveWidget = 78 { $4e }; - QStyleSH_TextControl_FocusIndicatorTextCharFormat = 79 { $4f }; - QStyleSH_WizardStyle = 80 { $50 }; - QStyleSH_ItemView_ArrowKeysNavigateIntoChildren = 81 { $51 }; QStyleSH_CustomBase = 4026531840 { $f0000000 }; @@ -7970,8 +7579,6 @@ function QStyle_sliderPositionFromValue(min: Integer; max: Integer; val: Integer function QStyle_sliderValueFromPosition(min: Integer; max: Integer; pos: Integer; space: Integer; upsideDown: Boolean = False): Integer; cdecl; external QtIntf name 'QStyle_sliderValueFromPosition'; function QStyle_visualAlignment(direction: QtLayoutDirection; alignment: QtAlignment): QtAlignment; cdecl; external QtIntf name 'QStyle_visualAlignment'; procedure QStyle_alignedRect(retval: PRect; direction: QtLayoutDirection; alignment: QtAlignment; size: PSize; rectangle: PRect); cdecl; external QtIntf name 'QStyle_alignedRect'; -function QStyle_layoutSpacing(handle: QStyleH; control1: QSizePolicyControlType; control2: QSizePolicyControlType; orientation: QtOrientation; option: QStyleOptionH = nil; widget: QWidgetH = nil): Integer; cdecl; external QtIntf name 'QStyle_layoutSpacing'; -function QStyle_combinedLayoutSpacing(handle: QStyleH; controls1: QSizePolicyControlTypes; controls2: QSizePolicyControlTypes; orientation: QtOrientation; option: QStyleOptionH = nil; widget: QWidgetH = nil): Integer; cdecl; external QtIntf name 'QStyle_combinedLayoutSpacing'; type @@ -8069,7 +7676,6 @@ const QStyleOptionButtonHasMenu = $02; QStyleOptionButtonDefaultButton = $04; QStyleOptionButtonAutoDefaultButton = $08; - QStyleOptionButtonCommandLinkButton = $10; type @@ -8158,11 +7764,6 @@ type QStyleOptionDockWidgetVersion = 1 ); -type - QStyleOptionDockWidgetV2StyleOptionVersion = ( //QStyleOptionDockWidgetV2::StyleOptionVersion (2s) - QStyleOptionDockWidgetV2Version = 2 ); - - type QStyleOptionViewItemPosition = ( // QStyleOptionViewItem::Position (1) QStyleOptionViewItemLeft, QStyleOptionViewItemRight, QStyleOptionViewItemTop, QStyleOptionViewItemBottom ); @@ -8184,27 +7785,11 @@ const QStyleOptionViewItemV2Alternate = $02; -type - QStyleOptionViewItemV3StyleOptionVersion = ( //QStyleOptionViewItemV3::StyleOptionVersion (2s) - QStyleOptionViewItemV3Version = 3 ); - - type QStyleOptionToolBoxStyleOptionVersion = ( //QStyleOptionToolBox::StyleOptionVersion (2s) QStyleOptionToolBoxVersion = 1 ); -type - QStyleOptionToolBoxV2TabPosition = ( // QStyleOptionToolBoxV2::TabPosition (1) - QStyleOptionToolBoxV2Beginning, QStyleOptionToolBoxV2Middle, QStyleOptionToolBoxV2End, QStyleOptionToolBoxV2OnlyOneTab ); - - QStyleOptionToolBoxV2SelectedPosition = ( // QStyleOptionToolBoxV2::SelectedPosition (1) - QStyleOptionToolBoxV2NotAdjacent, QStyleOptionToolBoxV2NextIsSelected, QStyleOptionToolBoxV2PreviousIsSelected ); - - QStyleOptionToolBoxV2StyleOptionVersion = ( //QStyleOptionToolBoxV2::StyleOptionVersion (2s) - QStyleOptionToolBoxV2Version = 2 ); - - type QStyleOptionRubberBandStyleOptionVersion = ( //QStyleOptionRubberBand::StyleOptionVersion (2s) QStyleOptionRubberBandVersion = 1 ); @@ -8234,6 +7819,15 @@ type QStyleOptionToolButtonStyleOptionVersion = ( //QStyleOptionToolButton::StyleOptionVersion (2s) QStyleOptionToolButtonVersion = 1 ); +type + QStyleOptionToolButtonToolButtonFeature = cardinal; // QStyleOptionToolButton::ToolButtonFeature + QStyleOptionToolButtonToolButtonFeatures = QStyleOptionToolButtonToolButtonFeature; //QFlags<> (3) +const + QStyleOptionToolButtonNone = $00; + QStyleOptionToolButtonArrow = $01; + QStyleOptionToolButtonMenu = $04; + QStyleOptionToolButtonPopupDelay = $08; + type QStyleOptionComboBoxStyleOptionVersion = ( //QStyleOptionComboBox::StyleOptionVersion (2s) @@ -8263,8 +7857,7 @@ type type QStyleHintReturnHintReturnType = ( //QStyleHintReturn::HintReturnType (2) QStyleHintReturnSH_Default = $f000, - QStyleHintReturnSH_Mask, - QStyleHintReturnSH_Variant ); + QStyleHintReturnSH_Mask ); QStyleHintReturnStyleOptionVersion = ( //QStyleHintReturn::StyleOptionVersion (2s) QStyleHintReturnVersion = 1 ); @@ -8274,11 +7867,6 @@ type QStyleHintReturnMaskStyleOptionVersion = ( //QStyleHintReturnMask::StyleOptionVersion (2s) QStyleHintReturnMaskVersion = 1 ); - -type - QStyleHintReturnVariantStyleOptionVersion = ( //QStyleHintReturnVariant::StyleOptionVersion (2s) - QStyleHintReturnVariantVersion = 1 ); - type QStyleOptionStyleOptionType = cardinal; // QStyleOption::StyleOptionType (4) @@ -8417,18 +8005,6 @@ type const QStyleOptionToolButtonType = 983043 { $f0003 }; -type - QStyleOptionToolButtonToolButtonFeature = cardinal; // QStyleOptionToolButton::ToolButtonFeature (4) - QStyleOptionToolButtonToolButtonFeatures = QStyleOptionToolButtonToolButtonFeature; // QFlags<> - -const - QStyleOptionToolButtonNone = 0 { $0 }; - QStyleOptionToolButtonArrow = 1 { $1 }; - QStyleOptionToolButtonMenu = 4 { $4 }; - QStyleOptionToolButtonMenuButtonPopup = 4 { $4 }; - QStyleOptionToolButtonPopupDelay = 8 { $8 }; - QStyleOptionToolButtonHasMenu = 16 { $10 }; - type QStyleOptionComboBoxStyleOptionType = cardinal; // QStyleOptionComboBox::StyleOptionType (4) @@ -8471,12 +8047,6 @@ type const QStyleHintReturnMaskType = 61441 { $f001 }; -type - QStyleHintReturnVariantStyleOptionType = cardinal; // QStyleHintReturnVariant::StyleOptionType (4) - -const - QStyleHintReturnVariantType = 61442 { $f002 }; - function QStyleOption_create(version: Integer = QStyleOptionVersion; _type: Integer = QStyleOptionSO_Default): QStyleOptionH; overload; cdecl; external QtIntf name 'QStyleOption_create'; procedure QStyleOption_destroy(handle: QStyleOptionH); cdecl; external QtIntf name 'QStyleOption_destroy'; @@ -8551,11 +8121,6 @@ function QStyleOptionDockWidget_create(): QStyleOptionDockWidgetH; overload; cde procedure QStyleOptionDockWidget_destroy(handle: QStyleOptionDockWidgetH); cdecl; external QtIntf name 'QStyleOptionDockWidget_destroy'; function QStyleOptionDockWidget_create(other: QStyleOptionDockWidgetH): QStyleOptionDockWidgetH; overload; cdecl; external QtIntf name 'QStyleOptionDockWidget_create2'; -function QStyleOptionDockWidgetV2_create(): QStyleOptionDockWidgetV2H; overload; cdecl; external QtIntf name 'QStyleOptionDockWidgetV2_create'; -procedure QStyleOptionDockWidgetV2_destroy(handle: QStyleOptionDockWidgetV2H); cdecl; external QtIntf name 'QStyleOptionDockWidgetV2_destroy'; -function QStyleOptionDockWidgetV2_create(other: QStyleOptionDockWidgetV2H): QStyleOptionDockWidgetV2H; overload; cdecl; external QtIntf name 'QStyleOptionDockWidgetV2_create2'; -function QStyleOptionDockWidgetV2_create(other: QStyleOptionDockWidgetH): QStyleOptionDockWidgetV2H; overload; cdecl; external QtIntf name 'QStyleOptionDockWidgetV2_create3'; - function QStyleOptionViewItem_create(): QStyleOptionViewItemH; overload; cdecl; external QtIntf name 'QStyleOptionViewItem_create'; procedure QStyleOptionViewItem_destroy(handle: QStyleOptionViewItemH); cdecl; external QtIntf name 'QStyleOptionViewItem_destroy'; function QStyleOptionViewItem_create(other: QStyleOptionViewItemH): QStyleOptionViewItemH; overload; cdecl; external QtIntf name 'QStyleOptionViewItem_create2'; @@ -8565,20 +8130,10 @@ procedure QStyleOptionViewItemV2_destroy(handle: QStyleOptionViewItemV2H); cdecl function QStyleOptionViewItemV2_create(other: QStyleOptionViewItemV2H): QStyleOptionViewItemV2H; overload; cdecl; external QtIntf name 'QStyleOptionViewItemV2_create2'; function QStyleOptionViewItemV2_create(other: QStyleOptionViewItemH): QStyleOptionViewItemV2H; overload; cdecl; external QtIntf name 'QStyleOptionViewItemV2_create3'; -function QStyleOptionViewItemV3_create(): QStyleOptionViewItemV3H; overload; cdecl; external QtIntf name 'QStyleOptionViewItemV3_create'; -procedure QStyleOptionViewItemV3_destroy(handle: QStyleOptionViewItemV3H); cdecl; external QtIntf name 'QStyleOptionViewItemV3_destroy'; -function QStyleOptionViewItemV3_create(other: QStyleOptionViewItemV3H): QStyleOptionViewItemV3H; overload; cdecl; external QtIntf name 'QStyleOptionViewItemV3_create2'; -function QStyleOptionViewItemV3_create(other: QStyleOptionViewItemH): QStyleOptionViewItemV3H; overload; cdecl; external QtIntf name 'QStyleOptionViewItemV3_create3'; - function QStyleOptionToolBox_create(): QStyleOptionToolBoxH; overload; cdecl; external QtIntf name 'QStyleOptionToolBox_create'; procedure QStyleOptionToolBox_destroy(handle: QStyleOptionToolBoxH); cdecl; external QtIntf name 'QStyleOptionToolBox_destroy'; function QStyleOptionToolBox_create(other: QStyleOptionToolBoxH): QStyleOptionToolBoxH; overload; cdecl; external QtIntf name 'QStyleOptionToolBox_create2'; -function QStyleOptionToolBoxV2_create(): QStyleOptionToolBoxV2H; overload; cdecl; external QtIntf name 'QStyleOptionToolBoxV2_create'; -procedure QStyleOptionToolBoxV2_destroy(handle: QStyleOptionToolBoxV2H); cdecl; external QtIntf name 'QStyleOptionToolBoxV2_destroy'; -function QStyleOptionToolBoxV2_create(other: QStyleOptionToolBoxV2H): QStyleOptionToolBoxV2H; overload; cdecl; external QtIntf name 'QStyleOptionToolBoxV2_create2'; -function QStyleOptionToolBoxV2_create(other: QStyleOptionToolBoxH): QStyleOptionToolBoxV2H; overload; cdecl; external QtIntf name 'QStyleOptionToolBoxV2_create3'; - function QStyleOptionRubberBand_create(): QStyleOptionRubberBandH; overload; cdecl; external QtIntf name 'QStyleOptionRubberBand_create'; procedure QStyleOptionRubberBand_destroy(handle: QStyleOptionRubberBandH); cdecl; external QtIntf name 'QStyleOptionRubberBand_destroy'; function QStyleOptionRubberBand_create(other: QStyleOptionRubberBandH): QStyleOptionRubberBandH; overload; cdecl; external QtIntf name 'QStyleOptionRubberBand_create2'; @@ -8629,18 +8184,6 @@ procedure QStyleHintReturn_destroy(handle: QStyleHintReturnH); cdecl; external Q function QStyleHintReturnMask_create(): QStyleHintReturnMaskH; cdecl; external QtIntf name 'QStyleHintReturnMask_create'; procedure QStyleHintReturnMask_destroy(handle: QStyleHintReturnMaskH); cdecl; external QtIntf name 'QStyleHintReturnMask_destroy'; -function QStyleHintReturnVariant_create(): QStyleHintReturnVariantH; cdecl; external QtIntf name 'QStyleHintReturnVariant_create'; -procedure QStyleHintReturnVariant_destroy(handle: QStyleHintReturnVariantH); cdecl; external QtIntf name 'QStyleHintReturnVariant_destroy'; - -type - QGraphicsSceneSceneLayer = cardinal; // QGraphicsScene::SceneLayer - QGraphicsSceneSceneLayers = QGraphicsSceneSceneLayer; //QFlags<> (3) -const - QGraphicsSceneItemLayer = $1; - QGraphicsSceneBackgroundLayer = $2; - QGraphicsSceneForegroundLayer = $4; - QGraphicsSceneAllLayers = $ffff; - type QGraphicsSceneItemIndexMethod = cardinal; // QGraphicsScene::ItemIndexMethod (4) @@ -8661,28 +8204,20 @@ procedure QGraphicsScene_setSceneRect(handle: QGraphicsSceneH; x: Double; y: Dou procedure QGraphicsScene_render(handle: QGraphicsSceneH; painter: QPainterH; target: QRectFH = nil; source: QRectFH = nil; aspectRatioMode: QtAspectRatioMode = QtKeepAspectRatio); cdecl; external QtIntf name 'QGraphicsScene_render'; function QGraphicsScene_itemIndexMethod(handle: QGraphicsSceneH): QGraphicsSceneItemIndexMethod; cdecl; external QtIntf name 'QGraphicsScene_itemIndexMethod'; procedure QGraphicsScene_setItemIndexMethod(handle: QGraphicsSceneH; method: QGraphicsSceneItemIndexMethod); cdecl; external QtIntf name 'QGraphicsScene_setItemIndexMethod'; -function QGraphicsScene_bspTreeDepth(handle: QGraphicsSceneH): Integer; cdecl; external QtIntf name 'QGraphicsScene_bspTreeDepth'; -procedure QGraphicsScene_setBspTreeDepth(handle: QGraphicsSceneH; depth: Integer); cdecl; external QtIntf name 'QGraphicsScene_setBspTreeDepth'; procedure QGraphicsScene_itemsBoundingRect(handle: QGraphicsSceneH; retval: QRectFH); cdecl; external QtIntf name 'QGraphicsScene_itemsBoundingRect'; function QGraphicsScene_itemAt(handle: QGraphicsSceneH; pos: QPointFH): QGraphicsItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_itemAt'; function QGraphicsScene_itemAt(handle: QGraphicsSceneH; x: Double; y: Double): QGraphicsItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_itemAt2'; -procedure QGraphicsScene_selectionArea(handle: QGraphicsSceneH; retval: QPainterPathH); cdecl; external QtIntf name 'QGraphicsScene_selectionArea'; -procedure QGraphicsScene_setSelectionArea(handle: QGraphicsSceneH; path: QPainterPathH); overload; cdecl; external QtIntf name 'QGraphicsScene_setSelectionArea'; -procedure QGraphicsScene_setSelectionArea(handle: QGraphicsSceneH; path: QPainterPathH; p2: QtItemSelectionMode); overload; cdecl; external QtIntf name 'QGraphicsScene_setSelectionArea2'; +procedure QGraphicsScene_setSelectionArea(handle: QGraphicsSceneH; path: QPainterPathH); cdecl; external QtIntf name 'QGraphicsScene_setSelectionArea'; procedure QGraphicsScene_clearSelection(handle: QGraphicsSceneH); cdecl; external QtIntf name 'QGraphicsScene_clearSelection'; procedure QGraphicsScene_destroyItemGroup(handle: QGraphicsSceneH; group: QGraphicsItemGroupH); cdecl; external QtIntf name 'QGraphicsScene_destroyItemGroup'; procedure QGraphicsScene_addItem(handle: QGraphicsSceneH; item: QGraphicsItemH); cdecl; external QtIntf name 'QGraphicsScene_addItem'; -function QGraphicsScene_addEllipse(handle: QGraphicsSceneH; rect: QRectFH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsEllipseItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addEllipse'; -function QGraphicsScene_addLine(handle: QGraphicsSceneH; line: QLineFH; pen: QPenH = nil): QGraphicsLineItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addLine'; +function QGraphicsScene_addEllipse(handle: QGraphicsSceneH; rect: QRectFH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsEllipseItemH; cdecl; external QtIntf name 'QGraphicsScene_addEllipse'; +function QGraphicsScene_addLine(handle: QGraphicsSceneH; line: QLineFH; pen: QPenH = nil): QGraphicsLineItemH; cdecl; external QtIntf name 'QGraphicsScene_addLine'; function QGraphicsScene_addPath(handle: QGraphicsSceneH; path: QPainterPathH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsPathItemH; cdecl; external QtIntf name 'QGraphicsScene_addPath'; function QGraphicsScene_addPixmap(handle: QGraphicsSceneH; pixmap: QPixmapH): QGraphicsPixmapItemH; cdecl; external QtIntf name 'QGraphicsScene_addPixmap'; function QGraphicsScene_addPolygon(handle: QGraphicsSceneH; polygon: QPolygonFH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsPolygonItemH; cdecl; external QtIntf name 'QGraphicsScene_addPolygon'; -function QGraphicsScene_addRect(handle: QGraphicsSceneH; rect: QRectFH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsRectItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addRect'; +function QGraphicsScene_addRect(handle: QGraphicsSceneH; rect: QRectFH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsRectItemH; cdecl; external QtIntf name 'QGraphicsScene_addRect'; function QGraphicsScene_addText(handle: QGraphicsSceneH; text: PWideString; font: QFontH = nil): QGraphicsTextItemH; cdecl; external QtIntf name 'QGraphicsScene_addText'; -function QGraphicsScene_addSimpleText(handle: QGraphicsSceneH; text: PWideString; font: QFontH = nil): QGraphicsSimpleTextItemH; cdecl; external QtIntf name 'QGraphicsScene_addSimpleText'; -function QGraphicsScene_addEllipse(handle: QGraphicsSceneH; x: Double; y: Double; w: Double; h: Double; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsEllipseItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addEllipse2'; -function QGraphicsScene_addLine(handle: QGraphicsSceneH; x1: Double; y1: Double; x2: Double; y2: Double; pen: QPenH = nil): QGraphicsLineItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addLine2'; -function QGraphicsScene_addRect(handle: QGraphicsSceneH; x: Double; y: Double; w: Double; h: Double; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsRectItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addRect2'; procedure QGraphicsScene_removeItem(handle: QGraphicsSceneH; item: QGraphicsItemH); cdecl; external QtIntf name 'QGraphicsScene_removeItem'; function QGraphicsScene_focusItem(handle: QGraphicsSceneH): QGraphicsItemH; cdecl; external QtIntf name 'QGraphicsScene_focusItem'; procedure QGraphicsScene_setFocusItem(handle: QGraphicsSceneH; item: QGraphicsItemH; focusReason: QtFocusReason = QtOtherFocusReason); cdecl; external QtIntf name 'QGraphicsScene_setFocusItem'; @@ -8695,16 +8230,12 @@ procedure QGraphicsScene_setBackgroundBrush(handle: QGraphicsSceneH; brush: QBru procedure QGraphicsScene_foregroundBrush(handle: QGraphicsSceneH; retval: QBrushH); cdecl; external QtIntf name 'QGraphicsScene_foregroundBrush'; procedure QGraphicsScene_setForegroundBrush(handle: QGraphicsSceneH; brush: QBrushH); cdecl; external QtIntf name 'QGraphicsScene_setForegroundBrush'; procedure QGraphicsScene_inputMethodQuery(handle: QGraphicsSceneH; retval: QVariantH; query: QtInputMethodQuery); cdecl; external QtIntf name 'QGraphicsScene_inputMethodQuery'; -procedure QGraphicsScene_update(handle: QGraphicsSceneH; x: Double; y: Double; w: Double; h: Double); overload; cdecl; external QtIntf name 'QGraphicsScene_update'; -procedure QGraphicsScene_invalidate(handle: QGraphicsSceneH; x: Double; y: Double; w: Double; h: Double; layers: QGraphicsSceneSceneLayers = QGraphicsSceneAllLayers); overload; cdecl; external QtIntf name 'QGraphicsScene_invalidate'; -procedure QGraphicsScene_update(handle: QGraphicsSceneH; rect: QRectFH = nil); overload; cdecl; external QtIntf name 'QGraphicsScene_update2'; -procedure QGraphicsScene_invalidate(handle: QGraphicsSceneH; rect: QRectFH = nil; layers: QGraphicsSceneSceneLayers = QGraphicsSceneAllLayers); overload; cdecl; external QtIntf name 'QGraphicsScene_invalidate2'; +procedure QGraphicsScene_update(handle: QGraphicsSceneH; rect: QRectFH = nil); cdecl; external QtIntf name 'QGraphicsScene_update'; procedure QGraphicsScene_advance(handle: QGraphicsSceneH); cdecl; external QtIntf name 'QGraphicsScene_advance'; type QGraphicsScene_sceneRectChanged_Event = procedure (rect: QRectFH) of object cdecl; - QGraphicsScene_selectionChanged_Event = procedure () of object cdecl; @@ -8715,9 +8246,6 @@ type QGraphicsViewDragMode = ( // QGraphicsView::DragMode (1) QGraphicsViewNoDrag, QGraphicsViewScrollHandDrag, QGraphicsViewRubberBandDrag ); - QGraphicsViewViewportUpdateMode = ( // QGraphicsView::ViewportUpdateMode (1) - QGraphicsViewFullViewportUpdate, QGraphicsViewMinimalViewportUpdate, QGraphicsViewSmartViewportUpdate, QGraphicsViewNoViewportUpdate ); - type QGraphicsViewCacheModeFlag = cardinal; // QGraphicsView::CacheModeFlag QGraphicsViewCacheMode = QGraphicsViewCacheModeFlag; //QFlags<> (3) @@ -8725,14 +8253,6 @@ const QGraphicsViewCacheNone = $0; QGraphicsViewCacheBackground = $1; -type - QGraphicsViewOptimizationFlag = cardinal; // QGraphicsView::OptimizationFlag - QGraphicsViewOptimizationFlags = QGraphicsViewOptimizationFlag; //QFlags<> (3) -const - QGraphicsViewDontClipPainter = $1; - QGraphicsViewDontSavePainterState = $2; - QGraphicsViewDontAdjustForAntialiasing = $4; - function QGraphicsView_create(parent: QWidgetH = nil): QGraphicsViewH; overload; cdecl; external QtIntf name 'QGraphicsView_create'; procedure QGraphicsView_destroy(handle: QGraphicsViewH); cdecl; external QtIntf name 'QGraphicsView_destroy'; function QGraphicsView_create(scene: QGraphicsSceneH; parent: QWidgetH = nil): QGraphicsViewH; overload; cdecl; external QtIntf name 'QGraphicsView_create2'; @@ -8746,15 +8266,8 @@ function QGraphicsView_transformationAnchor(handle: QGraphicsViewH): QGraphicsVi procedure QGraphicsView_setTransformationAnchor(handle: QGraphicsViewH; anchor: QGraphicsViewViewportAnchor); cdecl; external QtIntf name 'QGraphicsView_setTransformationAnchor'; function QGraphicsView_resizeAnchor(handle: QGraphicsViewH): QGraphicsViewViewportAnchor; cdecl; external QtIntf name 'QGraphicsView_resizeAnchor'; procedure QGraphicsView_setResizeAnchor(handle: QGraphicsViewH; anchor: QGraphicsViewViewportAnchor); cdecl; external QtIntf name 'QGraphicsView_setResizeAnchor'; -function QGraphicsView_viewportUpdateMode(handle: QGraphicsViewH): QGraphicsViewViewportUpdateMode; cdecl; external QtIntf name 'QGraphicsView_viewportUpdateMode'; -procedure QGraphicsView_setViewportUpdateMode(handle: QGraphicsViewH; mode: QGraphicsViewViewportUpdateMode); cdecl; external QtIntf name 'QGraphicsView_setViewportUpdateMode'; -function QGraphicsView_optimizationFlags(handle: QGraphicsViewH): QGraphicsViewOptimizationFlags; cdecl; external QtIntf name 'QGraphicsView_optimizationFlags'; -procedure QGraphicsView_setOptimizationFlag(handle: QGraphicsViewH; flag: QGraphicsViewOptimizationFlag; enabled: Boolean = True); cdecl; external QtIntf name 'QGraphicsView_setOptimizationFlag'; -procedure QGraphicsView_setOptimizationFlags(handle: QGraphicsViewH; flags: QGraphicsViewOptimizationFlags); cdecl; external QtIntf name 'QGraphicsView_setOptimizationFlags'; function QGraphicsView_dragMode(handle: QGraphicsViewH): QGraphicsViewDragMode; cdecl; external QtIntf name 'QGraphicsView_dragMode'; procedure QGraphicsView_setDragMode(handle: QGraphicsViewH; mode: QGraphicsViewDragMode); cdecl; external QtIntf name 'QGraphicsView_setDragMode'; -function QGraphicsView_rubberBandSelectionMode(handle: QGraphicsViewH): QtItemSelectionMode; cdecl; external QtIntf name 'QGraphicsView_rubberBandSelectionMode'; -procedure QGraphicsView_setRubberBandSelectionMode(handle: QGraphicsViewH; mode: QtItemSelectionMode); cdecl; external QtIntf name 'QGraphicsView_setRubberBandSelectionMode'; function QGraphicsView_cacheMode(handle: QGraphicsViewH): QGraphicsViewCacheMode; cdecl; external QtIntf name 'QGraphicsView_cacheMode'; procedure QGraphicsView_setCacheMode(handle: QGraphicsViewH; mode: QGraphicsViewCacheMode); cdecl; external QtIntf name 'QGraphicsView_setCacheMode'; procedure QGraphicsView_resetCachedContent(handle: QGraphicsViewH); cdecl; external QtIntf name 'QGraphicsView_resetCachedContent'; @@ -8768,10 +8281,6 @@ procedure QGraphicsView_setSceneRect(handle: QGraphicsViewH; x: Double; y: Doubl procedure QGraphicsView_matrix(handle: QGraphicsViewH; retval: QMatrixH); cdecl; external QtIntf name 'QGraphicsView_matrix'; procedure QGraphicsView_setMatrix(handle: QGraphicsViewH; matrix: QMatrixH; combine: Boolean = False); cdecl; external QtIntf name 'QGraphicsView_setMatrix'; procedure QGraphicsView_resetMatrix(handle: QGraphicsViewH); cdecl; external QtIntf name 'QGraphicsView_resetMatrix'; -procedure QGraphicsView_transform(handle: QGraphicsViewH; retval: QTransformH); cdecl; external QtIntf name 'QGraphicsView_transform'; -procedure QGraphicsView_viewportTransform(handle: QGraphicsViewH; retval: QTransformH); cdecl; external QtIntf name 'QGraphicsView_viewportTransform'; -procedure QGraphicsView_setTransform(handle: QGraphicsViewH; matrix: QTransformH; combine: Boolean = False); cdecl; external QtIntf name 'QGraphicsView_setTransform'; -procedure QGraphicsView_resetTransform(handle: QGraphicsViewH); cdecl; external QtIntf name 'QGraphicsView_resetTransform'; procedure QGraphicsView_rotate(handle: QGraphicsViewH; angle: Double); cdecl; external QtIntf name 'QGraphicsView_rotate'; procedure QGraphicsView_scale(handle: QGraphicsViewH; sx: Double; sy: Double); cdecl; external QtIntf name 'QGraphicsView_scale'; procedure QGraphicsView_shear(handle: QGraphicsViewH; sh: Double; sv: Double); cdecl; external QtIntf name 'QGraphicsView_shear'; @@ -8805,7 +8314,6 @@ procedure QGraphicsView_backgroundBrush(handle: QGraphicsViewH; retval: QBrushH) procedure QGraphicsView_setBackgroundBrush(handle: QGraphicsViewH; brush: QBrushH); cdecl; external QtIntf name 'QGraphicsView_setBackgroundBrush'; procedure QGraphicsView_foregroundBrush(handle: QGraphicsViewH; retval: QBrushH); cdecl; external QtIntf name 'QGraphicsView_foregroundBrush'; procedure QGraphicsView_setForegroundBrush(handle: QGraphicsViewH; brush: QBrushH); cdecl; external QtIntf name 'QGraphicsView_setForegroundBrush'; -procedure QGraphicsView_invalidateScene(handle: QGraphicsViewH; rect: QRectFH = nil; layers: QGraphicsSceneSceneLayers = QGraphicsSceneAllLayers); cdecl; external QtIntf name 'QGraphicsView_invalidateScene'; procedure QGraphicsView_updateSceneRect(handle: QGraphicsViewH; rect: QRectFH); cdecl; external QtIntf name 'QGraphicsView_updateSceneRect'; type @@ -9120,15 +8628,6 @@ function QToolButton_hook_create(handle: QObjectH): QToolButton_hookH; cdecl; ex procedure QToolButton_hook_destroy(handle: QToolButton_hookH); cdecl; external QtIntf name 'QToolButton_hook_destroy'; procedure QToolButton_hook_hook_triggered(handle: QToolButton_hookH; hook: QHookH); cdecl; external QtIntf name 'QToolButton_hook_hook_triggered'; -function QMdiArea_hook_create(handle: QObjectH): QMdiArea_hookH; cdecl; external QtIntf name 'QMdiArea_hook_create'; -procedure QMdiArea_hook_destroy(handle: QMdiArea_hookH); cdecl; external QtIntf name 'QMdiArea_hook_destroy'; -procedure QMdiArea_hook_hook_subWindowActivated(handle: QMdiArea_hookH; hook: QHookH); cdecl; external QtIntf name 'QMdiArea_hook_hook_subWindowActivated'; - -function QMdiSubWindow_hook_create(handle: QObjectH): QMdiSubWindow_hookH; cdecl; external QtIntf name 'QMdiSubWindow_hook_create'; -procedure QMdiSubWindow_hook_destroy(handle: QMdiSubWindow_hookH); cdecl; external QtIntf name 'QMdiSubWindow_hook_destroy'; -procedure QMdiSubWindow_hook_hook_windowStateChanged(handle: QMdiSubWindow_hookH; hook: QHookH); cdecl; external QtIntf name 'QMdiSubWindow_hook_hook_windowStateChanged'; -procedure QMdiSubWindow_hook_hook_aboutToActivate(handle: QMdiSubWindow_hookH; hook: QHookH); cdecl; external QtIntf name 'QMdiSubWindow_hook_hook_aboutToActivate'; - function QCalendarWidget_hook_create(handle: QObjectH): QCalendarWidget_hookH; cdecl; external QtIntf name 'QCalendarWidget_hook_create'; procedure QCalendarWidget_hook_destroy(handle: QCalendarWidget_hookH); cdecl; external QtIntf name 'QCalendarWidget_hook_destroy'; procedure QCalendarWidget_hook_hook_selectionChanged(handle: QCalendarWidget_hookH; hook: QHookH); cdecl; external QtIntf name 'QCalendarWidget_hook_hook_selectionChanged'; @@ -9191,13 +8690,11 @@ procedure QHeaderView_hook_hook_sectionMoved(handle: QHeaderView_hookH; hook: QH procedure QHeaderView_hook_hook_sectionResized(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionResized'; procedure QHeaderView_hook_hook_sectionPressed(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionPressed'; procedure QHeaderView_hook_hook_sectionClicked(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionClicked'; -procedure QHeaderView_hook_hook_sectionEntered(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionEntered'; procedure QHeaderView_hook_hook_sectionDoubleClicked(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionDoubleClicked'; procedure QHeaderView_hook_hook_sectionCountChanged(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionCountChanged'; procedure QHeaderView_hook_hook_sectionHandleDoubleClicked(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionHandleDoubleClicked'; procedure QHeaderView_hook_hook_sectionAutoResize(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionAutoResize'; procedure QHeaderView_hook_hook_geometriesChanged(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_geometriesChanged'; -procedure QHeaderView_hook_hook_sortIndicatorChanged(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sortIndicatorChanged'; function QStandardItem_hook_create(handle: QObjectH): QStandardItem_hookH; cdecl; external QtIntf name 'QStandardItem_hook_create'; procedure QStandardItem_hook_destroy(handle: QStandardItem_hookH); cdecl; external QtIntf name 'QStandardItem_hook_destroy'; @@ -9224,7 +8721,6 @@ procedure QSystemTrayIcon_hook_hook_messageClicked(handle: QSystemTrayIcon_hookH function QGraphicsScene_hook_create(handle: QObjectH): QGraphicsScene_hookH; cdecl; external QtIntf name 'QGraphicsScene_hook_create'; procedure QGraphicsScene_hook_destroy(handle: QGraphicsScene_hookH); cdecl; external QtIntf name 'QGraphicsScene_hook_destroy'; procedure QGraphicsScene_hook_hook_sceneRectChanged(handle: QGraphicsScene_hookH; hook: QHookH); cdecl; external QtIntf name 'QGraphicsScene_hook_hook_sceneRectChanged'; -procedure QGraphicsScene_hook_hook_selectionChanged(handle: QGraphicsScene_hookH; hook: QHookH); cdecl; external QtIntf name 'QGraphicsScene_hook_hook_selectionChanged'; function QIODevice_hook_create(handle: QObjectH): QIODevice_hookH; cdecl; external QtIntf name 'QIODevice_hook_create'; procedure QIODevice_hook_destroy(handle: QIODevice_hookH); cdecl; external QtIntf name 'QIODevice_hook_destroy'; diff --git a/lcl/interfaces/qt/qt42.pas b/lcl/interfaces/qt/qt43.pas similarity index 93% rename from lcl/interfaces/qt/qt42.pas rename to lcl/interfaces/qt/qt43.pas index 0bb2c18762..9553cc7494 100644 --- a/lcl/interfaces/qt/qt42.pas +++ b/lcl/interfaces/qt/qt43.pas @@ -1,4 +1,4 @@ -unit qt42; +unit qt43; { Version : 1.37 } @@ -14,7 +14,7 @@ uses Types; const - QT_VERSION = 4 shl 16 + 2 shl 8 + 3; + QT_VERSION = 4 shl 16 + 3 shl 8 + 0; {$IFDEF MSWINDOWS} QtIntf = 'libqt4intf.dll'; @@ -169,12 +169,14 @@ QGraphicsItemH = class(TObject) end; QGraphicsPathItemH = class(QAbstractGraphicsShapeItemH) end; QGraphicsPolygonItemH = class(QAbstractGraphicsShapeItemH) end; QGraphicsRectItemH = class(QAbstractGraphicsShapeItemH) end; + QGraphicsSimpleTextItemH = class(QAbstractGraphicsShapeItemH) end; QGraphicsItemGroupH = class(QGraphicsItemH) end; QGraphicsLineItemH = class(QGraphicsItemH) end; QGraphicsPixmapItemH = class(QGraphicsItemH) end; QGraphicsTextItemH = class(QGraphicsItemH) end; QIconH = class(TObject) end; QIconEngineH = class(TObject) end; + QIconEngineV2H = class(QIconEngineH) end; QImageIOHandlerH = class(TObject) end; QImageReaderH = class(TObject) end; QImageWriterH = class(TObject) end; @@ -207,6 +209,7 @@ QObjectH = class(TObject) end; QAbstractItemDelegateH = class(QObjectH) end; QAbstractItemModelH = class(QObjectH) end; QAbstractListModelH = class(QAbstractItemModelH) end; + QAbstractProxyModelH = class(QAbstractItemModelH) end; QAbstractTableModelH = class(QAbstractItemModelH) end; QStandardItemModelH = class(QAbstractItemModelH) end; QAbstractTextDocumentLayoutH = class(QObjectH) end; @@ -275,6 +278,7 @@ QObjectH = class(TObject) end; QTreeViewH = class(QAbstractItemViewH) end; QTreeWidgetH = class(QTreeViewH) end; QGraphicsViewH = class(QAbstractScrollAreaH) end; + QMdiAreaH = class(QAbstractScrollAreaH) end; QScrollAreaH = class(QAbstractScrollAreaH) end; QTextEditH = class(QAbstractScrollAreaH) end; QTextBrowserH = class(QTextEditH) end; @@ -285,6 +289,7 @@ QObjectH = class(TObject) end; QGroupBoxH = class(QWidgetH) end; QLineEditH = class(QWidgetH) end; QMainWindowH = class(QWidgetH) end; + QMdiSubWindowH = class(QWidgetH) end; QMenuH = class(QWidgetH) end; QMenuBarH = class(QWidgetH) end; QProgressBarH = class(QWidgetH) end; @@ -323,6 +328,7 @@ QStandardItemH = class(TObject) end; QStringH = class(TObject) end; QStyleHintReturnH = class(TObject) end; QStyleHintReturnMaskH = class(QStyleHintReturnH) end; + QStyleHintReturnVariantH = class(QStyleHintReturnH) end; QStyleOptionH = class(TObject) end; QStyleOptionButtonH = class(QStyleOptionH) end; QStyleOptionComplexH = class(QStyleOptionH) end; @@ -335,6 +341,7 @@ QStyleOptionH = class(TObject) end; QStyleOptionTitleBarH = class(QStyleOptionComplexH) end; QStyleOptionToolButtonH = class(QStyleOptionComplexH) end; QStyleOptionDockWidgetH = class(QStyleOptionH) end; + QStyleOptionDockWidgetV2H = class(QStyleOptionDockWidgetH) end; QStyleOptionFocusRectH = class(QStyleOptionH) end; QStyleOptionFrameH = class(QStyleOptionH) end; QStyleOptionFrameV2H = class(QStyleOptionFrameH) end; @@ -352,8 +359,10 @@ QStyleOptionH = class(TObject) end; QStyleOptionTabWidgetFrameH = class(QStyleOptionH) end; QStyleOptionToolBarH = class(QStyleOptionH) end; QStyleOptionToolBoxH = class(QStyleOptionH) end; + QStyleOptionToolBoxV2H = class(QStyleOptionToolBoxH) end; QStyleOptionViewItemH = class(QStyleOptionH) end; QStyleOptionViewItemV2H = class(QStyleOptionViewItemH) end; + QStyleOptionViewItemV3H = class(QStyleOptionViewItemV2H) end; QTextBlockH = class(TObject) end; QTextCursorH = class(TObject) end; QTextDocumentFragmentH = class(TObject) end; @@ -366,6 +375,7 @@ QTextFormatH = class(TObject) end; QTextOptionH = class(TObject) end; QTimeH = class(TObject) end; QToolTipH = class(TObject) end; +QTransformH = class(TObject) end; QTreeWidgetItemH = class(TObject) end; QUrlH = class(TObject) end; QVariantH = class(TObject) end; @@ -426,6 +436,8 @@ QProgressBar_hookH = class(QWidget_hookH) end; QStatusBar_hookH = class(QWidget_hookH) end; QToolBox_hookH = class(QFrame_hookH) end; QToolButton_hookH = class(QAbstractButton_hookH) end; +QMdiArea_hookH = class(QAbstractScrollArea_hookH) end; +QMdiSubWindow_hookH = class(QWidget_hookH) end; QCalendarWidget_hookH = class(QWidget_hookH) end; QAbstractItemView_hookH = class(QAbstractScrollArea_hookH) end; QListView_hookH = class(QAbstractItemView_hookH) end; @@ -493,7 +505,7 @@ type QtCaseInsensitive, QtCaseSensitive ); QtConnectionType = ( // Qt::ConnectionType (1) - QtAutoConnection, QtDirectConnection, QtQueuedConnection, QtAutoCompatConnection ); + QtAutoConnection, QtDirectConnection, QtQueuedConnection, QtAutoCompatConnection, QtBlockingQueuedConnection ); QtShortcutContext = ( // Qt::ShortcutContext (1) QtWidgetShortcut, QtWindowShortcut, QtApplicationShortcut ); @@ -501,12 +513,18 @@ type QtFillRule = ( // Qt::FillRule (1) QtOddEvenFill, QtWindingFill ); + QtMaskMode = ( // Qt::MaskMode (1) + QtMaskInColor, QtMaskOutColor ); + QtClipOperation = ( // Qt::ClipOperation (1) QtNoClip, QtReplaceClip, QtIntersectClip, QtUniteClip ); QtTransformationMode = ( // Qt::TransformationMode (1) QtFastTransformation, QtSmoothTransformation ); + QtAxis = ( // Qt::Axis (1) + QtXAxis, QtYAxis, QtZAxis ); + QtFocusReason = ( // Qt::FocusReason (1) QtMouseFocusReason, QtTabFocusReason, QtBacktabFocusReason, QtActiveWindowFocusReason, QtPopupFocusReason, QtShortcutFocusReason, QtMenuBarFocusReason, QtOtherFocusReason, QtNoFocusReason ); @@ -574,6 +592,7 @@ const type QtApplicationAttribute = ( //Qt::ApplicationAttribute (2) QtAA_ImmediateWidgetCreation = 0, + QtAA_MSWindowsUseDirect3DByDefault = 1, QtAA_AttributeCount ); type @@ -726,11 +745,14 @@ type QInternalRelayoutNormal, QInternalRelayoutDragging, QInternalRelayoutDropped ); QInternalCallback = ( // QInternal::Callback (1) - QInternalConnectCallback, QInternalDisconnectCallback, QInternalAdoptCurrentThread, QInternalLastCallback ); + QInternalConnectCallback, QInternalDisconnectCallback, QInternalAdoptCurrentThread, QInternalEventNotifyCallback, QInternalLastCallback ); QInternalInternalFunction = ( // QInternal::InternalFunction (1) QInternalCreateThreadForAdoption, QInternalRefAdoptedThread, QInternalDerefAdoptedThread, QInternalSetCurrentThreadToMainThread, QInternalLastInternalFunction ); + QInternalDockPosition = ( // QInternal::DockPosition (1) + QInternalLeftDock, QInternalRightDock, QInternalTopDock, QInternalBottomDock, QInternalDockCount ); + QInternalPaintDeviceFlags = ( //QInternal::PaintDeviceFlags (2s) QInternalUnknownDevice = $00, QInternalWidget = $01, @@ -847,6 +869,7 @@ const QtWA_Moved = 43 { $2b }; QtWA_PendingUpdate = 44 { $2c }; QtWA_InvalidSize = 45 { $2d }; + QtWA_MacBrushedMetal = 46 { $2e }; QtWA_MacMetalStyle = 46 { $2e }; QtWA_CustomWhatsThis = 47 { $2f }; QtWA_LayoutOnEntireRect = 48 { $30 }; @@ -888,7 +911,18 @@ const QtWA_AlwaysShowToolTips = 84 { $54 }; QtWA_MacOpaqueSizeGrip = 85 { $55 }; QtWA_SetStyle = 86 { $56 }; - QtWA_AttributeCount = 87 { $57 }; + QtWA_SetLocale = 87 { $57 }; + QtWA_MacShowFocusRect = 88 { $58 }; + QtWA_MacNormalSize = 89 { $59 }; + QtWA_MacSmallSize = 90 { $5a }; + QtWA_MacMiniSize = 91 { $5b }; + QtWA_LayoutUsesWidgetRect = 92 { $5c }; + QtWA_StyledBackground = 93 { $5d }; + QtWA_MSWindowsUseDirect3D = 94 { $5e }; + QtWA_CanHostQMdiSubWindowTitleBar = 95 { $5f }; + QtWA_MacAlwaysShowToolWindow = 96 { $60 }; + QtWA_StyleSheet = 97 { $61 }; + QtWA_AttributeCount = 98 { $62 }; type QtKey = cardinal; // Qt::Key (4) @@ -1289,6 +1323,14 @@ const QtTextEditorInteraction = 19 { $13 }; QtTextBrowserInteraction = 13 { $d }; +type + QtEventPriority = cardinal; // Qt::EventPriority (4) + +const + QtHighEventPriority = 1 { $1 }; + QtNormalEventPriority = 0 { $0 }; + QtLowEventPriority = 4294967295 { $ffffffff }; + function QObject_create(parent: QObjectH = nil): QObjectH; cdecl; external QtIntf name 'QObject_create'; @@ -1323,136 +1365,146 @@ function QObject_parent(handle: QObjectH): QObjectH; cdecl; external QtIntf name function QObject_inherits(handle: QObjectH; classname: PAnsiChar): Boolean; cdecl; external QtIntf name 'QObject_inherits'; procedure QObject_deleteLater(handle: QObjectH); cdecl; external QtIntf name 'QObject_deleteLater'; - type - QEventType = ( //QEvent::Type (2s) - QEventNone = 0, - QEventTimer = 1, - QEventMouseButtonPress = 2, - QEventMouseButtonRelease = 3, - QEventMouseButtonDblClick = 4, - QEventMouseMove = 5, - QEventKeyPress = 6, - QEventKeyRelease = 7, - QEventFocusIn = 8, - QEventFocusOut = 9, - QEventEnter = 10, - QEventLeave = 11, - QEventPaint = 12, - QEventMove = 13, - QEventResize = 14, - QEventCreate = 15, - QEventDestroy = 16, - QEventShow = 17, - QEventHide = 18, - QEventClose = 19, - QEventQuit = 20, - QEventParentChange = 21, - QEventThreadChange = 22, - QEventWindowActivate = 24, - QEventWindowDeactivate = 25, - QEventShowToParent = 26, - QEventHideToParent = 27, - QEventWheel = 31, - QEventWindowTitleChange = 33, - QEventWindowIconChange = 34, - QEventApplicationWindowIconChange = 35, - QEventApplicationFontChange = 36, - QEventApplicationLayoutDirectionChange = 37, - QEventApplicationPaletteChange = 38, - QEventPaletteChange = 39, - QEventClipboard = 40, - QEventSpeech = 42, - QEventMetaCall = 43, - QEventSockAct = 50, - QEventShortcutOverride = 51, - QEventDeferredDelete = 52, - QEventDragEnter = 60, - QEventDragMove = 61, - QEventDragLeave = 62, - QEventDrop = 63, - QEventDragResponse = 64, - QEventChildAdded = 68, - QEventChildPolished = 69, - QEventChildRemoved = 71, - QEventShowWindowRequest = 73, - QEventPolishRequest = 74, - QEventPolish = 75, - QEventLayoutRequest = 76, - QEventUpdateRequest = 77, - QEventUpdateLater = 78, - QEventEmbeddingControl = 79, - QEventActivateControl = 80, - QEventDeactivateControl = 81, - QEventContextMenu = 82, - QEventInputMethod = 83, - QEventAccessibilityPrepare = 86, - QEventTabletMove = 87, - QEventLocaleChange = 88, - QEventLanguageChange = 89, - QEventLayoutDirectionChange = 90, - QEventStyle = 91, - QEventTabletPress = 92, - QEventTabletRelease = 93, - QEventOkRequest = 94, - QEventHelpRequest = 95, - QEventIconDrag = 96, - QEventFontChange = 97, - QEventEnabledChange = 98, - QEventActivationChange = 99, - QEventStyleChange = 100, - QEventIconTextChange = 101, - QEventModifiedChange = 102, - QEventWindowBlocked = 103, - QEventWindowUnblocked = 104, - QEventWindowStateChange = 105, - QEventMouseTrackingChange = 109, - QEventToolTip = 110, - QEventWhatsThis = 111, - QEventStatusTip = 112, - QEventActionChanged = 113, - QEventActionAdded = 114, - QEventActionRemoved = 115, - QEventFileOpen = 116, - QEventShortcut = 117, - QEventWhatsThisClicked = 118, - QEventAccessibilityHelp = 119, - QEventToolBarChange = 120, - QEventApplicationActivated = 121, - QEventApplicationDeactivated = 122, - QEventQueryWhatsThis = 123, - QEventEnterWhatsThisMode = 124, - QEventLeaveWhatsThisMode = 125, - QEventZOrderChange = 126, - QEventHoverEnter = 127, - QEventHoverLeave = 128, - QEventHoverMove = 129, - QEventAccessibilityDescription = 130, - QEventParentAboutToChange = 131, - QEventWinEventAct = 132, - QEventAcceptDropsChange = 152, - QEventMenubarUpdated = 153, - QEventZeroTimerEvent = 154, - QEventGraphicsSceneMouseMove = 155, - QEventGraphicsSceneMousePress = 156, - QEventGraphicsSceneMouseRelease = 157, - QEventGraphicsSceneMouseDoubleClick = 158, - QEventGraphicsSceneContextMenu = 159, - QEventGraphicsSceneHoverEnter = 160, - QEventGraphicsSceneHoverMove = 161, - QEventGraphicsSceneHoverLeave = 162, - QEventGraphicsSceneHelp = 163, - QEventGraphicsSceneDragEnter = 164, - QEventGraphicsSceneDragMove = 165, - QEventGraphicsSceneDragLeave = 166, - QEventGraphicsSceneDrop = 167, - QEventGraphicsSceneWheel = 168, - QEventKeyboardLayoutChange = 169, - QEventDynamicPropertyChange = 170, - QEventTabletEnterProximity = 171, - QEventTabletLeaveProximity = 172, - QEventUser = 1000, - QEventMaxUser = 65535 ); + QEventType = cardinal; // QEvent::Type (4) + +const + QEventNone = 0 { $0 }; + QEventTimer = 1 { $1 }; + QEventMouseButtonPress = 2 { $2 }; + QEventMouseButtonRelease = 3 { $3 }; + QEventMouseButtonDblClick = 4 { $4 }; + QEventMouseMove = 5 { $5 }; + QEventKeyPress = 6 { $6 }; + QEventKeyRelease = 7 { $7 }; + QEventFocusIn = 8 { $8 }; + QEventFocusOut = 9 { $9 }; + QEventEnter = 10 { $a }; + QEventLeave = 11 { $b }; + QEventPaint = 12 { $c }; + QEventMove = 13 { $d }; + QEventResize = 14 { $e }; + QEventCreate = 15 { $f }; + QEventDestroy = 16 { $10 }; + QEventShow = 17 { $11 }; + QEventHide = 18 { $12 }; + QEventClose = 19 { $13 }; + QEventQuit = 20 { $14 }; + QEventParentChange = 21 { $15 }; + QEventParentAboutToChange = 131 { $83 }; + QEventThreadChange = 22 { $16 }; + QEventWindowActivate = 24 { $18 }; + QEventWindowDeactivate = 25 { $19 }; + QEventShowToParent = 26 { $1a }; + QEventHideToParent = 27 { $1b }; + QEventWheel = 31 { $1f }; + QEventWindowTitleChange = 33 { $21 }; + QEventWindowIconChange = 34 { $22 }; + QEventApplicationWindowIconChange = 35 { $23 }; + QEventApplicationFontChange = 36 { $24 }; + QEventApplicationLayoutDirectionChange = 37 { $25 }; + QEventApplicationPaletteChange = 38 { $26 }; + QEventPaletteChange = 39 { $27 }; + QEventClipboard = 40 { $28 }; + QEventSpeech = 42 { $2a }; + QEventMetaCall = 43 { $2b }; + QEventSockAct = 50 { $32 }; + QEventWinEventAct = 132 { $84 }; + QEventDeferredDelete = 52 { $34 }; + QEventDragEnter = 60 { $3c }; + QEventDragMove = 61 { $3d }; + QEventDragLeave = 62 { $3e }; + QEventDrop = 63 { $3f }; + QEventDragResponse = 64 { $40 }; + QEventChildAdded = 68 { $44 }; + QEventChildPolished = 69 { $45 }; + QEventChildRemoved = 71 { $47 }; + QEventShowWindowRequest = 73 { $49 }; + QEventPolishRequest = 74 { $4a }; + QEventPolish = 75 { $4b }; + QEventLayoutRequest = 76 { $4c }; + QEventUpdateRequest = 77 { $4d }; + QEventUpdateLater = 78 { $4e }; + QEventEmbeddingControl = 79 { $4f }; + QEventActivateControl = 80 { $50 }; + QEventDeactivateControl = 81 { $51 }; + QEventContextMenu = 82 { $52 }; + QEventInputMethod = 83 { $53 }; + QEventAccessibilityPrepare = 86 { $56 }; + QEventTabletMove = 87 { $57 }; + QEventLocaleChange = 88 { $58 }; + QEventLanguageChange = 89 { $59 }; + QEventLayoutDirectionChange = 90 { $5a }; + QEventStyle = 91 { $5b }; + QEventTabletPress = 92 { $5c }; + QEventTabletRelease = 93 { $5d }; + QEventOkRequest = 94 { $5e }; + QEventHelpRequest = 95 { $5f }; + QEventIconDrag = 96 { $60 }; + QEventFontChange = 97 { $61 }; + QEventEnabledChange = 98 { $62 }; + QEventActivationChange = 99 { $63 }; + QEventStyleChange = 100 { $64 }; + QEventIconTextChange = 101 { $65 }; + QEventModifiedChange = 102 { $66 }; + QEventMouseTrackingChange = 109 { $6d }; + QEventWindowBlocked = 103 { $67 }; + QEventWindowUnblocked = 104 { $68 }; + QEventWindowStateChange = 105 { $69 }; + QEventToolTip = 110 { $6e }; + QEventWhatsThis = 111 { $6f }; + QEventStatusTip = 112 { $70 }; + QEventActionChanged = 113 { $71 }; + QEventActionAdded = 114 { $72 }; + QEventActionRemoved = 115 { $73 }; + QEventFileOpen = 116 { $74 }; + QEventShortcut = 117 { $75 }; + QEventShortcutOverride = 51 { $33 }; + QEventWhatsThisClicked = 118 { $76 }; + QEventToolBarChange = 120 { $78 }; + QEventApplicationActivate = 121 { $79 }; + QEventApplicationActivated = 121 { $79 }; + QEventApplicationDeactivate = 122 { $7a }; + QEventApplicationDeactivated = 122 { $7a }; + QEventQueryWhatsThis = 123 { $7b }; + QEventEnterWhatsThisMode = 124 { $7c }; + QEventLeaveWhatsThisMode = 125 { $7d }; + QEventZOrderChange = 126 { $7e }; + QEventHoverEnter = 127 { $7f }; + QEventHoverLeave = 128 { $80 }; + QEventHoverMove = 129 { $81 }; + QEventAccessibilityHelp = 119 { $77 }; + QEventAccessibilityDescription = 130 { $82 }; + QEventAcceptDropsChange = 152 { $98 }; + QEventMenubarUpdated = 153 { $99 }; + QEventZeroTimerEvent = 154 { $9a }; + QEventGraphicsSceneMouseMove = 155 { $9b }; + QEventGraphicsSceneMousePress = 156 { $9c }; + QEventGraphicsSceneMouseRelease = 157 { $9d }; + QEventGraphicsSceneMouseDoubleClick = 158 { $9e }; + QEventGraphicsSceneContextMenu = 159 { $9f }; + QEventGraphicsSceneHoverEnter = 160 { $a0 }; + QEventGraphicsSceneHoverMove = 161 { $a1 }; + QEventGraphicsSceneHoverLeave = 162 { $a2 }; + QEventGraphicsSceneHelp = 163 { $a3 }; + QEventGraphicsSceneDragEnter = 164 { $a4 }; + QEventGraphicsSceneDragMove = 165 { $a5 }; + QEventGraphicsSceneDragLeave = 166 { $a6 }; + QEventGraphicsSceneDrop = 167 { $a7 }; + QEventGraphicsSceneWheel = 168 { $a8 }; + QEventKeyboardLayoutChange = 169 { $a9 }; + QEventDynamicPropertyChange = 170 { $aa }; + QEventTabletEnterProximity = 171 { $ab }; + QEventTabletLeaveProximity = 172 { $ac }; + QEventNonClientAreaMouseMove = 173 { $ad }; + QEventNonClientAreaMouseButtonPress = 174 { $ae }; + QEventNonClientAreaMouseButtonRelease = 175 { $af }; + QEventNonClientAreaMouseButtonDblClick = 176 { $b0 }; + QEventMacSizeChange = 177 { $b1 }; + QEventContentsRectChange = 178 { $b2 }; + QEventUser = 1000 { $3e8 }; + QEventMaxUser = 65535 { $ffff }; + function QEvent_create(_type: QEventType): QEventH; cdecl; external QtIntf name 'QEvent_create'; procedure QEvent_destroy(handle: QEventH); cdecl; external QtIntf name 'QEvent_destroy'; @@ -1525,10 +1577,12 @@ procedure QCoreApplication_processEvents(flags: QEventLoopProcessEventsFlags = Q procedure QCoreApplication_processEvents(flags: QEventLoopProcessEventsFlags; maxtime: Integer); overload; cdecl; external QtIntf name 'QCoreApplication_processEvents2'; procedure QCoreApplication_exit(retcode: Integer = 0); cdecl; external QtIntf name 'QCoreApplication_exit'; function QCoreApplication_sendEvent(receiver: QObjectH; event: QEventH): Boolean; cdecl; external QtIntf name 'QCoreApplication_sendEvent'; -procedure QCoreApplication_postEvent(receiver: QObjectH; event: QEventH); cdecl; external QtIntf name 'QCoreApplication_postEvent'; +procedure QCoreApplication_postEvent(receiver: QObjectH; event: QEventH); overload; cdecl; external QtIntf name 'QCoreApplication_postEvent'; +procedure QCoreApplication_postEvent(receiver: QObjectH; event: QEventH; priority: Integer); overload; cdecl; external QtIntf name 'QCoreApplication_postEvent2'; procedure QCoreApplication_sendPostedEvents(receiver: QObjectH; event_type: Integer); overload; cdecl; external QtIntf name 'QCoreApplication_sendPostedEvents'; procedure QCoreApplication_sendPostedEvents(); overload; cdecl; external QtIntf name 'QCoreApplication_sendPostedEvents2'; -procedure QCoreApplication_removePostedEvents(receiver: QObjectH); cdecl; external QtIntf name 'QCoreApplication_removePostedEvents'; +procedure QCoreApplication_removePostedEvents(receiver: QObjectH); overload; cdecl; external QtIntf name 'QCoreApplication_removePostedEvents'; +procedure QCoreApplication_removePostedEvents(receiver: QObjectH; eventType: Integer); overload; cdecl; external QtIntf name 'QCoreApplication_removePostedEvents2'; function QCoreApplication_hasPendingEvents(): Boolean; cdecl; external QtIntf name 'QCoreApplication_hasPendingEvents'; function QCoreApplication_notify(handle: QCoreApplicationH; p1: QObjectH; p2: QEventH): Boolean; cdecl; external QtIntf name 'QCoreApplication_notify'; function QCoreApplication_startingUp(): Boolean; cdecl; external QtIntf name 'QCoreApplication_startingUp'; @@ -1636,7 +1690,8 @@ const QVariantTextLength = 78 { $4e }; QVariantTextFormat = 79 { $4f }; QVariantMatrix = 80 { $50 }; - QVariantLastGuiType = 80 { $50 }; + QVariantTransform = 81 { $51 }; + QVariantLastGuiType = 81 { $51 }; QVariantUserType = 127 { $7f }; QVariantLastType = 4294967295 { $ffffffff }; @@ -1968,8 +2023,9 @@ function QRect_intersects(handle: QRectH; r: PRect): Boolean; cdecl; external Qt function QRectF_create(): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create'; procedure QRectF_destroy(handle: QRectFH); cdecl; external QtIntf name 'QRectF_destroy'; function QRectF_create(topleft: QPointFH; size: QSizeFH): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create2'; -function QRectF_create(left: Double; top: Double; width: Double; height: Double): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create3'; -function QRectF_create(rect: PRect): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create4'; +function QRectF_create(topleft: QPointFH; bottomRight: QPointFH): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create3'; +function QRectF_create(left: Double; top: Double; width: Double; height: Double): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create4'; +function QRectF_create(rect: PRect): QRectFH; overload; cdecl; external QtIntf name 'QRectF_create5'; function QRectF_isNull(handle: QRectFH): Boolean; cdecl; external QtIntf name 'QRectF_isNull'; function QRectF_isEmpty(handle: QRectFH): Boolean; cdecl; external QtIntf name 'QRectF_isEmpty'; function QRectF_isValid(handle: QRectFH): Boolean; cdecl; external QtIntf name 'QRectF_isValid'; @@ -2031,6 +2087,7 @@ procedure QRectF_intersect(handle: QRectFH; retval: QRectFH; r: QRectFH); cdecl; procedure QRectF_intersected(handle: QRectFH; retval: QRectFH; other: QRectFH); cdecl; external QtIntf name 'QRectF_intersected'; function QRectF_intersects(handle: QRectFH; r: QRectFH): Boolean; cdecl; external QtIntf name 'QRectF_intersects'; procedure QRectF_toRect(handle: QRectFH; retval: PRect); cdecl; external QtIntf name 'QRectF_toRect'; +procedure QRectF_toAlignedRect(handle: QRectFH; retval: PRect); cdecl; external QtIntf name 'QRectF_toAlignedRect'; function QDate_create(): QDateH; overload; cdecl; external QtIntf name 'QDate_create'; procedure QDate_destroy(handle: QDateH); cdecl; external QtIntf name 'QDate_destroy'; @@ -2175,6 +2232,7 @@ function QApplication_topLevelAt(p: PPoint): QWidgetH; overload; cdecl; external function QApplication_topLevelAt(x: Integer; y: Integer): QWidgetH; overload; cdecl; external QtIntf name 'QApplication_topLevelAt2'; procedure QApplication_syncX(); cdecl; external QtIntf name 'QApplication_syncX'; procedure QApplication_beep(); cdecl; external QtIntf name 'QApplication_beep'; +procedure QApplication_alert(widget: QWidgetH; duration: Integer = 0); cdecl; external QtIntf name 'QApplication_alert'; function QApplication_keyboardModifiers(): QtKeyboardModifiers; cdecl; external QtIntf name 'QApplication_keyboardModifiers'; function QApplication_mouseButtons(): QtMouseButtons; cdecl; external QtIntf name 'QApplication_mouseButtons'; procedure QApplication_setDesktopSettingsAware(p1: Boolean); cdecl; external QtIntf name 'QApplication_setDesktopSettingsAware'; @@ -2318,6 +2376,7 @@ function QPalette_link(handle: QPaletteH): QBrushH; cdecl; external QtIntf name function QPalette_linkVisited(handle: QPaletteH): QBrushH; cdecl; external QtIntf name 'QPalette_linkVisited'; function QPalette_isCopyOf(handle: QPaletteH; p: QPaletteH): Boolean; cdecl; external QtIntf name 'QPalette_isCopyOf'; function QPalette_serialNumber(handle: QPaletteH): Integer; cdecl; external QtIntf name 'QPalette_serialNumber'; +function QPalette_cacheKey(handle: QPaletteH): int64; cdecl; external QtIntf name 'QPalette_cacheKey'; procedure QPalette_resolve(handle: QPaletteH; retval: QPaletteH; p1: QPaletteH); overload; cdecl; external QtIntf name 'QPalette_resolve'; function QPalette_resolve(handle: QPaletteH): LongWord; overload; cdecl; external QtIntf name 'QPalette_resolve2'; procedure QPalette_resolve(handle: QPaletteH; mask: LongWord); overload; cdecl; external QtIntf name 'QPalette_resolve3'; @@ -2330,6 +2389,26 @@ type QSizePolicyShrinkFlag = 4, QSizePolicyIgnoreFlag = 8 ); +type + QSizePolicyControlType = cardinal; // QSizePolicy::ControlType + QSizePolicyControlTypes = QSizePolicyControlType; //QFlags<> (3) +const + QSizePolicyDefaultType = $00000001; + QSizePolicyButtonBox = $00000002; + QSizePolicyCheckBox = $00000004; + QSizePolicyComboBox = $00000008; + QSizePolicyFrame = $00000010; + QSizePolicyGroupBox = $00000020; + QSizePolicyLabel = $00000040; + QSizePolicyLine = $00000080; + QSizePolicyLineEdit = $00000100; + QSizePolicyPushButton = $00000200; + QSizePolicyRadioButton = $00000400; + QSizePolicySlider = $00000800; + QSizePolicySpinBox = $00001000; + QSizePolicyTabWidget = $00002000; + QSizePolicyToolButton = $00004000; + type QSizePolicyPolicy = cardinal; // QSizePolicy::Policy (4) @@ -2376,6 +2455,14 @@ function QKeySequence_matches(handle: QKeySequenceH; seq: QKeySequenceH): QKeySe procedure QKeySequence_mnemonic(retval: QKeySequenceH; text: PWideString); cdecl; external QtIntf name 'QKeySequence_mnemonic'; function QKeySequence_isDetached(handle: QKeySequenceH): Boolean; cdecl; external QtIntf name 'QKeySequence_isDetached'; +type + QWidgetRenderFlag = cardinal; // QWidget::RenderFlag + QWidgetRenderFlags = QWidgetRenderFlag; //QFlags<> (3) +const + QWidgetDrawWindowBackground = $1; + QWidgetDrawChildren = $2; + QWidgetIgnoreMask = $4; + function QWidget_create(parent: QWidgetH = nil; f: QtWindowFlags = 0): QWidgetH; cdecl; external QtIntf name 'QWidget_create'; procedure QWidget_destroy(handle: QWidgetH); cdecl; external QtIntf name 'QWidget_destroy'; @@ -2461,6 +2548,7 @@ procedure QWidget_setMask(handle: QWidgetH; p1: QBitmapH); overload; cdecl; exte procedure QWidget_setMask(handle: QWidgetH; p1: QRegionH); overload; cdecl; external QtIntf name 'QWidget_setMask2'; procedure QWidget_mask(handle: QWidgetH; retval: QRegionH); cdecl; external QtIntf name 'QWidget_mask'; procedure QWidget_clearMask(handle: QWidgetH); cdecl; external QtIntf name 'QWidget_clearMask'; +procedure QWidget_render(handle: QWidgetH; target: QPaintDeviceH; targetOffset: PPoint; sourceRegion: QRegionH; renderFlags: QWidgetRenderFlags); cdecl; external QtIntf name 'QWidget_render'; procedure QWidget_setWindowTitle(handle: QWidgetH; p1: PWideString); cdecl; external QtIntf name 'QWidget_setWindowTitle'; procedure QWidget_setStyleSheet(handle: QWidgetH; styleSheet: PWideString); cdecl; external QtIntf name 'QWidget_setStyleSheet'; procedure QWidget_styleSheet(handle: QWidgetH; retval: PWideString); cdecl; external QtIntf name 'QWidget_styleSheet'; @@ -2487,6 +2575,9 @@ procedure QWidget_setAccessibleDescription(handle: QWidgetH; description: PWideS procedure QWidget_setLayoutDirection(handle: QWidgetH; direction: QtLayoutDirection); cdecl; external QtIntf name 'QWidget_setLayoutDirection'; function QWidget_layoutDirection(handle: QWidgetH): QtLayoutDirection; cdecl; external QtIntf name 'QWidget_layoutDirection'; procedure QWidget_unsetLayoutDirection(handle: QWidgetH); cdecl; external QtIntf name 'QWidget_unsetLayoutDirection'; +procedure QWidget_setLocale(handle: QWidgetH; locale: QLocaleH); cdecl; external QtIntf name 'QWidget_setLocale'; +procedure QWidget_locale(handle: QWidgetH; retval: QLocaleH); cdecl; external QtIntf name 'QWidget_locale'; +procedure QWidget_unsetLocale(handle: QWidgetH); cdecl; external QtIntf name 'QWidget_unsetLocale'; function QWidget_isRightToLeft(handle: QWidgetH): Boolean; cdecl; external QtIntf name 'QWidget_isRightToLeft'; function QWidget_isLeftToRight(handle: QWidgetH): Boolean; cdecl; external QtIntf name 'QWidget_isLeftToRight'; procedure QWidget_setFocus(handle: QWidgetH); overload; cdecl; external QtIntf name 'QWidget_setFocus'; @@ -2610,6 +2701,10 @@ procedure QWidget_inputMethodQuery(handle: QWidgetH; retval: QVariantH; p1: QtIn function QWidget_getDC(handle: QWidgetH): HDC; cdecl; external QtIntf name 'QWidget_getDC'; procedure QWidget_releaseDC(handle: QWidgetH; p1: HDC); cdecl; external QtIntf name 'QWidget_releaseDC'; {$endif} +{$ifdef DARWIN } +function QWidget_macQDHandle(handle: QWidgetH): QtHANDLE; cdecl; external QtIntf name 'QWidget_macQDHandle'; +function QWidget_macCGHandle(handle: QWidgetH): QtHANDLE; cdecl; external QtIntf name 'QWidget_macCGHandle'; +{$endif} function QWidget_to_QPaintDevice(handle: QWidgetH): QPaintDeviceH; cdecl; external QtIntf name 'QWidget_to_QPaintDevice'; type @@ -2632,6 +2727,7 @@ function QLayoutItem_layout(handle: QLayoutItemH): QLayoutH; cdecl; external QtI function QLayoutItem_spacerItem(handle: QLayoutItemH): QSpacerItemH; cdecl; external QtIntf name 'QLayoutItem_spacerItem'; function QLayoutItem_alignment(handle: QLayoutItemH): QtAlignment; cdecl; external QtIntf name 'QLayoutItem_alignment'; procedure QLayoutItem_setAlignment(handle: QLayoutItemH; a: QtAlignment); cdecl; external QtIntf name 'QLayoutItem_setAlignment'; +function QLayoutItem_controlTypes(handle: QLayoutItemH): QSizePolicyControlTypes; cdecl; external QtIntf name 'QLayoutItem_controlTypes'; function QSpacerItem_create(w: Integer; h: Integer; hData: QSizePolicyPolicy = QSizePolicyMinimum; vData: QSizePolicyPolicy = QSizePolicyMinimum): QSpacerItemH; cdecl; external QtIntf name 'QSpacerItem_create'; procedure QSpacerItem_destroy(handle: QSpacerItemH); cdecl; external QtIntf name 'QSpacerItem_destroy'; @@ -2667,6 +2763,9 @@ function QLayout_margin(handle: QLayoutH): Integer; cdecl; external QtIntf name function QLayout_spacing(handle: QLayoutH): Integer; cdecl; external QtIntf name 'QLayout_spacing'; procedure QLayout_setMargin(handle: QLayoutH; p1: Integer); cdecl; external QtIntf name 'QLayout_setMargin'; procedure QLayout_setSpacing(handle: QLayoutH; p1: Integer); cdecl; external QtIntf name 'QLayout_setSpacing'; +procedure QLayout_setContentsMargins(handle: QLayoutH; left: Integer; top: Integer; right: Integer; bottom: Integer); cdecl; external QtIntf name 'QLayout_setContentsMargins'; +procedure QLayout_getContentsMargins(handle: QLayoutH; left: PInteger; top: PInteger; right: PInteger; bottom: PInteger); cdecl; external QtIntf name 'QLayout_getContentsMargins'; +procedure QLayout_contentsRect(handle: QLayoutH; retval: PRect); cdecl; external QtIntf name 'QLayout_contentsRect'; function QLayout_setAlignment(handle: QLayoutH; w: QWidgetH; alignment: QtAlignment): Boolean; overload; cdecl; external QtIntf name 'QLayout_setAlignment'; function QLayout_setAlignment(handle: QLayoutH; l: QLayoutH; alignment: QtAlignment): Boolean; overload; cdecl; external QtIntf name 'QLayout_setAlignment2'; procedure QLayout_setSizeConstraint(handle: QLayoutH; p1: QLayoutSizeConstraint); cdecl; external QtIntf name 'QLayout_setSizeConstraint'; @@ -2726,6 +2825,8 @@ procedure QBoxLayout_insertSpacing(handle: QBoxLayoutH; index: Integer; size: In procedure QBoxLayout_insertStretch(handle: QBoxLayoutH; index: Integer; stretch: Integer = 0); cdecl; external QtIntf name 'QBoxLayout_insertStretch'; procedure QBoxLayout_insertWidget(handle: QBoxLayoutH; index: Integer; widget: QWidgetH; stretch: Integer = 0; alignment: QtAlignment = 0); cdecl; external QtIntf name 'QBoxLayout_insertWidget'; procedure QBoxLayout_insertLayout(handle: QBoxLayoutH; index: Integer; layout: QLayoutH; stretch: Integer = 0); cdecl; external QtIntf name 'QBoxLayout_insertLayout'; +function QBoxLayout_spacing(handle: QBoxLayoutH): Integer; cdecl; external QtIntf name 'QBoxLayout_spacing'; +procedure QBoxLayout_setSpacing(handle: QBoxLayoutH; spacing: Integer); cdecl; external QtIntf name 'QBoxLayout_setSpacing'; function QBoxLayout_setStretchFactor(handle: QBoxLayoutH; w: QWidgetH; stretch: Integer): Boolean; overload; cdecl; external QtIntf name 'QBoxLayout_setStretchFactor'; function QBoxLayout_setStretchFactor(handle: QBoxLayoutH; l: QLayoutH; stretch: Integer): Boolean; overload; cdecl; external QtIntf name 'QBoxLayout_setStretchFactor2'; procedure QBoxLayout_sizeHint(handle: QBoxLayoutH; retval: PSize); cdecl; external QtIntf name 'QBoxLayout_sizeHint'; @@ -3059,6 +3160,12 @@ function QGridLayout_create(): QGridLayoutH; overload; cdecl; external QtIntf na procedure QGridLayout_sizeHint(handle: QGridLayoutH; retval: PSize); cdecl; external QtIntf name 'QGridLayout_sizeHint'; procedure QGridLayout_minimumSize(handle: QGridLayoutH; retval: PSize); cdecl; external QtIntf name 'QGridLayout_minimumSize'; procedure QGridLayout_maximumSize(handle: QGridLayoutH; retval: PSize); cdecl; external QtIntf name 'QGridLayout_maximumSize'; +procedure QGridLayout_setHorizontalSpacing(handle: QGridLayoutH; spacing: Integer); cdecl; external QtIntf name 'QGridLayout_setHorizontalSpacing'; +function QGridLayout_horizontalSpacing(handle: QGridLayoutH): Integer; cdecl; external QtIntf name 'QGridLayout_horizontalSpacing'; +procedure QGridLayout_setVerticalSpacing(handle: QGridLayoutH; spacing: Integer); cdecl; external QtIntf name 'QGridLayout_setVerticalSpacing'; +function QGridLayout_verticalSpacing(handle: QGridLayoutH): Integer; cdecl; external QtIntf name 'QGridLayout_verticalSpacing'; +procedure QGridLayout_setSpacing(handle: QGridLayoutH; spacing: Integer); cdecl; external QtIntf name 'QGridLayout_setSpacing'; +function QGridLayout_spacing(handle: QGridLayoutH): Integer; cdecl; external QtIntf name 'QGridLayout_spacing'; procedure QGridLayout_setRowStretch(handle: QGridLayoutH; row: Integer; stretch: Integer); cdecl; external QtIntf name 'QGridLayout_setRowStretch'; procedure QGridLayout_setColumnStretch(handle: QGridLayoutH; column: Integer; stretch: Integer); cdecl; external QtIntf name 'QGridLayout_setColumnStretch'; function QGridLayout_rowStretch(handle: QGridLayoutH; row: Integer): Integer; cdecl; external QtIntf name 'QGridLayout_rowStretch'; @@ -3287,7 +3394,13 @@ procedure QColor_fromHsvF(retval: PQColor; h: Double; s: Double; v: Double; a: D procedure QColor_fromCmyk(retval: PQColor; c: Integer; m: Integer; y: Integer; k: Integer; a: Integer = 255); cdecl; external QtIntf name 'QColor_fromCmyk'; procedure QColor_fromCmykF(retval: PQColor; c: Double; m: Double; y: Double; k: Double; a: Double = 1.0); cdecl; external QtIntf name 'QColor_fromCmykF'; procedure QColor_light(handle: QColorH; retval: PQColor; f: Integer = 150); cdecl; external QtIntf name 'QColor_light'; +procedure QColor_lighter(handle: QColorH; retval: PQColor; f: Integer = 150); cdecl; external QtIntf name 'QColor_lighter'; procedure QColor_dark(handle: QColorH; retval: PQColor; f: Integer = 200); cdecl; external QtIntf name 'QColor_dark'; +procedure QColor_darker(handle: QColorH; retval: PQColor; f: Integer = 200); cdecl; external QtIntf name 'QColor_darker'; +{$ifdef LINUX } +function QColor_allowX11ColorNames(): Boolean; cdecl; external QtIntf name 'QColor_allowX11ColorNames'; +procedure QColor_setAllowX11ColorNames(enabled: Boolean); cdecl; external QtIntf name 'QColor_setAllowX11ColorNames'; +{$endif} function QMatrix_create(): QMatrixH; overload; cdecl; external QtIntf name 'QMatrix_create'; procedure QMatrix_destroy(handle: QMatrixH); cdecl; external QtIntf name 'QMatrix_destroy'; @@ -3332,7 +3445,7 @@ type QGradientPadSpread, QGradientReflectSpread, QGradientRepeatSpread ); QGradientCoordinateMode = ( // QGradient::CoordinateMode (1) - QGradientLogicalMode, QGradientStretchToDeviceMode ); + QGradientLogicalMode, QGradientStretchToDeviceMode, QGradientObjectBoundingMode ); function QBrush_create(): QBrushH; overload; cdecl; external QtIntf name 'QBrush_create'; procedure QBrush_destroy(handle: QBrushH); cdecl; external QtIntf name 'QBrush_destroy'; @@ -3349,6 +3462,8 @@ function QBrush_style(handle: QBrushH): QtBrushStyle; cdecl; external QtIntf nam procedure QBrush_setStyle(handle: QBrushH; p1: QtBrushStyle); cdecl; external QtIntf name 'QBrush_setStyle'; function QBrush_matrix(handle: QBrushH): QMatrixH; cdecl; external QtIntf name 'QBrush_matrix'; procedure QBrush_setMatrix(handle: QBrushH; mat: QMatrixH); cdecl; external QtIntf name 'QBrush_setMatrix'; +procedure QBrush_transform(handle: QBrushH; retval: QTransformH); cdecl; external QtIntf name 'QBrush_transform'; +procedure QBrush_setTransform(handle: QBrushH; p1: QTransformH); cdecl; external QtIntf name 'QBrush_setTransform'; procedure QBrush_texture(handle: QBrushH; retval: QPixmapH); cdecl; external QtIntf name 'QBrush_texture'; procedure QBrush_setTexture(handle: QBrushH; pixmap: QPixmapH); cdecl; external QtIntf name 'QBrush_setTexture'; procedure QBrush_textureImage(handle: QBrushH; retval: QImageH); cdecl; external QtIntf name 'QBrush_textureImage'; @@ -3358,6 +3473,7 @@ procedure QBrush_setColor(handle: QBrushH; color: PQColor); overload; cdecl; ext procedure QBrush_setColor(handle: QBrushH; color: QtGlobalColor); overload; cdecl; external QtIntf name 'QBrush_setColor2'; function QBrush_gradient(handle: QBrushH): QGradientH; cdecl; external QtIntf name 'QBrush_gradient'; function QBrush_isOpaque(handle: QBrushH): Boolean; cdecl; external QtIntf name 'QBrush_isOpaque'; +function QBrush_isDetached(handle: QBrushH): Boolean; cdecl; external QtIntf name 'QBrush_isDetached'; function QGradient_create(): QGradientH; cdecl; external QtIntf name 'QGradient_create'; procedure QGradient_destroy(handle: QGradientH); cdecl; external QtIntf name 'QGradient_destroy'; @@ -3412,6 +3528,8 @@ function QPen_create(brush: QBrushH; width: Double; s: QtPenStyle = QtSolidLine; function QPen_create(pen: QPenH): QPenH; overload; cdecl; external QtIntf name 'QPen_create5'; function QPen_style(handle: QPenH): QtPenStyle; cdecl; external QtIntf name 'QPen_style'; procedure QPen_setStyle(handle: QPenH; p1: QtPenStyle); cdecl; external QtIntf name 'QPen_setStyle'; +function QPen_dashOffset(handle: QPenH): Double; cdecl; external QtIntf name 'QPen_dashOffset'; +procedure QPen_setDashOffset(handle: QPenH; doffset: Double); cdecl; external QtIntf name 'QPen_setDashOffset'; function QPen_miterLimit(handle: QPenH): Double; cdecl; external QtIntf name 'QPen_miterLimit'; procedure QPen_setMiterLimit(handle: QPenH; limit: Double); cdecl; external QtIntf name 'QPen_setMiterLimit'; function QPen_widthF(handle: QPenH): Double; cdecl; external QtIntf name 'QPen_widthF'; @@ -3427,6 +3545,8 @@ function QPen_capStyle(handle: QPenH): QtPenCapStyle; cdecl; external QtIntf nam procedure QPen_setCapStyle(handle: QPenH; pcs: QtPenCapStyle); cdecl; external QtIntf name 'QPen_setCapStyle'; function QPen_joinStyle(handle: QPenH): QtPenJoinStyle; cdecl; external QtIntf name 'QPen_joinStyle'; procedure QPen_setJoinStyle(handle: QPenH; pcs: QtPenJoinStyle); cdecl; external QtIntf name 'QPen_setJoinStyle'; +function QPen_isCosmetic(handle: QPenH): Boolean; cdecl; external QtIntf name 'QPen_isCosmetic'; +procedure QPen_setCosmetic(handle: QPenH; cosmetic: Boolean); cdecl; external QtIntf name 'QPen_setCosmetic'; function QPen_isDetached(handle: QPenH): Boolean; cdecl; external QtIntf name 'QPen_isDetached'; function QPolygon_create(): QPolygonH; overload; cdecl; external QtIntf name 'QPolygon_create'; @@ -3445,6 +3565,10 @@ procedure QPolygon_setPoint(handle: QPolygonH; index: Integer; p: PPoint); overl procedure QPolygon_setPoints(handle: QPolygonH; nPoints: Integer; points: PInteger); overload; cdecl; external QtIntf name 'QPolygon_setPoints'; procedure QPolygon_putPoints(handle: QPolygonH; index: Integer; nPoints: Integer; points: PInteger); overload; cdecl; external QtIntf name 'QPolygon_putPoints'; procedure QPolygon_putPoints(handle: QPolygonH; index: Integer; nPoints: Integer; from: QPolygonH; fromIndex: Integer = 0); overload; cdecl; external QtIntf name 'QPolygon_putPoints3'; +function QPolygon_containsPoint(handle: QPolygonH; pt: PPoint; fillRule: QtFillRule): Boolean; cdecl; external QtIntf name 'QPolygon_containsPoint'; +procedure QPolygon_united(handle: QPolygonH; retval: QPolygonH; r: QPolygonH); cdecl; external QtIntf name 'QPolygon_united'; +procedure QPolygon_intersected(handle: QPolygonH; retval: QPolygonH; r: QPolygonH); cdecl; external QtIntf name 'QPolygon_intersected'; +procedure QPolygon_subtracted(handle: QPolygonH; retval: QPolygonH; r: QPolygonH); cdecl; external QtIntf name 'QPolygon_subtracted'; function QPolygonF_create(): QPolygonFH; overload; cdecl; external QtIntf name 'QPolygonF_create'; procedure QPolygonF_destroy(handle: QPolygonFH); cdecl; external QtIntf name 'QPolygonF_destroy'; @@ -3457,13 +3581,19 @@ procedure QPolygonF_translate(handle: QPolygonFH; offset: QPointFH); overload; c procedure QPolygonF_toPolygon(handle: QPolygonFH; retval: QPolygonH); cdecl; external QtIntf name 'QPolygonF_toPolygon'; function QPolygonF_isClosed(handle: QPolygonFH): Boolean; cdecl; external QtIntf name 'QPolygonF_isClosed'; procedure QPolygonF_boundingRect(handle: QPolygonFH; retval: QRectFH); cdecl; external QtIntf name 'QPolygonF_boundingRect'; +function QPolygonF_containsPoint(handle: QPolygonFH; pt: QPointFH; fillRule: QtFillRule): Boolean; cdecl; external QtIntf name 'QPolygonF_containsPoint'; +procedure QPolygonF_united(handle: QPolygonFH; retval: QPolygonFH; r: QPolygonFH); cdecl; external QtIntf name 'QPolygonF_united'; +procedure QPolygonF_intersected(handle: QPolygonFH; retval: QPolygonFH; r: QPolygonFH); cdecl; external QtIntf name 'QPolygonF_intersected'; +procedure QPolygonF_subtracted(handle: QPolygonFH; retval: QPolygonFH; r: QPolygonFH); cdecl; external QtIntf name 'QPolygonF_subtracted'; type QPainterCompositionMode = ( // QPainter::CompositionMode (1) QPainterCompositionMode_SourceOver, QPainterCompositionMode_DestinationOver, QPainterCompositionMode_Clear, QPainterCompositionMode_Source, QPainterCompositionMode_Destination, QPainterCompositionMode_SourceIn, QPainterCompositionMode_DestinationIn, QPainterCompositionMode_SourceOut, QPainterCompositionMode_DestinationOut, QPainterCompositionMode_SourceAtop, QPainterCompositionMode_DestinationAtop, - QPainterCompositionMode_Xor ); + QPainterCompositionMode_Xor, QPainterCompositionMode_Plus, QPainterCompositionMode_Multiply, QPainterCompositionMode_Screen, QPainterCompositionMode_Overlay, QPainterCompositionMode_Darken, + QPainterCompositionMode_Lighten, QPainterCompositionMode_ColorDodge, QPainterCompositionMode_ColorBurn, QPainterCompositionMode_HardLight, QPainterCompositionMode_SoftLight, QPainterCompositionMode_Difference, + QPainterCompositionMode_Exclusion ); type QPainterRenderHint = cardinal; // QPainter::RenderHint @@ -3472,6 +3602,7 @@ const QPainterAntialiasing = $01; QPainterTextAntialiasing = $02; QPainterSmoothPixmapTransform = $04; + QPainterHighQualityAntialiasing = $08; function QPainter_create(): QPainterH; overload; cdecl; external QtIntf name 'QPainter_create'; procedure QPainter_destroy(handle: QPainterH); cdecl; external QtIntf name 'QPainter_destroy'; @@ -3519,9 +3650,16 @@ procedure QPainter_setMatrix(handle: QPainterH; matrix: QMatrixH; combine: Boole function QPainter_matrix(handle: QPainterH): QMatrixH; cdecl; external QtIntf name 'QPainter_matrix'; function QPainter_deviceMatrix(handle: QPainterH): QMatrixH; cdecl; external QtIntf name 'QPainter_deviceMatrix'; procedure QPainter_resetMatrix(handle: QPainterH); cdecl; external QtIntf name 'QPainter_resetMatrix'; +procedure QPainter_setTransform(handle: QPainterH; transform: QTransformH; combine: Boolean = False); cdecl; external QtIntf name 'QPainter_setTransform'; +function QPainter_transform(handle: QPainterH): QTransformH; cdecl; external QtIntf name 'QPainter_transform'; +function QPainter_deviceTransform(handle: QPainterH): QTransformH; cdecl; external QtIntf name 'QPainter_deviceTransform'; +procedure QPainter_resetTransform(handle: QPainterH); cdecl; external QtIntf name 'QPainter_resetTransform'; procedure QPainter_setWorldMatrix(handle: QPainterH; matrix: QMatrixH; combine: Boolean = False); cdecl; external QtIntf name 'QPainter_setWorldMatrix'; function QPainter_worldMatrix(handle: QPainterH): QMatrixH; cdecl; external QtIntf name 'QPainter_worldMatrix'; +procedure QPainter_setWorldTransform(handle: QPainterH; matrix: QTransformH; combine: Boolean = False); cdecl; external QtIntf name 'QPainter_setWorldTransform'; +function QPainter_worldTransform(handle: QPainterH): QTransformH; cdecl; external QtIntf name 'QPainter_worldTransform'; procedure QPainter_combinedMatrix(handle: QPainterH; retval: QMatrixH); cdecl; external QtIntf name 'QPainter_combinedMatrix'; +procedure QPainter_combinedTransform(handle: QPainterH; retval: QTransformH); cdecl; external QtIntf name 'QPainter_combinedTransform'; procedure QPainter_setMatrixEnabled(handle: QPainterH; enabled: Boolean); cdecl; external QtIntf name 'QPainter_setMatrixEnabled'; function QPainter_matrixEnabled(handle: QPainterH): Boolean; cdecl; external QtIntf name 'QPainter_matrixEnabled'; procedure QPainter_setWorldMatrixEnabled(handle: QPainterH; enabled: Boolean); cdecl; external QtIntf name 'QPainter_setWorldMatrixEnabled'; @@ -3639,6 +3777,7 @@ procedure QPainter_eraseRect(handle: QPainterH; p1: PRect); overload; cdecl; ext procedure QPainter_setRenderHint(handle: QPainterH; hint: QPainterRenderHint; _on: Boolean = True); cdecl; external QtIntf name 'QPainter_setRenderHint'; procedure QPainter_setRenderHints(handle: QPainterH; hints: QPainterRenderHints; _on: Boolean = True); cdecl; external QtIntf name 'QPainter_setRenderHints'; function QPainter_renderHints(handle: QPainterH): QPainterRenderHints; cdecl; external QtIntf name 'QPainter_renderHints'; +function QPainter_testRenderHint(handle: QPainterH; hint: QPainterRenderHint): Boolean; cdecl; external QtIntf name 'QPainter_testRenderHint'; function QPainter_paintEngine(handle: QPainterH): QPaintEngineH; cdecl; external QtIntf name 'QPainter_paintEngine'; procedure QPainter_setRedirected(device: QPaintDeviceH; replacement: QPaintDeviceH; offset: PPoint = nil); cdecl; external QtIntf name 'QPainter_setRedirected'; function QPainter_redirected(device: QPaintDeviceH; offset: PPoint = nil): QPaintDeviceH; cdecl; external QtIntf name 'QPainter_redirected'; @@ -3667,6 +3806,8 @@ const QPaintEngineBrushStroke = $00000800; QPaintEngineConstantOpacity = $00001000; QPaintEngineMaskedBrush = $00002000; + QPaintEnginePerspectiveTransform = $00004000; + QPaintEngineBlendModes = $00008000; QPaintEnginePaintOutsidePaintEvent = $20000000; QPaintEngineAllFeatures = $ffffffff; @@ -3703,6 +3844,7 @@ type QPaintEnginePicture, QPaintEngineSVG, QPaintEngineRaster, + QPaintEngineDirect3D, QPaintEngineUser = 50, QPaintEngineMaxUser = 100 ); @@ -3834,7 +3976,7 @@ type QPrinterPaperSource = ( // QPrinter::PaperSource (1) QPrinterOnlyOne, QPrinterLower, QPrinterMiddle, QPrinterManual, QPrinterEnvelope, QPrinterEnvelopeManual, QPrinterAuto, QPrinterTractor, QPrinterSmallFormat, QPrinterLargeFormat, QPrinterLargeCapacity, - QPrinterCassette, QPrinterFormSource ); + QPrinterCassette, QPrinterFormSource, QPrinterMaxPageSource ); QPrinterPrinterState = ( // QPrinter::PrinterState (1) QPrinterIdle, QPrinterActive, QPrinterAborted, QPrinterError ); @@ -3976,20 +4118,36 @@ procedure QPainterPath_addText(handle: QPainterPathH; point: QPointFH; f: QFontH procedure QPainterPath_addText(handle: QPainterPathH; x: Double; y: Double; f: QFontH; text: PWideString); overload; cdecl; external QtIntf name 'QPainterPath_addText2'; procedure QPainterPath_addPath(handle: QPainterPathH; path: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_addPath'; procedure QPainterPath_addRegion(handle: QPainterPathH; region: QRegionH); cdecl; external QtIntf name 'QPainterPath_addRegion'; +procedure QPainterPath_addRoundRect(handle: QPainterPathH; rect: QRectFH; xRnd: Integer; yRnd: Integer); overload; cdecl; external QtIntf name 'QPainterPath_addRoundRect'; +procedure QPainterPath_addRoundRect(handle: QPainterPathH; x: Double; y: Double; w: Double; h: Double; xRnd: Integer; yRnd: Integer); overload; cdecl; external QtIntf name 'QPainterPath_addRoundRect2'; +procedure QPainterPath_addRoundRect(handle: QPainterPathH; rect: QRectFH; roundness: Integer); overload; cdecl; external QtIntf name 'QPainterPath_addRoundRect3'; +procedure QPainterPath_addRoundRect(handle: QPainterPathH; x: Double; y: Double; w: Double; h: Double; roundness: Integer); overload; cdecl; external QtIntf name 'QPainterPath_addRoundRect4'; procedure QPainterPath_connectPath(handle: QPainterPathH; path: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_connectPath'; function QPainterPath_contains(handle: QPainterPathH; pt: QPointFH): Boolean; overload; cdecl; external QtIntf name 'QPainterPath_contains'; function QPainterPath_contains(handle: QPainterPathH; rect: QRectFH): Boolean; overload; cdecl; external QtIntf name 'QPainterPath_contains2'; -function QPainterPath_intersects(handle: QPainterPathH; rect: QRectFH): Boolean; cdecl; external QtIntf name 'QPainterPath_intersects'; +function QPainterPath_intersects(handle: QPainterPathH; rect: QRectFH): Boolean; overload; cdecl; external QtIntf name 'QPainterPath_intersects'; procedure QPainterPath_boundingRect(handle: QPainterPathH; retval: QRectFH); cdecl; external QtIntf name 'QPainterPath_boundingRect'; procedure QPainterPath_controlPointRect(handle: QPainterPathH; retval: QRectFH); cdecl; external QtIntf name 'QPainterPath_controlPointRect'; function QPainterPath_fillRule(handle: QPainterPathH): QtFillRule; cdecl; external QtIntf name 'QPainterPath_fillRule'; procedure QPainterPath_setFillRule(handle: QPainterPathH; fillRule: QtFillRule); cdecl; external QtIntf name 'QPainterPath_setFillRule'; function QPainterPath_isEmpty(handle: QPainterPathH): Boolean; cdecl; external QtIntf name 'QPainterPath_isEmpty'; procedure QPainterPath_toReversed(handle: QPainterPathH; retval: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_toReversed'; -procedure QPainterPath_toFillPolygon(handle: QPainterPathH; retval: QPolygonFH; matrix: QMatrixH = nil); cdecl; external QtIntf name 'QPainterPath_toFillPolygon'; +procedure QPainterPath_toFillPolygon(handle: QPainterPathH; retval: QPolygonFH; matrix: QMatrixH = nil); overload; cdecl; external QtIntf name 'QPainterPath_toFillPolygon'; +procedure QPainterPath_toFillPolygon(handle: QPainterPathH; retval: QPolygonFH; matrix: QTransformH); overload; cdecl; external QtIntf name 'QPainterPath_toFillPolygon2'; function QPainterPath_elementCount(handle: QPainterPathH): Integer; cdecl; external QtIntf name 'QPainterPath_elementCount'; function QPainterPath_elementAt(handle: QPainterPathH; i: Integer): QPainterPathElementH; cdecl; external QtIntf name 'QPainterPath_elementAt'; procedure QPainterPath_setElementPositionAt(handle: QPainterPathH; i: Integer; x: Double; y: Double); cdecl; external QtIntf name 'QPainterPath_setElementPositionAt'; +function QPainterPath_length(handle: QPainterPathH): Double; cdecl; external QtIntf name 'QPainterPath_length'; +function QPainterPath_percentAtLength(handle: QPainterPathH; t: Double): Double; cdecl; external QtIntf name 'QPainterPath_percentAtLength'; +procedure QPainterPath_pointAtPercent(handle: QPainterPathH; retval: QPointFH; t: Double); cdecl; external QtIntf name 'QPainterPath_pointAtPercent'; +function QPainterPath_angleAtPercent(handle: QPainterPathH; t: Double): Double; cdecl; external QtIntf name 'QPainterPath_angleAtPercent'; +function QPainterPath_slopeAtPercent(handle: QPainterPathH; t: Double): Double; cdecl; external QtIntf name 'QPainterPath_slopeAtPercent'; +function QPainterPath_intersects(handle: QPainterPathH; p: QPainterPathH): Boolean; overload; cdecl; external QtIntf name 'QPainterPath_intersects2'; +function QPainterPath_contains(handle: QPainterPathH; p: QPainterPathH): Boolean; overload; cdecl; external QtIntf name 'QPainterPath_contains3'; +procedure QPainterPath_united(handle: QPainterPathH; retval: QPainterPathH; r: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_united'; +procedure QPainterPath_intersected(handle: QPainterPathH; retval: QPainterPathH; r: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_intersected'; +procedure QPainterPath_subtracted(handle: QPainterPathH; retval: QPainterPathH; r: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_subtracted'; +procedure QPainterPath_subtractedInverted(handle: QPainterPathH; retval: QPainterPathH; r: QPainterPathH); cdecl; external QtIntf name 'QPainterPath_subtractedInverted'; function QPainterPathStroker_create(): QPainterPathStrokerH; cdecl; external QtIntf name 'QPainterPathStroker_create'; @@ -4005,6 +4163,8 @@ function QPainterPathStroker_miterLimit(handle: QPainterPathStrokerH): Double; c procedure QPainterPathStroker_setCurveThreshold(handle: QPainterPathStrokerH; threshold: Double); cdecl; external QtIntf name 'QPainterPathStroker_setCurveThreshold'; function QPainterPathStroker_curveThreshold(handle: QPainterPathStrokerH): Double; cdecl; external QtIntf name 'QPainterPathStroker_curveThreshold'; procedure QPainterPathStroker_setDashPattern(handle: QPainterPathStrokerH; p1: QtPenStyle); cdecl; external QtIntf name 'QPainterPathStroker_setDashPattern'; +procedure QPainterPathStroker_setDashOffset(handle: QPainterPathStrokerH; offset: Double); cdecl; external QtIntf name 'QPainterPathStroker_setDashOffset'; +function QPainterPathStroker_dashOffset(handle: QPainterPathStrokerH): Double; cdecl; external QtIntf name 'QPainterPathStroker_dashOffset'; procedure QPainterPathStroker_createStroke(handle: QPainterPathStrokerH; retval: QPainterPathH; path: QPainterPathH); cdecl; external QtIntf name 'QPainterPathStroker_createStroke'; @@ -4126,6 +4286,9 @@ procedure QFont_resolve(handle: QFontH; mask: LongWord); overload; cdecl; extern {$ifdef MSWINDOWS } function QFont_handle(handle: QFontH): HFONT; overload; cdecl; external QtIntf name 'QFont_handle2'; {$endif} +{$ifdef DARWIN } +function QFont_macFontID(handle: QFontH): LongWord; cdecl; external QtIntf name 'QFont_macFontID'; +{$endif} type QFontDatabaseWritingSystem = cardinal; // QFontDatabase::WritingSystem (4) @@ -4322,6 +4485,7 @@ procedure QFontMetrics_boundingRect(handle: QFontMetricsH; retval: PRect; text: procedure QFontMetrics_boundingRect(handle: QFontMetricsH; retval: PRect; r: PRect; flags: Integer; text: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); overload; cdecl; external QtIntf name 'QFontMetrics_boundingRect3'; procedure QFontMetrics_boundingRect(handle: QFontMetricsH; retval: PRect; x: Integer; y: Integer; w: Integer; h: Integer; flags: Integer; text: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); overload; cdecl; external QtIntf name 'QFontMetrics_boundingRect4'; procedure QFontMetrics_size(handle: QFontMetricsH; retval: PSize; flags: Integer; str: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); cdecl; external QtIntf name 'QFontMetrics_size'; +procedure QFontMetrics_tightBoundingRect(handle: QFontMetricsH; retval: PRect; text: PWideString); cdecl; external QtIntf name 'QFontMetrics_tightBoundingRect'; procedure QFontMetrics_elidedText(handle: QFontMetricsH; retval: PWideString; text: PWideString; mode: QtTextElideMode; width: Integer; flags: Integer = 0); cdecl; external QtIntf name 'QFontMetrics_elidedText'; function QFontMetrics_underlinePos(handle: QFontMetricsH): Integer; cdecl; external QtIntf name 'QFontMetrics_underlinePos'; function QFontMetrics_overlinePos(handle: QFontMetricsH): Integer; cdecl; external QtIntf name 'QFontMetrics_overlinePos'; @@ -4351,6 +4515,7 @@ procedure QFontMetricsF_boundingRect(handle: QFontMetricsFH; retval: QRectFH; _s procedure QFontMetricsF_boundingRect(handle: QFontMetricsFH; retval: QRectFH; p1: PWideChar); overload; cdecl; external QtIntf name 'QFontMetricsF_boundingRect2'; procedure QFontMetricsF_boundingRect(handle: QFontMetricsFH; retval: QRectFH; r: QRectFH; flags: Integer; _string: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); overload; cdecl; external QtIntf name 'QFontMetricsF_boundingRect3'; procedure QFontMetricsF_size(handle: QFontMetricsFH; retval: QSizeFH; flags: Integer; str: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); cdecl; external QtIntf name 'QFontMetricsF_size'; +procedure QFontMetricsF_tightBoundingRect(handle: QFontMetricsFH; retval: QRectFH; text: PWideString); cdecl; external QtIntf name 'QFontMetricsF_tightBoundingRect'; procedure QFontMetricsF_elidedText(handle: QFontMetricsFH; retval: PWideString; text: PWideString; mode: QtTextElideMode; width: Double; flags: Integer = 0); cdecl; external QtIntf name 'QFontMetricsF_elidedText'; function QFontMetricsF_underlinePos(handle: QFontMetricsFH): Double; cdecl; external QtIntf name 'QFontMetricsF_underlinePos'; function QFontMetricsF_overlinePos(handle: QFontMetricsFH): Double; cdecl; external QtIntf name 'QFontMetricsF_overlinePos'; @@ -4451,6 +4616,8 @@ procedure QTextDocument_undo(handle: QTextDocumentH; cursor: QTextCursorH); over procedure QTextDocument_redo(handle: QTextDocumentH; cursor: QTextCursorH); overload; cdecl; external QtIntf name 'QTextDocument_redo'; function QTextDocument_maximumBlockCount(handle: QTextDocumentH): Integer; cdecl; external QtIntf name 'QTextDocument_maximumBlockCount'; procedure QTextDocument_setMaximumBlockCount(handle: QTextDocumentH; maximum: Integer); cdecl; external QtIntf name 'QTextDocument_setMaximumBlockCount'; +procedure QTextDocument_defaultTextOption(handle: QTextDocumentH; retval: QTextOptionH); cdecl; external QtIntf name 'QTextDocument_defaultTextOption'; +procedure QTextDocument_setDefaultTextOption(handle: QTextDocumentH; option: QTextOptionH); cdecl; external QtIntf name 'QTextDocument_setDefaultTextOption'; procedure QTextDocument_undo(handle: QTextDocumentH); overload; cdecl; external QtIntf name 'QTextDocument_undo2'; procedure QTextDocument_redo(handle: QTextDocumentH); overload; cdecl; external QtIntf name 'QTextDocument_redo2'; procedure QTextDocument_setModified(handle: QTextDocumentH; m: Boolean = True); cdecl; external QtIntf name 'QTextDocument_setModified'; @@ -4469,6 +4636,7 @@ function QIcon_create(pixmap: QPixmapH): QIconH; overload; cdecl; external QtInt function QIcon_create(other: QIconH): QIconH; overload; cdecl; external QtIntf name 'QIcon_create3'; function QIcon_create(fileName: PWideString): QIconH; overload; cdecl; external QtIntf name 'QIcon_create4'; function QIcon_create(engine: QIconEngineH): QIconH; overload; cdecl; external QtIntf name 'QIcon_create5'; +function QIcon_create(engine: QIconEngineV2H): QIconH; overload; cdecl; external QtIntf name 'QIcon_create6'; procedure QIcon_pixmap(handle: QIconH; retval: QPixmapH; size: PSize; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); overload; cdecl; external QtIntf name 'QIcon_pixmap'; procedure QIcon_pixmap(handle: QIconH; retval: QPixmapH; w: Integer; h: Integer; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); overload; cdecl; external QtIntf name 'QIcon_pixmap2'; procedure QIcon_pixmap(handle: QIconH; retval: QPixmapH; extent: Integer; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); overload; cdecl; external QtIntf name 'QIcon_pixmap3'; @@ -4477,7 +4645,9 @@ procedure QIcon_paint(handle: QIconH; painter: QPainterH; rect: PRect; alignment procedure QIcon_paint(handle: QIconH; painter: QPainterH; x: Integer; y: Integer; w: Integer; h: Integer; alignment: QtAlignment = QtAlignCenter; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); overload; cdecl; external QtIntf name 'QIcon_paint2'; function QIcon_isNull(handle: QIconH): Boolean; cdecl; external QtIntf name 'QIcon_isNull'; function QIcon_isDetached(handle: QIconH): Boolean; cdecl; external QtIntf name 'QIcon_isDetached'; +procedure QIcon_detach(handle: QIconH); cdecl; external QtIntf name 'QIcon_detach'; function QIcon_serialNumber(handle: QIconH): Integer; cdecl; external QtIntf name 'QIcon_serialNumber'; +function QIcon_cacheKey(handle: QIconH): int64; cdecl; external QtIntf name 'QIcon_cacheKey'; procedure QIcon_addPixmap(handle: QIconH; pixmap: QPixmapH; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); cdecl; external QtIntf name 'QIcon_addPixmap'; procedure QIcon_addFile(handle: QIconH; fileName: PWideString; size: PSize = nil; mode: QIconMode = QIconNormal; state: QIconState = QIconOff); cdecl; external QtIntf name 'QIcon_addFile'; @@ -4513,7 +4683,8 @@ procedure QPixmap_setAlphaChannel(handle: QPixmapH; p1: QPixmapH); cdecl; extern function QPixmap_hasAlpha(handle: QPixmapH): Boolean; cdecl; external QtIntf name 'QPixmap_hasAlpha'; function QPixmap_hasAlphaChannel(handle: QPixmapH): Boolean; cdecl; external QtIntf name 'QPixmap_hasAlphaChannel'; procedure QPixmap_createHeuristicMask(handle: QPixmapH; retval: QBitmapH; clipTight: Boolean = True); cdecl; external QtIntf name 'QPixmap_createHeuristicMask'; -procedure QPixmap_createMaskFromColor(handle: QPixmapH; retval: QBitmapH; maskColor: PQColor); cdecl; external QtIntf name 'QPixmap_createMaskFromColor'; +procedure QPixmap_createMaskFromColor(handle: QPixmapH; retval: QBitmapH; maskColor: PQColor); overload; cdecl; external QtIntf name 'QPixmap_createMaskFromColor'; +procedure QPixmap_createMaskFromColor(handle: QPixmapH; retval: QBitmapH; maskColor: PQColor; mode: QtMaskMode); overload; cdecl; external QtIntf name 'QPixmap_createMaskFromColor2'; procedure QPixmap_grabWindow(retval: QPixmapH; p1: LongWord; x: Integer = 0; y: Integer = 0; w: Integer = -1; h: Integer = -1); cdecl; external QtIntf name 'QPixmap_grabWindow'; procedure QPixmap_grabWidget(retval: QPixmapH; widget: QWidgetH; rect: PRect); overload; cdecl; external QtIntf name 'QPixmap_grabWidget'; procedure QPixmap_grabWidget(retval: QPixmapH; widget: QWidgetH; x: Integer = 0; y: Integer = 0; w: Integer = -1; h: Integer = -1); overload; cdecl; external QtIntf name 'QPixmap_grabWidget2'; @@ -4521,8 +4692,10 @@ procedure QPixmap_scaled(handle: QPixmapH; retval: QPixmapH; w: Integer; h: Inte procedure QPixmap_scaled(handle: QPixmapH; retval: QPixmapH; s: PSize; aspectMode: QtAspectRatioMode = QtIgnoreAspectRatio; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QPixmap_scaled2'; procedure QPixmap_scaledToWidth(handle: QPixmapH; retval: QPixmapH; w: Integer; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QPixmap_scaledToWidth'; procedure QPixmap_scaledToHeight(handle: QPixmapH; retval: QPixmapH; h: Integer; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QPixmap_scaledToHeight'; -procedure QPixmap_transformed(handle: QPixmapH; retval: QPixmapH; p1: QMatrixH; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QPixmap_transformed'; -procedure QPixmap_trueMatrix(retval: QMatrixH; m: QMatrixH; w: Integer; h: Integer); cdecl; external QtIntf name 'QPixmap_trueMatrix'; +procedure QPixmap_transformed(handle: QPixmapH; retval: QPixmapH; p1: QMatrixH; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QPixmap_transformed'; +procedure QPixmap_trueMatrix(retval: QMatrixH; m: QMatrixH; w: Integer; h: Integer); overload; cdecl; external QtIntf name 'QPixmap_trueMatrix'; +procedure QPixmap_transformed(handle: QPixmapH; retval: QPixmapH; p1: QTransformH; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QPixmap_transformed2'; +procedure QPixmap_trueMatrix(retval: QTransformH; m: QTransformH; w: Integer; h: Integer); overload; cdecl; external QtIntf name 'QPixmap_trueMatrix2'; procedure QPixmap_toImage(handle: QPixmapH; retval: QImageH); cdecl; external QtIntf name 'QPixmap_toImage'; procedure QPixmap_fromImage(retval: QPixmapH; image: QImageH; flags: QtImageConversionFlags = QtAutoColor); cdecl; external QtIntf name 'QPixmap_fromImage'; function QPixmap_load(handle: QPixmapH; fileName: PWideString; format: PAnsiChar = nil; flags: QtImageConversionFlags = QtAutoColor): Boolean; cdecl; external QtIntf name 'QPixmap_load'; @@ -4533,6 +4706,7 @@ function QPixmap_save(handle: QPixmapH; device: QIODeviceH; format: PAnsiChar = procedure QPixmap_copy(handle: QPixmapH; retval: QPixmapH; x: Integer; y: Integer; width: Integer; height: Integer); overload; cdecl; external QtIntf name 'QPixmap_copy'; procedure QPixmap_copy(handle: QPixmapH; retval: QPixmapH; rect: PRect = nil); overload; cdecl; external QtIntf name 'QPixmap_copy2'; function QPixmap_serialNumber(handle: QPixmapH): Integer; cdecl; external QtIntf name 'QPixmap_serialNumber'; +function QPixmap_cacheKey(handle: QPixmapH): int64; cdecl; external QtIntf name 'QPixmap_cacheKey'; function QPixmap_isDetached(handle: QPixmapH): Boolean; cdecl; external QtIntf name 'QPixmap_isDetached'; procedure QPixmap_detach(handle: QPixmapH); cdecl; external QtIntf name 'QPixmap_detach'; function QPixmap_isQBitmap(handle: QPixmapH): Boolean; cdecl; external QtIntf name 'QPixmap_isQBitmap'; @@ -4570,9 +4744,11 @@ procedure QImage_destroy(handle: QImageH); cdecl; external QtIntf name 'QImage_d function QImage_create(size: PSize; format: QImageFormat): QImageH; overload; cdecl; external QtIntf name 'QImage_create2'; function QImage_create(width: Integer; height: Integer; format: QImageFormat): QImageH; overload; cdecl; external QtIntf name 'QImage_create3'; function QImage_create(data: PByte; width: Integer; height: Integer; format: QImageFormat): QImageH; overload; cdecl; external QtIntf name 'QImage_create4'; -function QImage_create(xpm: PAnsiChar): QImageH; overload; cdecl; external QtIntf name 'QImage_create6'; -function QImage_create(fileName: PAnsiChar; format: PAnsiChar = nil): QImageH; overload; cdecl; external QtIntf name 'QImage_create8'; -function QImage_create(p1: QImageH): QImageH; overload; cdecl; external QtIntf name 'QImage_create9'; +function QImage_create(data: PByte; width: Integer; height: Integer; bytesPerLine: Integer; format: QImageFormat): QImageH; overload; cdecl; external QtIntf name 'QImage_create6'; +function QImage_create(xpm: PAnsiChar): QImageH; overload; cdecl; external QtIntf name 'QImage_create8'; +function QImage_create(fileName: PWideString; format: PAnsiChar = nil): QImageH; overload; cdecl; external QtIntf name 'QImage_create9'; +function QImage_create(fileName: PAnsiChar; format: PAnsiChar = nil): QImageH; overload; cdecl; external QtIntf name 'QImage_create10'; +function QImage_create(p1: QImageH): QImageH; overload; cdecl; external QtIntf name 'QImage_create11'; function QImage_isNull(handle: QImageH): Boolean; cdecl; external QtIntf name 'QImage_isNull'; function QImage_devType(handle: QImageH): Integer; cdecl; external QtIntf name 'QImage_devType'; procedure QImage_detach(handle: QImageH); cdecl; external QtIntf name 'QImage_detach'; @@ -4610,12 +4786,15 @@ procedure QImage_setAlphaChannel(handle: QImageH; alphaChannel: QImageH); cdecl; procedure QImage_alphaChannel(handle: QImageH; retval: QImageH); cdecl; external QtIntf name 'QImage_alphaChannel'; procedure QImage_createAlphaMask(handle: QImageH; retval: QImageH; flags: QtImageConversionFlags = QtAutoColor); cdecl; external QtIntf name 'QImage_createAlphaMask'; procedure QImage_createHeuristicMask(handle: QImageH; retval: QImageH; clipTight: Boolean = True); cdecl; external QtIntf name 'QImage_createHeuristicMask'; +procedure QImage_createMaskFromColor(handle: QImageH; retval: QImageH; color: QRgb; mode: QtMaskMode = QtMaskInColor); cdecl; external QtIntf name 'QImage_createMaskFromColor'; procedure QImage_scaled(handle: QImageH; retval: QImageH; w: Integer; h: Integer; aspectMode: QtAspectRatioMode = QtIgnoreAspectRatio; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QImage_scaled'; procedure QImage_scaled(handle: QImageH; retval: QImageH; s: PSize; aspectMode: QtAspectRatioMode = QtIgnoreAspectRatio; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QImage_scaled2'; procedure QImage_scaledToWidth(handle: QImageH; retval: QImageH; w: Integer; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QImage_scaledToWidth'; procedure QImage_scaledToHeight(handle: QImageH; retval: QImageH; h: Integer; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QImage_scaledToHeight'; -procedure QImage_transformed(handle: QImageH; retval: QImageH; matrix: QMatrixH; mode: QtTransformationMode = QtFastTransformation); cdecl; external QtIntf name 'QImage_transformed'; -procedure QImage_trueMatrix(retval: QMatrixH; p1: QMatrixH; w: Integer; h: Integer); cdecl; external QtIntf name 'QImage_trueMatrix'; +procedure QImage_transformed(handle: QImageH; retval: QImageH; matrix: QMatrixH; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QImage_transformed'; +procedure QImage_trueMatrix(retval: QMatrixH; p1: QMatrixH; w: Integer; h: Integer); overload; cdecl; external QtIntf name 'QImage_trueMatrix'; +procedure QImage_transformed(handle: QImageH; retval: QImageH; matrix: QTransformH; mode: QtTransformationMode = QtFastTransformation); overload; cdecl; external QtIntf name 'QImage_transformed2'; +procedure QImage_trueMatrix(retval: QTransformH; p1: QTransformH; w: Integer; h: Integer); overload; cdecl; external QtIntf name 'QImage_trueMatrix2'; procedure QImage_mirrored(handle: QImageH; retval: QImageH; horizontally: Boolean = False; vertically: Boolean = True); cdecl; external QtIntf name 'QImage_mirrored'; procedure QImage_rgbSwapped(handle: QImageH; retval: QImageH); cdecl; external QtIntf name 'QImage_rgbSwapped'; procedure QImage_invertPixels(handle: QImageH; p1: QImageInvertMode = QImageInvertRgb); cdecl; external QtIntf name 'QImage_invertPixels'; @@ -4628,6 +4807,7 @@ function QImage_save(handle: QImageH; device: QIODeviceH; format: PAnsiChar = ni procedure QImage_fromData(retval: QImageH; data: PByte; size: Integer; format: PAnsiChar = nil); overload; cdecl; external QtIntf name 'QImage_fromData'; procedure QImage_fromData(retval: QImageH; data: QByteArrayH; format: PAnsiChar = nil); overload; cdecl; external QtIntf name 'QImage_fromData2'; function QImage_serialNumber(handle: QImageH): Integer; cdecl; external QtIntf name 'QImage_serialNumber'; +function QImage_cacheKey(handle: QImageH): int64; cdecl; external QtIntf name 'QImage_cacheKey'; function QImage_paintEngine(handle: QImageH): QPaintEngineH; cdecl; external QtIntf name 'QImage_paintEngine'; function QImage_dotsPerMeterX(handle: QImageH): Integer; cdecl; external QtIntf name 'QImage_dotsPerMeterX'; function QImage_dotsPerMeterY(handle: QImageH): Integer; cdecl; external QtIntf name 'QImage_dotsPerMeterY'; @@ -4651,7 +4831,8 @@ function QBitmap_create(fileName: PWideString; format: PAnsiChar = nil): QBitmap procedure QBitmap_clear(handle: QBitmapH); cdecl; external QtIntf name 'QBitmap_clear'; procedure QBitmap_fromImage(retval: QBitmapH; image: QImageH; flags: QtImageConversionFlags = QtAutoColor); cdecl; external QtIntf name 'QBitmap_fromImage'; procedure QBitmap_fromData(retval: QBitmapH; size: PSize; bits: PByte; monoFormat: QImageFormat = QImageFormat_MonoLSB); cdecl; external QtIntf name 'QBitmap_fromData'; -procedure QBitmap_transformed(handle: QBitmapH; retval: QBitmapH; p1: QMatrixH); cdecl; external QtIntf name 'QBitmap_transformed'; +procedure QBitmap_transformed(handle: QBitmapH; retval: QBitmapH; p1: QMatrixH); overload; cdecl; external QtIntf name 'QBitmap_transformed'; +procedure QBitmap_transformed(handle: QBitmapH; retval: QBitmapH; matrix: QTransformH); overload; cdecl; external QtIntf name 'QBitmap_transformed2'; function QPicture_create(formatVersion: Integer = -1): QPictureH; overload; cdecl; external QtIntf name 'QPicture_create'; procedure QPicture_destroy(handle: QPictureH); cdecl; external QtIntf name 'QPicture_destroy'; @@ -4790,6 +4971,8 @@ procedure QImageWriter_setFileName(handle: QImageWriterH; fileName: PWideString) procedure QImageWriter_fileName(handle: QImageWriterH; retval: PWideString); cdecl; external QtIntf name 'QImageWriter_fileName'; procedure QImageWriter_setQuality(handle: QImageWriterH; quality: Integer); cdecl; external QtIntf name 'QImageWriter_setQuality'; function QImageWriter_quality(handle: QImageWriterH): Integer; cdecl; external QtIntf name 'QImageWriter_quality'; +procedure QImageWriter_setCompression(handle: QImageWriterH; compression: Integer); cdecl; external QtIntf name 'QImageWriter_setCompression'; +function QImageWriter_compression(handle: QImageWriterH): Integer; cdecl; external QtIntf name 'QImageWriter_compression'; procedure QImageWriter_setGamma(handle: QImageWriterH; gamma: Single); cdecl; external QtIntf name 'QImageWriter_setGamma'; function QImageWriter_gamma(handle: QImageWriterH): Single; cdecl; external QtIntf name 'QImageWriter_gamma'; procedure QImageWriter_setDescription(handle: QImageWriterH; description: PWideString); cdecl; external QtIntf name 'QImageWriter_setDescription'; @@ -4806,6 +4989,13 @@ type QValidatorState = ( // QValidator::State (1) QValidatorInvalid, QValidatorIntermediate, QValidatorAcceptable ); + +type + QDoubleValidatorNotation = ( // QDoubleValidator::Notation (1) + QDoubleValidatorStandardNotation, QDoubleValidatorScientificNotation ); + +procedure QValidator_setLocale(handle: QValidatorH; locale: QLocaleH); cdecl; external QtIntf name 'QValidator_setLocale'; +procedure QValidator_locale(handle: QValidatorH; retval: QLocaleH); cdecl; external QtIntf name 'QValidator_locale'; function QValidator_validate(handle: QValidatorH; p1: PWideString; p2: PInteger): QValidatorState; cdecl; external QtIntf name 'QValidator_validate'; procedure QValidator_fixup(handle: QValidatorH; p1: PWideString); cdecl; external QtIntf name 'QValidator_fixup'; @@ -4827,9 +5017,11 @@ procedure QDoubleValidator_setRange(handle: QDoubleValidatorH; bottom: Double; t procedure QDoubleValidator_setBottom(handle: QDoubleValidatorH; p1: Double); cdecl; external QtIntf name 'QDoubleValidator_setBottom'; procedure QDoubleValidator_setTop(handle: QDoubleValidatorH; p1: Double); cdecl; external QtIntf name 'QDoubleValidator_setTop'; procedure QDoubleValidator_setDecimals(handle: QDoubleValidatorH; p1: Integer); cdecl; external QtIntf name 'QDoubleValidator_setDecimals'; +procedure QDoubleValidator_setNotation(handle: QDoubleValidatorH; p1: QDoubleValidatorNotation); cdecl; external QtIntf name 'QDoubleValidator_setNotation'; function QDoubleValidator_bottom(handle: QDoubleValidatorH): Double; cdecl; external QtIntf name 'QDoubleValidator_bottom'; function QDoubleValidator_top(handle: QDoubleValidatorH): Double; cdecl; external QtIntf name 'QDoubleValidator_top'; function QDoubleValidator_decimals(handle: QDoubleValidatorH): Integer; cdecl; external QtIntf name 'QDoubleValidator_decimals'; +function QDoubleValidator_notation(handle: QDoubleValidatorH): QDoubleValidatorNotation; cdecl; external QtIntf name 'QDoubleValidator_notation'; function QRegExpValidator_create(parent: QObjectH): QRegExpValidatorH; overload; cdecl; external QtIntf name 'QRegExpValidator_create'; procedure QRegExpValidator_destroy(handle: QRegExpValidatorH); cdecl; external QtIntf name 'QRegExpValidator_destroy'; @@ -5016,6 +5208,7 @@ procedure QMenuBar_actionGeometry(handle: QMenuBarH; retval: PRect; p1: QActionH function QMenuBar_actionAt(handle: QMenuBarH; p1: PPoint): QActionH; cdecl; external QtIntf name 'QMenuBar_actionAt'; procedure QMenuBar_setCornerWidget(handle: QMenuBarH; w: QWidgetH; corner: QtCorner = QtTopRightCorner); cdecl; external QtIntf name 'QMenuBar_setCornerWidget'; function QMenuBar_cornerWidget(handle: QMenuBarH; corner: QtCorner = QtTopRightCorner): QWidgetH; cdecl; external QtIntf name 'QMenuBar_cornerWidget'; +procedure QMenuBar_setVisible(handle: QMenuBarH; visible: Boolean); cdecl; external QtIntf name 'QMenuBar_setVisible'; {$ifdef DARWIN } function QMenuBar_macMenu(handle: QMenuBarH): MenuRef; cdecl; external QtIntf name 'QMenuBar_macMenu'; {$endif} @@ -5091,6 +5284,7 @@ procedure QPushButton_destroy(handle: QPushButtonH); cdecl; external QtIntf name function QPushButton_create(text: PWideString; parent: QWidgetH = nil): QPushButtonH; overload; cdecl; external QtIntf name 'QPushButton_create2'; function QPushButton_create(icon: QIconH; text: PWideString; parent: QWidgetH = nil): QPushButtonH; overload; cdecl; external QtIntf name 'QPushButton_create3'; procedure QPushButton_sizeHint(handle: QPushButtonH; retval: PSize); cdecl; external QtIntf name 'QPushButton_sizeHint'; +procedure QPushButton_minimumSizeHint(handle: QPushButtonH; retval: PSize); cdecl; external QtIntf name 'QPushButton_minimumSizeHint'; function QPushButton_autoDefault(handle: QPushButtonH): Boolean; cdecl; external QtIntf name 'QPushButton_autoDefault'; procedure QPushButton_setAutoDefault(handle: QPushButtonH; p1: Boolean); cdecl; external QtIntf name 'QPushButton_setAutoDefault'; function QPushButton_isDefault(handle: QPushButtonH): Boolean; cdecl; external QtIntf name 'QPushButton_isDefault'; @@ -5249,6 +5443,7 @@ function QTextEdit_acceptRichText(handle: QTextEditH): Boolean; cdecl; external procedure QTextEdit_setAcceptRichText(handle: QTextEditH; accept: Boolean); cdecl; external QtIntf name 'QTextEdit_setAcceptRichText'; procedure QTextEdit_moveCursor(handle: QTextEditH; operation: QTextCursorMoveOperation; mode: QTextCursorMoveMode = QTextCursorMoveAnchor); cdecl; external QtIntf name 'QTextEdit_moveCursor'; function QTextEdit_canPaste(handle: QTextEditH): Boolean; cdecl; external QtIntf name 'QTextEdit_canPaste'; +procedure QTextEdit_print(handle: QTextEditH; printer: QPrinterH); cdecl; external QtIntf name 'QTextEdit_print'; procedure QTextEdit_setFontPointSize(handle: QTextEditH; s: Double); cdecl; external QtIntf name 'QTextEdit_setFontPointSize'; procedure QTextEdit_setFontFamily(handle: QTextEditH; fontFamily: PWideString); cdecl; external QtIntf name 'QTextEdit_setFontFamily'; procedure QTextEdit_setFontWeight(handle: QTextEditH; w: Integer); cdecl; external QtIntf name 'QTextEdit_setFontWeight'; @@ -5285,6 +5480,16 @@ type QTextEdit_cursorPositionChanged_Event = procedure () of object cdecl; +type + QMainWindowDockOption = cardinal; // QMainWindow::DockOption + QMainWindowDockOptions = QMainWindowDockOption; //QFlags<> (3) +const + QMainWindowAnimatedDocks = $01; + QMainWindowAllowNestedDocks = $02; + QMainWindowAllowTabbedDocks = $04; + QMainWindowForceTabbedDocks = $08; + QMainWindowVerticalTabs = $10; + function QMainWindow_create(parent: QWidgetH = nil; flags: QtWindowFlags = 0): QMainWindowH; cdecl; external QtIntf name 'QMainWindow_create'; procedure QMainWindow_destroy(handle: QMainWindowH); cdecl; external QtIntf name 'QMainWindow_destroy'; procedure QMainWindow_iconSize(handle: QMainWindowH; retval: PSize); cdecl; external QtIntf name 'QMainWindow_iconSize'; @@ -5293,6 +5498,8 @@ function QMainWindow_toolButtonStyle(handle: QMainWindowH): QtToolButtonStyle; c procedure QMainWindow_setToolButtonStyle(handle: QMainWindowH; toolButtonStyle: QtToolButtonStyle); cdecl; external QtIntf name 'QMainWindow_setToolButtonStyle'; function QMainWindow_isAnimated(handle: QMainWindowH): Boolean; cdecl; external QtIntf name 'QMainWindow_isAnimated'; function QMainWindow_isDockNestingEnabled(handle: QMainWindowH): Boolean; cdecl; external QtIntf name 'QMainWindow_isDockNestingEnabled'; +procedure QMainWindow_setDockOptions(handle: QMainWindowH; options: QMainWindowDockOptions); cdecl; external QtIntf name 'QMainWindow_setDockOptions'; +function QMainWindow_dockOptions(handle: QMainWindowH): QMainWindowDockOptions; cdecl; external QtIntf name 'QMainWindow_dockOptions'; function QMainWindow_isSeparator(handle: QMainWindowH; pos: PPoint): Boolean; cdecl; external QtIntf name 'QMainWindow_isSeparator'; function QMainWindow_menuBar(handle: QMainWindowH): QMenuBarH; cdecl; external QtIntf name 'QMainWindow_menuBar'; procedure QMainWindow_setMenuBar(handle: QMainWindowH; menubar: QMenuBarH); cdecl; external QtIntf name 'QMainWindow_setMenuBar'; @@ -5311,7 +5518,11 @@ procedure QMainWindow_addToolBar(handle: QMainWindowH; toolbar: QToolBarH); over function QMainWindow_addToolBar(handle: QMainWindowH; title: PWideString): QToolBarH; overload; cdecl; external QtIntf name 'QMainWindow_addToolBar3'; procedure QMainWindow_insertToolBar(handle: QMainWindowH; before: QToolBarH; toolbar: QToolBarH); cdecl; external QtIntf name 'QMainWindow_insertToolBar'; procedure QMainWindow_removeToolBar(handle: QMainWindowH; toolbar: QToolBarH); cdecl; external QtIntf name 'QMainWindow_removeToolBar'; +procedure QMainWindow_removeToolBarBreak(handle: QMainWindowH; before: QToolBarH); cdecl; external QtIntf name 'QMainWindow_removeToolBarBreak'; +procedure QMainWindow_setUnifiedTitleAndToolBarOnMac(handle: QMainWindowH; _set: Boolean); cdecl; external QtIntf name 'QMainWindow_setUnifiedTitleAndToolBarOnMac'; +function QMainWindow_unifiedTitleAndToolBarOnMac(handle: QMainWindowH): Boolean; cdecl; external QtIntf name 'QMainWindow_unifiedTitleAndToolBarOnMac'; function QMainWindow_toolBarArea(handle: QMainWindowH; toolbar: QToolBarH): QtToolBarArea; cdecl; external QtIntf name 'QMainWindow_toolBarArea'; +function QMainWindow_toolBarBreak(handle: QMainWindowH; toolbar: QToolBarH): Boolean; cdecl; external QtIntf name 'QMainWindow_toolBarBreak'; procedure QMainWindow_addDockWidget(handle: QMainWindowH; area: QtDockWidgetArea; dockwidget: QDockWidgetH); overload; cdecl; external QtIntf name 'QMainWindow_addDockWidget'; procedure QMainWindow_addDockWidget(handle: QMainWindowH; area: QtDockWidgetArea; dockwidget: QDockWidgetH; orientation: QtOrientation); overload; cdecl; external QtIntf name 'QMainWindow_addDockWidget2'; procedure QMainWindow_splitDockWidget(handle: QMainWindowH; after: QDockWidgetH; dockwidget: QDockWidgetH; orientation: QtOrientation); cdecl; external QtIntf name 'QMainWindow_splitDockWidget'; @@ -5356,6 +5567,9 @@ function QToolBar_toggleViewAction(handle: QToolBarH): QActionH; cdecl; external procedure QToolBar_iconSize(handle: QToolBarH; retval: PSize); cdecl; external QtIntf name 'QToolBar_iconSize'; function QToolBar_toolButtonStyle(handle: QToolBarH): QtToolButtonStyle; cdecl; external QtIntf name 'QToolBar_toolButtonStyle'; function QToolBar_widgetForAction(handle: QToolBarH; action: QActionH): QWidgetH; cdecl; external QtIntf name 'QToolBar_widgetForAction'; +function QToolBar_isFloatable(handle: QToolBarH): Boolean; cdecl; external QtIntf name 'QToolBar_isFloatable'; +procedure QToolBar_setFloatable(handle: QToolBarH; floatable: Boolean); cdecl; external QtIntf name 'QToolBar_setFloatable'; +function QToolBar_isFloating(handle: QToolBarH): Boolean; cdecl; external QtIntf name 'QToolBar_isFloating'; procedure QToolBar_setIconSize(handle: QToolBarH; iconSize: PSize); cdecl; external QtIntf name 'QToolBar_setIconSize'; procedure QToolBar_setToolButtonStyle(handle: QToolBarH; toolButtonStyle: QtToolButtonStyle); cdecl; external QtIntf name 'QToolBar_setToolButtonStyle'; @@ -5414,7 +5628,7 @@ type type QAbstractSpinBoxButtonSymbols = ( // QAbstractSpinBox::ButtonSymbols (1) - QAbstractSpinBoxUpDownArrows, QAbstractSpinBoxPlusMinus ); + QAbstractSpinBoxUpDownArrows, QAbstractSpinBoxPlusMinus, QAbstractSpinBoxNoButtons ); QAbstractSpinBoxCorrectionMode = ( // QAbstractSpinBox::CorrectionMode (1) QAbstractSpinBoxCorrectToPreviousValue, QAbstractSpinBoxCorrectToNearestValue ); @@ -5441,6 +5655,8 @@ function QAbstractSpinBox_wrapping(handle: QAbstractSpinBoxH): Boolean; cdecl; e procedure QAbstractSpinBox_setWrapping(handle: QAbstractSpinBoxH; w: Boolean); cdecl; external QtIntf name 'QAbstractSpinBox_setWrapping'; procedure QAbstractSpinBox_setReadOnly(handle: QAbstractSpinBoxH; r: Boolean); cdecl; external QtIntf name 'QAbstractSpinBox_setReadOnly'; function QAbstractSpinBox_isReadOnly(handle: QAbstractSpinBoxH): Boolean; cdecl; external QtIntf name 'QAbstractSpinBox_isReadOnly'; +procedure QAbstractSpinBox_setKeyboardTracking(handle: QAbstractSpinBoxH; kt: Boolean); cdecl; external QtIntf name 'QAbstractSpinBox_setKeyboardTracking'; +function QAbstractSpinBox_keyboardTracking(handle: QAbstractSpinBoxH): Boolean; cdecl; external QtIntf name 'QAbstractSpinBox_keyboardTracking'; procedure QAbstractSpinBox_setAlignment(handle: QAbstractSpinBoxH; flag: QtAlignment); cdecl; external QtIntf name 'QAbstractSpinBox_setAlignment'; function QAbstractSpinBox_alignment(handle: QAbstractSpinBoxH): QtAlignment; cdecl; external QtIntf name 'QAbstractSpinBox_alignment'; procedure QAbstractSpinBox_setFrame(handle: QAbstractSpinBoxH; p1: Boolean); cdecl; external QtIntf name 'QAbstractSpinBox_setFrame'; @@ -5593,7 +5809,7 @@ type QComboBoxNoInsert, QComboBoxInsertAtTop, QComboBoxInsertAtCurrent, QComboBoxInsertAtBottom, QComboBoxInsertAfterCurrent, QComboBoxInsertBeforeCurrent, QComboBoxInsertAlphabetically ); QComboBoxSizeAdjustPolicy = ( // QComboBox::SizeAdjustPolicy (1) - QComboBoxAdjustToContents, QComboBoxAdjustToContentsOnFirstShow, QComboBoxAdjustToMinimumContentsLength ); + QComboBoxAdjustToContents, QComboBoxAdjustToContentsOnFirstShow, QComboBoxAdjustToMinimumContentsLength, QComboBoxAdjustToMinimumContentsLengthWithIcon ); function QComboBox_create(parent: QWidgetH = nil): QComboBoxH; cdecl; external QtIntf name 'QComboBox_create'; procedure QComboBox_destroy(handle: QComboBoxH); cdecl; external QtIntf name 'QComboBox_destroy'; @@ -5722,6 +5938,8 @@ function QTextBrowser_isForwardAvailable(handle: QTextBrowserH): Boolean; cdecl; procedure QTextBrowser_clearHistory(handle: QTextBrowserH); cdecl; external QtIntf name 'QTextBrowser_clearHistory'; function QTextBrowser_openExternalLinks(handle: QTextBrowserH): Boolean; cdecl; external QtIntf name 'QTextBrowser_openExternalLinks'; procedure QTextBrowser_setOpenExternalLinks(handle: QTextBrowserH; open: Boolean); cdecl; external QtIntf name 'QTextBrowser_setOpenExternalLinks'; +function QTextBrowser_openLinks(handle: QTextBrowserH): Boolean; cdecl; external QtIntf name 'QTextBrowser_openLinks'; +procedure QTextBrowser_setOpenLinks(handle: QTextBrowserH; open: Boolean); cdecl; external QtIntf name 'QTextBrowser_setOpenLinks'; procedure QTextBrowser_setSource(handle: QTextBrowserH; name: QUrlH); cdecl; external QtIntf name 'QTextBrowser_setSource'; procedure QTextBrowser_backward(handle: QTextBrowserH); cdecl; external QtIntf name 'QTextBrowser_backward'; procedure QTextBrowser_forward(handle: QTextBrowserH); cdecl; external QtIntf name 'QTextBrowser_forward'; @@ -5846,6 +6064,7 @@ procedure QTabWidget_iconSize(handle: QTabWidgetH; retval: PSize); cdecl; extern procedure QTabWidget_setIconSize(handle: QTabWidgetH; size: PSize); cdecl; external QtIntf name 'QTabWidget_setIconSize'; function QTabWidget_usesScrollButtons(handle: QTabWidgetH): Boolean; cdecl; external QtIntf name 'QTabWidget_usesScrollButtons'; procedure QTabWidget_setUsesScrollButtons(handle: QTabWidgetH; useButtons: Boolean); cdecl; external QtIntf name 'QTabWidget_setUsesScrollButtons'; +procedure QTabWidget_clear(handle: QTabWidgetH); cdecl; external QtIntf name 'QTabWidget_clear'; procedure QTabWidget_setCurrentIndex(handle: QTabWidgetH; index: Integer); cdecl; external QtIntf name 'QTabWidget_setCurrentIndex'; procedure QTabWidget_setCurrentWidget(handle: QTabWidgetH; widget: QWidgetH); cdecl; external QtIntf name 'QTabWidget_setCurrentWidget'; @@ -5885,6 +6104,7 @@ procedure QTabBar_tabWhatsThis(handle: QTabBarH; retval: PWideString; index: Int procedure QTabBar_setTabData(handle: QTabBarH; index: Integer; data: QVariantH); cdecl; external QtIntf name 'QTabBar_setTabData'; procedure QTabBar_tabData(handle: QTabBarH; retval: QVariantH; index: Integer); cdecl; external QtIntf name 'QTabBar_tabData'; procedure QTabBar_tabRect(handle: QTabBarH; retval: PRect; index: Integer); cdecl; external QtIntf name 'QTabBar_tabRect'; +function QTabBar_tabAt(handle: QTabBarH; pos: PPoint): Integer; cdecl; external QtIntf name 'QTabBar_tabAt'; function QTabBar_currentIndex(handle: QTabBarH): Integer; cdecl; external QtIntf name 'QTabBar_currentIndex'; function QTabBar_count(handle: QTabBarH): Integer; cdecl; external QtIntf name 'QTabBar_count'; procedure QTabBar_sizeHint(handle: QTabBarH; retval: PSize); cdecl; external QtIntf name 'QTabBar_sizeHint'; @@ -5911,7 +6131,6 @@ function QProgressBar_create(parent: QWidgetH = nil): QProgressBarH; cdecl; exte procedure QProgressBar_destroy(handle: QProgressBarH); cdecl; external QtIntf name 'QProgressBar_destroy'; function QProgressBar_minimum(handle: QProgressBarH): Integer; cdecl; external QtIntf name 'QProgressBar_minimum'; function QProgressBar_maximum(handle: QProgressBarH): Integer; cdecl; external QtIntf name 'QProgressBar_maximum'; -procedure QProgressBar_setRange(handle: QProgressBarH; minimum: Integer; maximum: Integer); cdecl; external QtIntf name 'QProgressBar_setRange'; function QProgressBar_value(handle: QProgressBarH): Integer; cdecl; external QtIntf name 'QProgressBar_value'; procedure QProgressBar_text(handle: QProgressBarH; retval: PWideString); cdecl; external QtIntf name 'QProgressBar_text'; procedure QProgressBar_setTextVisible(handle: QProgressBarH; visible: Boolean); cdecl; external QtIntf name 'QProgressBar_setTextVisible'; @@ -5928,6 +6147,7 @@ function QProgressBar_textDirection(handle: QProgressBarH): QProgressBarDirectio procedure QProgressBar_setFormat(handle: QProgressBarH; format: PWideString); cdecl; external QtIntf name 'QProgressBar_setFormat'; procedure QProgressBar_format(handle: QProgressBarH; retval: PWideString); cdecl; external QtIntf name 'QProgressBar_format'; procedure QProgressBar_reset(handle: QProgressBarH); cdecl; external QtIntf name 'QProgressBar_reset'; +procedure QProgressBar_setRange(handle: QProgressBarH; minimum: Integer; maximum: Integer); cdecl; external QtIntf name 'QProgressBar_setRange'; procedure QProgressBar_setMinimum(handle: QProgressBarH; minimum: Integer); cdecl; external QtIntf name 'QProgressBar_setMinimum'; procedure QProgressBar_setMaximum(handle: QProgressBarH; maximum: Integer); cdecl; external QtIntf name 'QProgressBar_setMaximum'; procedure QProgressBar_setValue(handle: QProgressBarH; value: Integer); cdecl; external QtIntf name 'QProgressBar_setValue'; @@ -6027,6 +6247,78 @@ procedure QScrollArea_ensureVisible(handle: QScrollAreaH; x: Integer; y: Integer procedure QScrollArea_ensureWidgetVisible(handle: QScrollAreaH; childWidget: QWidgetH; xmargin: Integer = 50; ymargin: Integer = 50); cdecl; external QtIntf name 'QScrollArea_ensureWidgetVisible'; +type + QMdiAreaWindowOrder = ( // QMdiArea::WindowOrder (1) + QMdiAreaCreationOrder, QMdiAreaStackingOrder ); + +type + QMdiAreaAreaOption = cardinal; // QMdiArea::AreaOption + QMdiAreaAreaOptions = QMdiAreaAreaOption; //QFlags<> (3) +const + QMdiAreaDontMaximizeSubWindowOnActivation = $1; + +function QMdiArea_create(parent: QWidgetH = nil): QMdiAreaH; cdecl; external QtIntf name 'QMdiArea_create'; +procedure QMdiArea_destroy(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_destroy'; +procedure QMdiArea_sizeHint(handle: QMdiAreaH; retval: PSize); cdecl; external QtIntf name 'QMdiArea_sizeHint'; +procedure QMdiArea_minimumSizeHint(handle: QMdiAreaH; retval: PSize); cdecl; external QtIntf name 'QMdiArea_minimumSizeHint'; +function QMdiArea_currentSubWindow(handle: QMdiAreaH): QMdiSubWindowH; cdecl; external QtIntf name 'QMdiArea_currentSubWindow'; +function QMdiArea_activeSubWindow(handle: QMdiAreaH): QMdiSubWindowH; cdecl; external QtIntf name 'QMdiArea_activeSubWindow'; +procedure QMdiArea_subWindowList(handle: QMdiAreaH; retval: PIntArray; order: QMdiAreaWindowOrder = QMdiAreaCreationOrder); cdecl; external QtIntf name 'QMdiArea_subWindowList'; +function QMdiArea_addSubWindow(handle: QMdiAreaH; widget: QWidgetH; flags: QtWindowFlags = 0): QMdiSubWindowH; cdecl; external QtIntf name 'QMdiArea_addSubWindow'; +procedure QMdiArea_removeSubWindow(handle: QMdiAreaH; widget: QWidgetH); cdecl; external QtIntf name 'QMdiArea_removeSubWindow'; +procedure QMdiArea_background(handle: QMdiAreaH; retval: QBrushH); cdecl; external QtIntf name 'QMdiArea_background'; +procedure QMdiArea_setBackground(handle: QMdiAreaH; background: QBrushH); cdecl; external QtIntf name 'QMdiArea_setBackground'; +procedure QMdiArea_setOption(handle: QMdiAreaH; option: QMdiAreaAreaOption; _on: Boolean = True); cdecl; external QtIntf name 'QMdiArea_setOption'; +function QMdiArea_testOption(handle: QMdiAreaH; opton: QMdiAreaAreaOption): Boolean; cdecl; external QtIntf name 'QMdiArea_testOption'; +procedure QMdiArea_setActiveSubWindow(handle: QMdiAreaH; window: QMdiSubWindowH); cdecl; external QtIntf name 'QMdiArea_setActiveSubWindow'; +procedure QMdiArea_tileSubWindows(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_tileSubWindows'; +procedure QMdiArea_cascadeSubWindows(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_cascadeSubWindows'; +procedure QMdiArea_closeActiveSubWindow(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_closeActiveSubWindow'; +procedure QMdiArea_closeAllSubWindows(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_closeAllSubWindows'; +procedure QMdiArea_activateNextSubWindow(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_activateNextSubWindow'; +procedure QMdiArea_activatePreviousSubWindow(handle: QMdiAreaH); cdecl; external QtIntf name 'QMdiArea_activatePreviousSubWindow'; + + +type + QMdiArea_subWindowActivated_Event = procedure (p1: QMdiSubWindowH) of object cdecl; + + +type + QMdiSubWindowSubWindowOption = cardinal; // QMdiSubWindow::SubWindowOption + QMdiSubWindowSubWindowOptions = QMdiSubWindowSubWindowOption; //QFlags<> (3) +const + QMdiSubWindowAllowOutsideAreaHorizontally = $1; + QMdiSubWindowAllowOutsideAreaVertically = $2; + QMdiSubWindowRubberBandResize = $4; + QMdiSubWindowRubberBandMove = $8; + +function QMdiSubWindow_create(parent: QWidgetH = nil; flags: QtWindowFlags = 0): QMdiSubWindowH; cdecl; external QtIntf name 'QMdiSubWindow_create'; +procedure QMdiSubWindow_destroy(handle: QMdiSubWindowH); cdecl; external QtIntf name 'QMdiSubWindow_destroy'; +procedure QMdiSubWindow_sizeHint(handle: QMdiSubWindowH; retval: PSize); cdecl; external QtIntf name 'QMdiSubWindow_sizeHint'; +procedure QMdiSubWindow_minimumSizeHint(handle: QMdiSubWindowH; retval: PSize); cdecl; external QtIntf name 'QMdiSubWindow_minimumSizeHint'; +procedure QMdiSubWindow_setWidget(handle: QMdiSubWindowH; widget: QWidgetH); cdecl; external QtIntf name 'QMdiSubWindow_setWidget'; +function QMdiSubWindow_widget(handle: QMdiSubWindowH): QWidgetH; cdecl; external QtIntf name 'QMdiSubWindow_widget'; +function QMdiSubWindow_maximizedButtonsWidget(handle: QMdiSubWindowH): QWidgetH; cdecl; external QtIntf name 'QMdiSubWindow_maximizedButtonsWidget'; +function QMdiSubWindow_maximizedSystemMenuIconWidget(handle: QMdiSubWindowH): QWidgetH; cdecl; external QtIntf name 'QMdiSubWindow_maximizedSystemMenuIconWidget'; +function QMdiSubWindow_isShaded(handle: QMdiSubWindowH): Boolean; cdecl; external QtIntf name 'QMdiSubWindow_isShaded'; +procedure QMdiSubWindow_setOption(handle: QMdiSubWindowH; option: QMdiSubWindowSubWindowOption; _on: Boolean = True); cdecl; external QtIntf name 'QMdiSubWindow_setOption'; +function QMdiSubWindow_testOption(handle: QMdiSubWindowH; p1: QMdiSubWindowSubWindowOption): Boolean; cdecl; external QtIntf name 'QMdiSubWindow_testOption'; +procedure QMdiSubWindow_setKeyboardSingleStep(handle: QMdiSubWindowH; step: Integer); cdecl; external QtIntf name 'QMdiSubWindow_setKeyboardSingleStep'; +function QMdiSubWindow_keyboardSingleStep(handle: QMdiSubWindowH): Integer; cdecl; external QtIntf name 'QMdiSubWindow_keyboardSingleStep'; +procedure QMdiSubWindow_setKeyboardPageStep(handle: QMdiSubWindowH; step: Integer); cdecl; external QtIntf name 'QMdiSubWindow_setKeyboardPageStep'; +function QMdiSubWindow_keyboardPageStep(handle: QMdiSubWindowH): Integer; cdecl; external QtIntf name 'QMdiSubWindow_keyboardPageStep'; +procedure QMdiSubWindow_setSystemMenu(handle: QMdiSubWindowH; systemMenu: QMenuH); cdecl; external QtIntf name 'QMdiSubWindow_setSystemMenu'; +function QMdiSubWindow_systemMenu(handle: QMdiSubWindowH): QMenuH; cdecl; external QtIntf name 'QMdiSubWindow_systemMenu'; +procedure QMdiSubWindow_showSystemMenu(handle: QMdiSubWindowH); cdecl; external QtIntf name 'QMdiSubWindow_showSystemMenu'; +procedure QMdiSubWindow_showShaded(handle: QMdiSubWindowH); cdecl; external QtIntf name 'QMdiSubWindow_showShaded'; + + +type + QMdiSubWindow_windowStateChanged_Event = procedure (oldState: QtWindowStates; newState: QtWindowStates) of object cdecl; + QMdiSubWindow_aboutToActivate_Event = procedure () of object cdecl; + + + type QCalendarWidgetHorizontalHeaderFormat = ( // QCalendarWidget::HorizontalHeaderFormat (1) QCalendarWidgetNoHorizontalHeader, QCalendarWidgetSingleLetterDayNames, QCalendarWidgetShortDayNames, QCalendarWidgetLongDayNames ); @@ -6052,8 +6344,8 @@ function QCalendarWidget_firstDayOfWeek(handle: QCalendarWidgetH): QtDayOfWeek; procedure QCalendarWidget_setFirstDayOfWeek(handle: QCalendarWidgetH; dayOfWeek: QtDayOfWeek); cdecl; external QtIntf name 'QCalendarWidget_setFirstDayOfWeek'; function QCalendarWidget_isHeaderVisible(handle: QCalendarWidgetH): Boolean; cdecl; external QtIntf name 'QCalendarWidget_isHeaderVisible'; procedure QCalendarWidget_setHeaderVisible(handle: QCalendarWidgetH; show: Boolean); cdecl; external QtIntf name 'QCalendarWidget_setHeaderVisible'; +function QCalendarWidget_isNavigationBarVisible(handle: QCalendarWidgetH): Boolean; cdecl; external QtIntf name 'QCalendarWidget_isNavigationBarVisible'; function QCalendarWidget_isGridVisible(handle: QCalendarWidgetH): Boolean; cdecl; external QtIntf name 'QCalendarWidget_isGridVisible'; -procedure QCalendarWidget_setGridVisible(handle: QCalendarWidgetH; show: Boolean); cdecl; external QtIntf name 'QCalendarWidget_setGridVisible'; function QCalendarWidget_selectionMode(handle: QCalendarWidgetH): QCalendarWidgetSelectionMode; cdecl; external QtIntf name 'QCalendarWidget_selectionMode'; procedure QCalendarWidget_setSelectionMode(handle: QCalendarWidgetH; mode: QCalendarWidgetSelectionMode); cdecl; external QtIntf name 'QCalendarWidget_setSelectionMode'; function QCalendarWidget_horizontalHeaderFormat(handle: QCalendarWidgetH): QCalendarWidgetHorizontalHeaderFormat; cdecl; external QtIntf name 'QCalendarWidget_horizontalHeaderFormat'; @@ -6066,9 +6358,15 @@ procedure QCalendarWidget_weekdayTextFormat(handle: QCalendarWidgetH; retval: QT procedure QCalendarWidget_setWeekdayTextFormat(handle: QCalendarWidgetH; dayOfWeek: QtDayOfWeek; format: QTextCharFormatH); cdecl; external QtIntf name 'QCalendarWidget_setWeekdayTextFormat'; procedure QCalendarWidget_dateTextFormat(handle: QCalendarWidgetH; retval: QTextCharFormatH; date: QDateH); overload; cdecl; external QtIntf name 'QCalendarWidget_dateTextFormat2'; procedure QCalendarWidget_setDateTextFormat(handle: QCalendarWidgetH; date: QDateH; color: QTextCharFormatH); cdecl; external QtIntf name 'QCalendarWidget_setDateTextFormat'; +function QCalendarWidget_isDateEditEnabled(handle: QCalendarWidgetH): Boolean; cdecl; external QtIntf name 'QCalendarWidget_isDateEditEnabled'; +procedure QCalendarWidget_setDateEditEnabled(handle: QCalendarWidgetH; enable: Boolean); cdecl; external QtIntf name 'QCalendarWidget_setDateEditEnabled'; +function QCalendarWidget_dateEditAcceptDelay(handle: QCalendarWidgetH): Integer; cdecl; external QtIntf name 'QCalendarWidget_dateEditAcceptDelay'; +procedure QCalendarWidget_setDateEditAcceptDelay(handle: QCalendarWidgetH; delay: Integer); cdecl; external QtIntf name 'QCalendarWidget_setDateEditAcceptDelay'; procedure QCalendarWidget_setSelectedDate(handle: QCalendarWidgetH; date: QDateH); cdecl; external QtIntf name 'QCalendarWidget_setSelectedDate'; procedure QCalendarWidget_setDateRange(handle: QCalendarWidgetH; min: QDateH; max: QDateH); cdecl; external QtIntf name 'QCalendarWidget_setDateRange'; procedure QCalendarWidget_setCurrentPage(handle: QCalendarWidgetH; year: Integer; month: Integer); cdecl; external QtIntf name 'QCalendarWidget_setCurrentPage'; +procedure QCalendarWidget_setGridVisible(handle: QCalendarWidgetH; show: Boolean); cdecl; external QtIntf name 'QCalendarWidget_setGridVisible'; +procedure QCalendarWidget_setNavigationBarVisible(handle: QCalendarWidgetH; visible: Boolean); cdecl; external QtIntf name 'QCalendarWidget_setNavigationBarVisible'; procedure QCalendarWidget_showNextMonth(handle: QCalendarWidgetH); cdecl; external QtIntf name 'QCalendarWidget_showNextMonth'; procedure QCalendarWidget_showPreviousMonth(handle: QCalendarWidgetH); cdecl; external QtIntf name 'QCalendarWidget_showPreviousMonth'; procedure QCalendarWidget_showNextYear(handle: QCalendarWidgetH); cdecl; external QtIntf name 'QCalendarWidget_showNextYear'; @@ -6175,6 +6473,7 @@ procedure QAbstractItemView_clearSelection(handle: QAbstractItemViewH); cdecl; e procedure QAbstractItemView_setCurrentIndex(handle: QAbstractItemViewH; index: QModelIndexH); cdecl; external QtIntf name 'QAbstractItemView_setCurrentIndex'; procedure QAbstractItemView_scrollToTop(handle: QAbstractItemViewH); cdecl; external QtIntf name 'QAbstractItemView_scrollToTop'; procedure QAbstractItemView_scrollToBottom(handle: QAbstractItemViewH); cdecl; external QtIntf name 'QAbstractItemView_scrollToBottom'; +procedure QAbstractItemView_update(handle: QAbstractItemViewH; index: QModelIndexH); cdecl; external QtIntf name 'QAbstractItemView_update'; type @@ -6232,6 +6531,8 @@ procedure QListView_setUniformItemSizes(handle: QListViewH; enable: Boolean); cd function QListView_uniformItemSizes(handle: QListViewH): Boolean; cdecl; external QtIntf name 'QListView_uniformItemSizes'; procedure QListView_setWordWrap(handle: QListViewH; _on: Boolean); cdecl; external QtIntf name 'QListView_setWordWrap'; function QListView_wordWrap(handle: QListViewH): Boolean; cdecl; external QtIntf name 'QListView_wordWrap'; +procedure QListView_setSelectionRectVisible(handle: QListViewH; show: Boolean); cdecl; external QtIntf name 'QListView_setSelectionRectVisible'; +function QListView_isSelectionRectVisible(handle: QListViewH): Boolean; cdecl; external QtIntf name 'QListView_isSelectionRectVisible'; procedure QListView_visualRect(handle: QListViewH; retval: PRect; index: QModelIndexH); cdecl; external QtIntf name 'QListView_visualRect'; procedure QListView_scrollTo(handle: QListViewH; index: QModelIndexH; hint: QAbstractItemViewScrollHint); cdecl; external QtIntf name 'QListView_scrollTo'; procedure QListView_indexAt(handle: QListViewH; retval: QModelIndexH; p: PPoint); cdecl; external QtIntf name 'QListView_indexAt'; @@ -6317,6 +6618,7 @@ procedure QListWidget_openPersistentEditor(handle: QListWidgetH; item: QListWidg procedure QListWidget_closePersistentEditor(handle: QListWidgetH; item: QListWidgetItemH); cdecl; external QtIntf name 'QListWidget_closePersistentEditor'; function QListWidget_itemWidget(handle: QListWidgetH; item: QListWidgetItemH): QWidgetH; cdecl; external QtIntf name 'QListWidget_itemWidget'; procedure QListWidget_setItemWidget(handle: QListWidgetH; item: QListWidgetItemH; widget: QWidgetH); cdecl; external QtIntf name 'QListWidget_setItemWidget'; +procedure QListWidget_removeItemWidget(handle: QListWidgetH; item: QListWidgetItemH); cdecl; external QtIntf name 'QListWidget_removeItemWidget'; function QListWidget_isItemSelected(handle: QListWidgetH; item: QListWidgetItemH): Boolean; cdecl; external QtIntf name 'QListWidget_isItemSelected'; procedure QListWidget_setItemSelected(handle: QListWidgetH; item: QListWidgetItemH; select: Boolean); cdecl; external QtIntf name 'QListWidget_setItemSelected'; procedure QListWidget_selectedItems(handle: QListWidgetH; retval: PIntArray); cdecl; external QtIntf name 'QListWidget_selectedItems'; @@ -6348,6 +6650,8 @@ procedure QTreeView_setRootIndex(handle: QTreeViewH; index: QModelIndexH); cdecl procedure QTreeView_setSelectionModel(handle: QTreeViewH; selectionModel: QItemSelectionModelH); cdecl; external QtIntf name 'QTreeView_setSelectionModel'; function QTreeView_header(handle: QTreeViewH): QHeaderViewH; cdecl; external QtIntf name 'QTreeView_header'; procedure QTreeView_setHeader(handle: QTreeViewH; header: QHeaderViewH); cdecl; external QtIntf name 'QTreeView_setHeader'; +function QTreeView_autoExpandDelay(handle: QTreeViewH): Integer; cdecl; external QtIntf name 'QTreeView_autoExpandDelay'; +procedure QTreeView_setAutoExpandDelay(handle: QTreeViewH; delay: Integer); cdecl; external QtIntf name 'QTreeView_setAutoExpandDelay'; function QTreeView_indentation(handle: QTreeViewH): Integer; cdecl; external QtIntf name 'QTreeView_indentation'; procedure QTreeView_setIndentation(handle: QTreeViewH; i: Integer); cdecl; external QtIntf name 'QTreeView_setIndentation'; function QTreeView_rootIsDecorated(handle: QTreeViewH): Boolean; cdecl; external QtIntf name 'QTreeView_rootIsDecorated'; @@ -6364,6 +6668,8 @@ function QTreeView_isColumnHidden(handle: QTreeViewH; column: Integer): Boolean; procedure QTreeView_setColumnHidden(handle: QTreeViewH; column: Integer; hide: Boolean); cdecl; external QtIntf name 'QTreeView_setColumnHidden'; function QTreeView_isRowHidden(handle: QTreeViewH; row: Integer; parent: QModelIndexH): Boolean; cdecl; external QtIntf name 'QTreeView_isRowHidden'; procedure QTreeView_setRowHidden(handle: QTreeViewH; row: Integer; parent: QModelIndexH; hide: Boolean); cdecl; external QtIntf name 'QTreeView_setRowHidden'; +function QTreeView_isFirstColumnSpanned(handle: QTreeViewH; row: Integer; parent: QModelIndexH): Boolean; cdecl; external QtIntf name 'QTreeView_isFirstColumnSpanned'; +procedure QTreeView_setFirstColumnSpanned(handle: QTreeViewH; row: Integer; parent: QModelIndexH; span: Boolean); cdecl; external QtIntf name 'QTreeView_setFirstColumnSpanned'; function QTreeView_isExpanded(handle: QTreeViewH; index: QModelIndexH): Boolean; cdecl; external QtIntf name 'QTreeView_isExpanded'; procedure QTreeView_setExpanded(handle: QTreeViewH; index: QModelIndexH; expand: Boolean); cdecl; external QtIntf name 'QTreeView_setExpanded'; procedure QTreeView_setSortingEnabled(handle: QTreeViewH; enable: Boolean); cdecl; external QtIntf name 'QTreeView_setSortingEnabled'; @@ -6372,6 +6678,8 @@ procedure QTreeView_setAnimated(handle: QTreeViewH; enable: Boolean); cdecl; ext function QTreeView_isAnimated(handle: QTreeViewH): Boolean; cdecl; external QtIntf name 'QTreeView_isAnimated'; procedure QTreeView_setAllColumnsShowFocus(handle: QTreeViewH; enable: Boolean); cdecl; external QtIntf name 'QTreeView_setAllColumnsShowFocus'; function QTreeView_allColumnsShowFocus(handle: QTreeViewH): Boolean; cdecl; external QtIntf name 'QTreeView_allColumnsShowFocus'; +procedure QTreeView_setWordWrap(handle: QTreeViewH; _on: Boolean); cdecl; external QtIntf name 'QTreeView_setWordWrap'; +function QTreeView_wordWrap(handle: QTreeViewH): Boolean; cdecl; external QtIntf name 'QTreeView_wordWrap'; procedure QTreeView_keyboardSearch(handle: QTreeViewH; search: PWideString); cdecl; external QtIntf name 'QTreeView_keyboardSearch'; procedure QTreeView_visualRect(handle: QTreeViewH; retval: PRect; index: QModelIndexH); cdecl; external QtIntf name 'QTreeView_visualRect'; procedure QTreeView_scrollTo(handle: QTreeViewH; index: QModelIndexH; hint: QAbstractItemViewScrollHint); cdecl; external QtIntf name 'QTreeView_scrollTo'; @@ -6391,6 +6699,7 @@ procedure QTreeView_sortByColumn(handle: QTreeViewH; column: Integer); overload; procedure QTreeView_selectAll(handle: QTreeViewH); cdecl; external QtIntf name 'QTreeView_selectAll'; procedure QTreeView_expandAll(handle: QTreeViewH); cdecl; external QtIntf name 'QTreeView_expandAll'; procedure QTreeView_collapseAll(handle: QTreeViewH); cdecl; external QtIntf name 'QTreeView_collapseAll'; +procedure QTreeView_expandToDepth(handle: QTreeViewH; depth: Integer); cdecl; external QtIntf name 'QTreeView_expandToDepth'; type @@ -6400,6 +6709,9 @@ type type + QTreeWidgetItemChildIndicatorPolicy = ( // QTreeWidgetItem::ChildIndicatorPolicy (1) + QTreeWidgetItemShowIndicator, QTreeWidgetItemDontShowIndicator, QTreeWidgetItemDontShowIndicatorWhenChildless ); + QTreeWidgetItemItemType = ( //QTreeWidgetItem::ItemType (2s) QTreeWidgetItemType = 0, QTreeWidgetItemUserType = 1000 ); @@ -6422,6 +6734,12 @@ procedure QTreeWidgetItem_setHidden(handle: QTreeWidgetItemH; hide: Boolean); cd function QTreeWidgetItem_isHidden(handle: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidgetItem_isHidden'; procedure QTreeWidgetItem_setExpanded(handle: QTreeWidgetItemH; expand: Boolean); cdecl; external QtIntf name 'QTreeWidgetItem_setExpanded'; function QTreeWidgetItem_isExpanded(handle: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidgetItem_isExpanded'; +procedure QTreeWidgetItem_setFirstColumnSpanned(handle: QTreeWidgetItemH; span: Boolean); cdecl; external QtIntf name 'QTreeWidgetItem_setFirstColumnSpanned'; +function QTreeWidgetItem_isFirstColumnSpanned(handle: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidgetItem_isFirstColumnSpanned'; +procedure QTreeWidgetItem_setDisabled(handle: QTreeWidgetItemH; disabled: Boolean); cdecl; external QtIntf name 'QTreeWidgetItem_setDisabled'; +function QTreeWidgetItem_isDisabled(handle: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidgetItem_isDisabled'; +procedure QTreeWidgetItem_setChildIndicatorPolicy(handle: QTreeWidgetItemH; policy: QTreeWidgetItemChildIndicatorPolicy); cdecl; external QtIntf name 'QTreeWidgetItem_setChildIndicatorPolicy'; +function QTreeWidgetItem_childIndicatorPolicy(handle: QTreeWidgetItemH): QTreeWidgetItemChildIndicatorPolicy; cdecl; external QtIntf name 'QTreeWidgetItem_childIndicatorPolicy'; function QTreeWidgetItem_flags(handle: QTreeWidgetItemH): QtItemFlags; cdecl; external QtIntf name 'QTreeWidgetItem_flags'; procedure QTreeWidgetItem_setFlags(handle: QTreeWidgetItemH; flags: QtItemFlags); cdecl; external QtIntf name 'QTreeWidgetItem_setFlags'; procedure QTreeWidgetItem_text(handle: QTreeWidgetItemH; retval: PWideString; column: Integer); cdecl; external QtIntf name 'QTreeWidgetItem_text'; @@ -6461,6 +6779,7 @@ function QTreeWidgetItem_columnCount(handle: QTreeWidgetItemH): Integer; cdecl; function QTreeWidgetItem_indexOfChild(handle: QTreeWidgetItemH; child: QTreeWidgetItemH): Integer; cdecl; external QtIntf name 'QTreeWidgetItem_indexOfChild'; procedure QTreeWidgetItem_addChild(handle: QTreeWidgetItemH; child: QTreeWidgetItemH); cdecl; external QtIntf name 'QTreeWidgetItem_addChild'; procedure QTreeWidgetItem_insertChild(handle: QTreeWidgetItemH; index: Integer; child: QTreeWidgetItemH); cdecl; external QtIntf name 'QTreeWidgetItem_insertChild'; +procedure QTreeWidgetItem_removeChild(handle: QTreeWidgetItemH; child: QTreeWidgetItemH); cdecl; external QtIntf name 'QTreeWidgetItem_removeChild'; function QTreeWidgetItem_takeChild(handle: QTreeWidgetItemH; index: Integer): QTreeWidgetItemH; cdecl; external QtIntf name 'QTreeWidgetItem_takeChild'; procedure QTreeWidgetItem_addChildren(handle: QTreeWidgetItemH; children: PIntArray); cdecl; external QtIntf name 'QTreeWidgetItem_addChildren'; procedure QTreeWidgetItem_insertChildren(handle: QTreeWidgetItemH; index: Integer; children: PIntArray); cdecl; external QtIntf name 'QTreeWidgetItem_insertChildren'; @@ -6501,6 +6820,7 @@ procedure QTreeWidget_openPersistentEditor(handle: QTreeWidgetH; item: QTreeWidg procedure QTreeWidget_closePersistentEditor(handle: QTreeWidgetH; item: QTreeWidgetItemH; column: Integer = 0); cdecl; external QtIntf name 'QTreeWidget_closePersistentEditor'; function QTreeWidget_itemWidget(handle: QTreeWidgetH; item: QTreeWidgetItemH; column: Integer): QWidgetH; cdecl; external QtIntf name 'QTreeWidget_itemWidget'; procedure QTreeWidget_setItemWidget(handle: QTreeWidgetH; item: QTreeWidgetItemH; column: Integer; widget: QWidgetH); cdecl; external QtIntf name 'QTreeWidget_setItemWidget'; +procedure QTreeWidget_removeItemWidget(handle: QTreeWidgetH; item: QTreeWidgetItemH; column: Integer); cdecl; external QtIntf name 'QTreeWidget_removeItemWidget'; function QTreeWidget_isItemSelected(handle: QTreeWidgetH; item: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidget_isItemSelected'; procedure QTreeWidget_setItemSelected(handle: QTreeWidgetH; item: QTreeWidgetItemH; select: Boolean); cdecl; external QtIntf name 'QTreeWidget_setItemSelected'; procedure QTreeWidget_selectedItems(handle: QTreeWidgetH; retval: PIntArray); cdecl; external QtIntf name 'QTreeWidget_selectedItems'; @@ -6509,6 +6829,10 @@ function QTreeWidget_isItemHidden(handle: QTreeWidgetH; item: QTreeWidgetItemH): procedure QTreeWidget_setItemHidden(handle: QTreeWidgetH; item: QTreeWidgetItemH; hide: Boolean); cdecl; external QtIntf name 'QTreeWidget_setItemHidden'; function QTreeWidget_isItemExpanded(handle: QTreeWidgetH; item: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidget_isItemExpanded'; procedure QTreeWidget_setItemExpanded(handle: QTreeWidgetH; item: QTreeWidgetItemH; expand: Boolean); cdecl; external QtIntf name 'QTreeWidget_setItemExpanded'; +function QTreeWidget_isFirstItemColumnSpanned(handle: QTreeWidgetH; item: QTreeWidgetItemH): Boolean; cdecl; external QtIntf name 'QTreeWidget_isFirstItemColumnSpanned'; +procedure QTreeWidget_setFirstItemColumnSpanned(handle: QTreeWidgetH; item: QTreeWidgetItemH; span: Boolean); cdecl; external QtIntf name 'QTreeWidget_setFirstItemColumnSpanned'; +function QTreeWidget_itemAbove(handle: QTreeWidgetH; item: QTreeWidgetItemH): QTreeWidgetItemH; cdecl; external QtIntf name 'QTreeWidget_itemAbove'; +function QTreeWidget_itemBelow(handle: QTreeWidgetH; item: QTreeWidgetItemH): QTreeWidgetItemH; cdecl; external QtIntf name 'QTreeWidget_itemBelow'; procedure QTreeWidget_scrollToItem(handle: QTreeWidgetH; item: QTreeWidgetItemH; hint: QAbstractItemViewScrollHint); cdecl; external QtIntf name 'QTreeWidget_scrollToItem'; procedure QTreeWidget_expandItem(handle: QTreeWidgetH; item: QTreeWidgetItemH); cdecl; external QtIntf name 'QTreeWidget_expandItem'; procedure QTreeWidget_collapseItem(handle: QTreeWidgetH; item: QTreeWidgetItemH); cdecl; external QtIntf name 'QTreeWidget_collapseItem'; @@ -6594,8 +6918,12 @@ procedure QHeaderView_setDefaultAlignment(handle: QHeaderViewH; alignment: QtAli procedure QHeaderView_doItemsLayout(handle: QHeaderViewH); cdecl; external QtIntf name 'QHeaderView_doItemsLayout'; function QHeaderView_sectionsMoved(handle: QHeaderViewH): Boolean; cdecl; external QtIntf name 'QHeaderView_sectionsMoved'; function QHeaderView_sectionsHidden(handle: QHeaderViewH): Boolean; cdecl; external QtIntf name 'QHeaderView_sectionsHidden'; +procedure QHeaderView_saveState(handle: QHeaderViewH; retval: QByteArrayH); cdecl; external QtIntf name 'QHeaderView_saveState'; +function QHeaderView_restoreState(handle: QHeaderViewH; state: QByteArrayH): Boolean; cdecl; external QtIntf name 'QHeaderView_restoreState'; +procedure QHeaderView_reset(handle: QHeaderViewH); cdecl; external QtIntf name 'QHeaderView_reset'; procedure QHeaderView_setOffset(handle: QHeaderViewH; offset: Integer); cdecl; external QtIntf name 'QHeaderView_setOffset'; procedure QHeaderView_setOffsetToSectionPosition(handle: QHeaderViewH; visualIndex: Integer); cdecl; external QtIntf name 'QHeaderView_setOffsetToSectionPosition'; +procedure QHeaderView_setOffsetToLastSection(handle: QHeaderViewH); cdecl; external QtIntf name 'QHeaderView_setOffsetToLastSection'; procedure QHeaderView_headerDataChanged(handle: QHeaderViewH; orientation: QtOrientation; logicalFirst: Integer; logicalLast: Integer); cdecl; external QtIntf name 'QHeaderView_headerDataChanged'; @@ -6604,11 +6932,13 @@ type QHeaderView_sectionResized_Event = procedure (logicalIndex: Integer; oldSize: Integer; newSize: Integer) of object cdecl; QHeaderView_sectionPressed_Event = procedure (logicalIndex: Integer) of object cdecl; QHeaderView_sectionClicked_Event = procedure (logicalIndex: Integer) of object cdecl; + QHeaderView_sectionEntered_Event = procedure (logicalIndex: Integer) of object cdecl; QHeaderView_sectionDoubleClicked_Event = procedure (logicalIndex: Integer) of object cdecl; QHeaderView_sectionCountChanged_Event = procedure (oldCount: Integer; newCount: Integer) of object cdecl; QHeaderView_sectionHandleDoubleClicked_Event = procedure (logicalIndex: Integer) of object cdecl; QHeaderView_sectionAutoResize_Event = procedure (logicalIndex: Integer; mode: QHeaderViewResizeMode) of object cdecl; QHeaderView_geometriesChanged_Event = procedure () of object cdecl; + QHeaderView_sortIndicatorChanged_Event = procedure (logicalIndex: Integer; order: QtSortOrder) of object cdecl; @@ -6681,13 +7011,15 @@ procedure QStandardItem_setChild(handle: QStandardItemH; row: Integer; column: I procedure QStandardItem_setChild(handle: QStandardItemH; row: Integer; item: QStandardItemH); overload; cdecl; external QtIntf name 'QStandardItem_setChild2'; procedure QStandardItem_insertRow(handle: QStandardItemH; row: Integer; items: PIntArray); overload; cdecl; external QtIntf name 'QStandardItem_insertRow'; procedure QStandardItem_insertColumn(handle: QStandardItemH; column: Integer; items: PIntArray); cdecl; external QtIntf name 'QStandardItem_insertColumn'; -procedure QStandardItem_insertRows(handle: QStandardItemH; row: Integer; count: Integer); cdecl; external QtIntf name 'QStandardItem_insertRows'; +procedure QStandardItem_insertRows(handle: QStandardItemH; row: Integer; items: PIntArray); overload; cdecl; external QtIntf name 'QStandardItem_insertRows'; +procedure QStandardItem_insertRows(handle: QStandardItemH; row: Integer; count: Integer); overload; cdecl; external QtIntf name 'QStandardItem_insertRows2'; procedure QStandardItem_insertColumns(handle: QStandardItemH; column: Integer; count: Integer); cdecl; external QtIntf name 'QStandardItem_insertColumns'; procedure QStandardItem_removeRow(handle: QStandardItemH; row: Integer); cdecl; external QtIntf name 'QStandardItem_removeRow'; procedure QStandardItem_removeColumn(handle: QStandardItemH; column: Integer); cdecl; external QtIntf name 'QStandardItem_removeColumn'; procedure QStandardItem_removeRows(handle: QStandardItemH; row: Integer; count: Integer); cdecl; external QtIntf name 'QStandardItem_removeRows'; procedure QStandardItem_removeColumns(handle: QStandardItemH; column: Integer; count: Integer); cdecl; external QtIntf name 'QStandardItem_removeColumns'; procedure QStandardItem_appendRow(handle: QStandardItemH; items: PIntArray); overload; cdecl; external QtIntf name 'QStandardItem_appendRow'; +procedure QStandardItem_appendRows(handle: QStandardItemH; items: PIntArray); cdecl; external QtIntf name 'QStandardItem_appendRows'; procedure QStandardItem_appendColumn(handle: QStandardItemH; items: PIntArray); cdecl; external QtIntf name 'QStandardItem_appendColumn'; procedure QStandardItem_insertRow(handle: QStandardItemH; row: Integer; item: QStandardItemH); overload; cdecl; external QtIntf name 'QStandardItem_insertRow2'; procedure QStandardItem_appendRow(handle: QStandardItemH; item: QStandardItemH); overload; cdecl; external QtIntf name 'QStandardItem_appendRow2'; @@ -6865,9 +7197,11 @@ function QMessageBox_standardButtons(handle: QMessageBoxH): QMessageBoxStandardB function QMessageBox_standardButton(handle: QMessageBoxH; button: QAbstractButtonH): QMessageBoxStandardButton; cdecl; external QtIntf name 'QMessageBox_standardButton'; function QMessageBox_button(handle: QMessageBoxH; which: QMessageBoxStandardButton): QAbstractButtonH; cdecl; external QtIntf name 'QMessageBox_button'; function QMessageBox_defaultButton(handle: QMessageBoxH): QPushButtonH; cdecl; external QtIntf name 'QMessageBox_defaultButton'; -procedure QMessageBox_setDefaultButton(handle: QMessageBoxH; button: QPushButtonH); cdecl; external QtIntf name 'QMessageBox_setDefaultButton'; +procedure QMessageBox_setDefaultButton(handle: QMessageBoxH; button: QPushButtonH); overload; cdecl; external QtIntf name 'QMessageBox_setDefaultButton'; +procedure QMessageBox_setDefaultButton(handle: QMessageBoxH; button: QMessageBoxStandardButton); overload; cdecl; external QtIntf name 'QMessageBox_setDefaultButton2'; function QMessageBox_escapeButton(handle: QMessageBoxH): QAbstractButtonH; cdecl; external QtIntf name 'QMessageBox_escapeButton'; -procedure QMessageBox_setEscapeButton(handle: QMessageBoxH; button: QAbstractButtonH); cdecl; external QtIntf name 'QMessageBox_setEscapeButton'; +procedure QMessageBox_setEscapeButton(handle: QMessageBoxH; button: QAbstractButtonH); overload; cdecl; external QtIntf name 'QMessageBox_setEscapeButton'; +procedure QMessageBox_setEscapeButton(handle: QMessageBoxH; button: QMessageBoxStandardButton); overload; cdecl; external QtIntf name 'QMessageBox_setEscapeButton2'; function QMessageBox_clickedButton(handle: QMessageBoxH): QAbstractButtonH; cdecl; external QtIntf name 'QMessageBox_clickedButton'; procedure QMessageBox_text(handle: QMessageBoxH; retval: PWideString); cdecl; external QtIntf name 'QMessageBox_text'; procedure QMessageBox_setText(handle: QMessageBoxH; text: PWideString); cdecl; external QtIntf name 'QMessageBox_setText'; @@ -6905,7 +7239,7 @@ function QInputDialog_getDouble(parent: QWidgetH; title: PWideString; _label: PW procedure QInputDialog_getItem(retval: PWideString; parent: QWidgetH; title: PWideString; _label: PWideString; list: QStringListH; current: Integer = 0; editable: Boolean = True; ok: PBoolean = nil; f: QtWindowFlags = 0); cdecl; external QtIntf name 'QInputDialog_getItem'; procedure QColorDialog_getColor(retval: PQColor; init: PQColor; parent: QWidgetH = nil); cdecl; external QtIntf name 'QColorDialog_getColor'; -function QColorDialog_getRgba(p1: QRgb; ok: PBoolean = nil; parent: QWidgetH = nil): QRgb; cdecl; external QtIntf name 'QColorDialog_getRgba'; +function QColorDialog_getRgba(p1: QRgb = 4294967295; ok: PBoolean = nil; parent: QWidgetH = nil): QRgb; cdecl; external QtIntf name 'QColorDialog_getRgba'; function QColorDialog_customCount(): Integer; cdecl; external QtIntf name 'QColorDialog_customCount'; function QColorDialog_customColor(p1: Integer): QRgb; cdecl; external QtIntf name 'QColorDialog_customColor'; procedure QColorDialog_setCustomColor(p1: Integer; p2: QRgb); cdecl; external QtIntf name 'QColorDialog_setCustomColor'; @@ -6958,6 +7292,8 @@ procedure QFileDialog_setReadOnly(handle: QFileDialogH; enabled: Boolean); cdecl function QFileDialog_isReadOnly(handle: QFileDialogH): Boolean; cdecl; external QtIntf name 'QFileDialog_isReadOnly'; procedure QFileDialog_setResolveSymlinks(handle: QFileDialogH; enabled: Boolean); cdecl; external QtIntf name 'QFileDialog_setResolveSymlinks'; function QFileDialog_resolveSymlinks(handle: QFileDialogH): Boolean; cdecl; external QtIntf name 'QFileDialog_resolveSymlinks'; +procedure QFileDialog_saveState(handle: QFileDialogH; retval: QByteArrayH); cdecl; external QtIntf name 'QFileDialog_saveState'; +function QFileDialog_restoreState(handle: QFileDialogH; state: QByteArrayH): Boolean; cdecl; external QtIntf name 'QFileDialog_restoreState'; procedure QFileDialog_setConfirmOverwrite(handle: QFileDialogH; enabled: Boolean); cdecl; external QtIntf name 'QFileDialog_setConfirmOverwrite'; function QFileDialog_confirmOverwrite(handle: QFileDialogH): Boolean; cdecl; external QtIntf name 'QFileDialog_confirmOverwrite'; procedure QFileDialog_setDefaultSuffix(handle: QFileDialogH; suffix: PWideString); cdecl; external QtIntf name 'QFileDialog_setDefaultSuffix'; @@ -6970,6 +7306,8 @@ procedure QFileDialog_setIconProvider(handle: QFileDialogH; provider: QFileIconP function QFileDialog_iconProvider(handle: QFileDialogH): QFileIconProviderH; cdecl; external QtIntf name 'QFileDialog_iconProvider'; procedure QFileDialog_setLabelText(handle: QFileDialogH; _label: QFileDialogDialogLabel; text: PWideString); cdecl; external QtIntf name 'QFileDialog_setLabelText'; procedure QFileDialog_labelText(handle: QFileDialogH; retval: PWideString; _label: QFileDialogDialogLabel); cdecl; external QtIntf name 'QFileDialog_labelText'; +procedure QFileDialog_setProxyModel(handle: QFileDialogH; model: QAbstractProxyModelH); cdecl; external QtIntf name 'QFileDialog_setProxyModel'; +function QFileDialog_proxyModel(handle: QFileDialogH): QAbstractProxyModelH; cdecl; external QtIntf name 'QFileDialog_proxyModel'; procedure QFileDialog_getOpenFileName(retval: PWideString; parent: QWidgetH = nil; caption: PWideString = nil; dir: PWideString = nil; filter: PWideString = nil; selectedFilter: PWideString = nil; options: QFileDialogOptions = 0); cdecl; external QtIntf name 'QFileDialog_getOpenFileName'; procedure QFileDialog_getSaveFileName(retval: PWideString; parent: QWidgetH = nil; caption: PWideString = nil; dir: PWideString = nil; filter: PWideString = nil; selectedFilter: PWideString = nil; options: QFileDialogOptions = 0); cdecl; external QtIntf name 'QFileDialog_getSaveFileName'; procedure QFileDialog_getExistingDirectory(retval: PWideString; parent: QWidgetH = nil; caption: PWideString = nil; dir: PWideString = nil; options: QFileDialogOptions = QFileDialogShowDirsOnly); cdecl; external QtIntf name 'QFileDialog_getExistingDirectory'; @@ -6984,7 +7322,6 @@ procedure QProgressDialog_setBar(handle: QProgressDialogH; bar: QProgressBarH); function QProgressDialog_wasCanceled(handle: QProgressDialogH): Boolean; cdecl; external QtIntf name 'QProgressDialog_wasCanceled'; function QProgressDialog_minimum(handle: QProgressDialogH): Integer; cdecl; external QtIntf name 'QProgressDialog_minimum'; function QProgressDialog_maximum(handle: QProgressDialogH): Integer; cdecl; external QtIntf name 'QProgressDialog_maximum'; -procedure QProgressDialog_setRange(handle: QProgressDialogH; minimum: Integer; maximum: Integer); cdecl; external QtIntf name 'QProgressDialog_setRange'; function QProgressDialog_value(handle: QProgressDialogH): Integer; cdecl; external QtIntf name 'QProgressDialog_value'; procedure QProgressDialog_sizeHint(handle: QProgressDialogH; retval: PSize); cdecl; external QtIntf name 'QProgressDialog_sizeHint'; procedure QProgressDialog_labelText(handle: QProgressDialogH; retval: PWideString); cdecl; external QtIntf name 'QProgressDialog_labelText'; @@ -6997,6 +7334,7 @@ procedure QProgressDialog_cancel(handle: QProgressDialogH); cdecl; external QtIn procedure QProgressDialog_reset(handle: QProgressDialogH); cdecl; external QtIntf name 'QProgressDialog_reset'; procedure QProgressDialog_setMaximum(handle: QProgressDialogH; maximum: Integer); cdecl; external QtIntf name 'QProgressDialog_setMaximum'; procedure QProgressDialog_setMinimum(handle: QProgressDialogH; minimum: Integer); cdecl; external QtIntf name 'QProgressDialog_setMinimum'; +procedure QProgressDialog_setRange(handle: QProgressDialogH; minimum: Integer; maximum: Integer); cdecl; external QtIntf name 'QProgressDialog_setRange'; procedure QProgressDialog_setValue(handle: QProgressDialogH; progress: Integer); cdecl; external QtIntf name 'QProgressDialog_setValue'; procedure QProgressDialog_setLabelText(handle: QProgressDialogH; p1: PWideString); cdecl; external QtIntf name 'QProgressDialog_setLabelText'; procedure QProgressDialog_setCancelButtonText(handle: QProgressDialogH; p1: PWideString); cdecl; external QtIntf name 'QProgressDialog_setCancelButtonText'; @@ -7061,6 +7399,7 @@ procedure QSystemTrayIcon_setToolTip(handle: QSystemTrayIconH; tip: PWideString) function QSystemTrayIcon_isSystemTrayAvailable(): Boolean; cdecl; external QtIntf name 'QSystemTrayIcon_isSystemTrayAvailable'; function QSystemTrayIcon_supportsMessages(): Boolean; cdecl; external QtIntf name 'QSystemTrayIcon_supportsMessages'; procedure QSystemTrayIcon_showMessage(handle: QSystemTrayIconH; title: PWideString; msg: PWideString; icon: QSystemTrayIconMessageIcon = QSystemTrayIconInformation; msecs: Integer = 10000); cdecl; external QtIntf name 'QSystemTrayIcon_showMessage'; +procedure QSystemTrayIcon_geometry(handle: QSystemTrayIconH; retval: PRect); cdecl; external QtIntf name 'QSystemTrayIcon_geometry'; function QSystemTrayIcon_isVisible(handle: QSystemTrayIconH): Boolean; cdecl; external QtIntf name 'QSystemTrayIcon_isVisible'; procedure QSystemTrayIcon_setVisible(handle: QSystemTrayIconH; visible: Boolean); cdecl; external QtIntf name 'QSystemTrayIcon_setVisible'; procedure QSystemTrayIcon_show(handle: QSystemTrayIconH); cdecl; external QtIntf name 'QSystemTrayIcon_show'; @@ -7094,6 +7433,7 @@ const QStyleState_UpArrow = $00004000; QStyleState_Selected = $00008000; QStyleState_Active = $00010000; + QStyleState_Window = $00020000; QStyleState_Open = $00040000; QStyleState_Children = $00080000; QStyleState_Item = $00100000; @@ -7101,6 +7441,8 @@ const QStyleState_Editing = $00400000; QStyleState_KeyboardFocusChange = $00800000; QStyleState_ReadOnly = $02000000; + QStyleState_Small = $04000000; + QStyleState_Mini = $08000000; type @@ -7152,6 +7494,7 @@ type QStylePE_IndicatorTabTear, QStylePE_PanelScrollAreaCorner, QStylePE_Widget, + QStylePE_IndicatorColumnViewArrow, QStylePE_CustomBase = $f000000 ); QStyleControlElement = ( //QStyle::ControlElement (2) @@ -7197,6 +7540,10 @@ type QStyleCE_FocusFrame, QStyleCE_ComboBoxLabel, QStyleCE_ToolBar, + QStyleCE_ToolBoxTabShape, + QStyleCE_ToolBoxTabLabel, + QStyleCE_HeaderEmptyArea, + QStyleCE_ColumnViewGrip, QStyleCE_CustomBase = $f0000000 ); QStyleSubElement = ( //QStyle::SubElement (2) @@ -7238,6 +7585,24 @@ type QStyleSE_TreeViewDisclosureItem, QStyleSE_LineEditContents, QStyleSE_FrameContents, + QStyleSE_DockWidgetCloseButton, + QStyleSE_DockWidgetFloatButton, + QStyleSE_DockWidgetTitleBarText, + QStyleSE_DockWidgetIcon, + QStyleSE_CheckBoxLayoutItem, + QStyleSE_ComboBoxLayoutItem, + QStyleSE_DateTimeEditLayoutItem, + QStyleSE_DialogButtonBoxLayoutItem, + QStyleSE_LabelLayoutItem, + QStyleSE_ProgressBarLayoutItem, + QStyleSE_PushButtonLayoutItem, + QStyleSE_RadioButtonLayoutItem, + QStyleSE_SliderLayoutItem, + QStyleSE_SpinBoxLayoutItem, + QStyleSE_ToolButtonLayoutItem, + QStyleSE_FrameLayoutItem, + QStyleSE_GroupBoxLayoutItem, + QStyleSE_TabWidgetLayoutItem, QStyleSE_CustomBase = $f0000000 ); QStyleComplexControl = ( //QStyle::ComplexControl (2) @@ -7250,6 +7615,7 @@ type QStyleCC_Q3ListView, QStyleCC_Dial, QStyleCC_GroupBox, + QStyleCC_MdiControls, QStyleCC_CustomBase = $f0000000 ); type @@ -7297,91 +7663,13 @@ const QStyleSC_GroupBoxLabel = $00000002; QStyleSC_GroupBoxContents = $00000004; QStyleSC_GroupBoxFrame = $00000008; + QStyleSC_MdiMinButton = $00000001; + QStyleSC_MdiNormalButton = $00000002; + QStyleSC_MdiCloseButton = $00000004; QStyleSC_All = $ffffffff; type - QStylePixelMetric = ( //QStyle::PixelMetric (2) - QStylePM_ButtonMargin, - QStylePM_ButtonDefaultIndicator, - QStylePM_MenuButtonIndicator, - QStylePM_ButtonShiftHorizontal, - QStylePM_ButtonShiftVertical, - QStylePM_DefaultFrameWidth, - QStylePM_SpinBoxFrameWidth, - QStylePM_ComboBoxFrameWidth, - QStylePM_MaximumDragDistance, - QStylePM_ScrollBarExtent, - QStylePM_ScrollBarSliderMin, - QStylePM_SliderThickness, - QStylePM_SliderControlThickness, - QStylePM_SliderLength, - QStylePM_SliderTickmarkOffset, - QStylePM_SliderSpaceAvailable, - QStylePM_DockWidgetSeparatorExtent, - QStylePM_DockWidgetHandleExtent, - QStylePM_DockWidgetFrameWidth, - QStylePM_TabBarTabOverlap, - QStylePM_TabBarTabHSpace, - QStylePM_TabBarTabVSpace, - QStylePM_TabBarBaseHeight, - QStylePM_TabBarBaseOverlap, - QStylePM_ProgressBarChunkWidth, - QStylePM_SplitterWidth, - QStylePM_TitleBarHeight, - QStylePM_MenuScrollerHeight, - QStylePM_MenuHMargin, - QStylePM_MenuVMargin, - QStylePM_MenuPanelWidth, - QStylePM_MenuTearoffHeight, - QStylePM_MenuDesktopFrameWidth, - QStylePM_MenuBarPanelWidth, - QStylePM_MenuBarItemSpacing, - QStylePM_MenuBarVMargin, - QStylePM_MenuBarHMargin, - QStylePM_IndicatorWidth, - QStylePM_IndicatorHeight, - QStylePM_ExclusiveIndicatorWidth, - QStylePM_ExclusiveIndicatorHeight, - QStylePM_CheckListButtonSize, - QStylePM_CheckListControllerSize, - QStylePM_DialogButtonsSeparator, - QStylePM_DialogButtonsButtonWidth, - QStylePM_DialogButtonsButtonHeight, - QStylePM_MDIFrameWidth, - QStylePM_MDIMinimizedWidth, - QStylePM_HeaderMargin, - QStylePM_HeaderMarkSize, - QStylePM_HeaderGripMargin, - QStylePM_TabBarTabShiftHorizontal, - QStylePM_TabBarTabShiftVertical, - QStylePM_TabBarScrollButtonWidth, - QStylePM_ToolBarFrameWidth, - QStylePM_ToolBarHandleExtent, - QStylePM_ToolBarItemSpacing, - QStylePM_ToolBarItemMargin, - QStylePM_ToolBarSeparatorExtent, - QStylePM_ToolBarExtensionExtent, - QStylePM_SpinBoxSliderHeight, - QStylePM_DefaultTopLevelMargin, - QStylePM_DefaultChildMargin, - QStylePM_DefaultLayoutSpacing, - QStylePM_ToolBarIconSize, - QStylePM_ListViewIconSize, - QStylePM_IconViewIconSize, - QStylePM_SmallIconSize, - QStylePM_LargeIconSize, - QStylePM_FocusFrameVMargin, - QStylePM_FocusFrameHMargin, - QStylePM_ToolTipLabelFrameWidth, - QStylePM_CheckBoxLabelSpacing, - QStylePM_TabBarIconSize, - QStylePM_SizeGripSize, - QStylePM_DockWidgetTitleMargin, - QStylePM_MessageBoxIconSize, - QStylePM_ButtonIconSize, - QStylePM_CustomBase = $f0000000 ); - QStyleContentsType = ( //QStyle::ContentsType (2) QStyleCT_PushButton, QStyleCT_CheckBox, @@ -7406,6 +7694,7 @@ type QStyleCT_DialogButtons, QStyleCT_HeaderSection, QStyleCT_GroupBox, + QStyleCT_MdiControls, QStyleCT_CustomBase = $f0000000 ); QStyleStandardPixmap = ( //QStyle::StandardPixmap (2) @@ -7464,8 +7753,105 @@ type QStyleSP_ArrowRight, QStyleSP_ArrowBack, QStyleSP_ArrowForward, + QStyleSP_DirHomeIcon, + QStyleSP_CommandLink, + QStyleSP_VistaShield, QStyleSP_CustomBase = $f0000000 ); +type + QStylePixelMetric = cardinal; // QStyle::PixelMetric (4) + +const + QStylePM_ButtonMargin = 0 { $0 }; + QStylePM_ButtonDefaultIndicator = 1 { $1 }; + QStylePM_MenuButtonIndicator = 2 { $2 }; + QStylePM_ButtonShiftHorizontal = 3 { $3 }; + QStylePM_ButtonShiftVertical = 4 { $4 }; + QStylePM_DefaultFrameWidth = 5 { $5 }; + QStylePM_SpinBoxFrameWidth = 6 { $6 }; + QStylePM_ComboBoxFrameWidth = 7 { $7 }; + QStylePM_MaximumDragDistance = 8 { $8 }; + QStylePM_ScrollBarExtent = 9 { $9 }; + QStylePM_ScrollBarSliderMin = 10 { $a }; + QStylePM_SliderThickness = 11 { $b }; + QStylePM_SliderControlThickness = 12 { $c }; + QStylePM_SliderLength = 13 { $d }; + QStylePM_SliderTickmarkOffset = 14 { $e }; + QStylePM_SliderSpaceAvailable = 15 { $f }; + QStylePM_DockWidgetSeparatorExtent = 16 { $10 }; + QStylePM_DockWidgetHandleExtent = 17 { $11 }; + QStylePM_DockWidgetFrameWidth = 18 { $12 }; + QStylePM_TabBarTabOverlap = 19 { $13 }; + QStylePM_TabBarTabHSpace = 20 { $14 }; + QStylePM_TabBarTabVSpace = 21 { $15 }; + QStylePM_TabBarBaseHeight = 22 { $16 }; + QStylePM_TabBarBaseOverlap = 23 { $17 }; + QStylePM_ProgressBarChunkWidth = 24 { $18 }; + QStylePM_SplitterWidth = 25 { $19 }; + QStylePM_TitleBarHeight = 26 { $1a }; + QStylePM_MenuScrollerHeight = 27 { $1b }; + QStylePM_MenuHMargin = 28 { $1c }; + QStylePM_MenuVMargin = 29 { $1d }; + QStylePM_MenuPanelWidth = 30 { $1e }; + QStylePM_MenuTearoffHeight = 31 { $1f }; + QStylePM_MenuDesktopFrameWidth = 32 { $20 }; + QStylePM_MenuBarPanelWidth = 33 { $21 }; + QStylePM_MenuBarItemSpacing = 34 { $22 }; + QStylePM_MenuBarVMargin = 35 { $23 }; + QStylePM_MenuBarHMargin = 36 { $24 }; + QStylePM_IndicatorWidth = 37 { $25 }; + QStylePM_IndicatorHeight = 38 { $26 }; + QStylePM_ExclusiveIndicatorWidth = 39 { $27 }; + QStylePM_ExclusiveIndicatorHeight = 40 { $28 }; + QStylePM_CheckListButtonSize = 41 { $29 }; + QStylePM_CheckListControllerSize = 42 { $2a }; + QStylePM_DialogButtonsSeparator = 43 { $2b }; + QStylePM_DialogButtonsButtonWidth = 44 { $2c }; + QStylePM_DialogButtonsButtonHeight = 45 { $2d }; + QStylePM_MdiSubWindowFrameWidth = 46 { $2e }; + QStylePM_MDIFrameWidth = 46 { $2e }; + QStylePM_MdiSubWindowMinimizedWidth = 47 { $2f }; + QStylePM_MDIMinimizedWidth = 47 { $2f }; + QStylePM_HeaderMargin = 48 { $30 }; + QStylePM_HeaderMarkSize = 49 { $31 }; + QStylePM_HeaderGripMargin = 50 { $32 }; + QStylePM_TabBarTabShiftHorizontal = 51 { $33 }; + QStylePM_TabBarTabShiftVertical = 52 { $34 }; + QStylePM_TabBarScrollButtonWidth = 53 { $35 }; + QStylePM_ToolBarFrameWidth = 54 { $36 }; + QStylePM_ToolBarHandleExtent = 55 { $37 }; + QStylePM_ToolBarItemSpacing = 56 { $38 }; + QStylePM_ToolBarItemMargin = 57 { $39 }; + QStylePM_ToolBarSeparatorExtent = 58 { $3a }; + QStylePM_ToolBarExtensionExtent = 59 { $3b }; + QStylePM_SpinBoxSliderHeight = 60 { $3c }; + QStylePM_DefaultTopLevelMargin = 61 { $3d }; + QStylePM_DefaultChildMargin = 62 { $3e }; + QStylePM_DefaultLayoutSpacing = 63 { $3f }; + QStylePM_ToolBarIconSize = 64 { $40 }; + QStylePM_ListViewIconSize = 65 { $41 }; + QStylePM_IconViewIconSize = 66 { $42 }; + QStylePM_SmallIconSize = 67 { $43 }; + QStylePM_LargeIconSize = 68 { $44 }; + QStylePM_FocusFrameVMargin = 69 { $45 }; + QStylePM_FocusFrameHMargin = 70 { $46 }; + QStylePM_ToolTipLabelFrameWidth = 71 { $47 }; + QStylePM_CheckBoxLabelSpacing = 72 { $48 }; + QStylePM_TabBarIconSize = 73 { $49 }; + QStylePM_SizeGripSize = 74 { $4a }; + QStylePM_DockWidgetTitleMargin = 75 { $4b }; + QStylePM_MessageBoxIconSize = 76 { $4c }; + QStylePM_ButtonIconSize = 77 { $4d }; + QStylePM_DockWidgetTitleBarButtonMargin = 78 { $4e }; + QStylePM_RadioButtonLabelSpacing = 79 { $4f }; + QStylePM_LayoutLeftMargin = 80 { $50 }; + QStylePM_LayoutTopMargin = 81 { $51 }; + QStylePM_LayoutRightMargin = 82 { $52 }; + QStylePM_LayoutBottomMargin = 83 { $53 }; + QStylePM_LayoutHorizontalSpacing = 84 { $54 }; + QStylePM_LayoutVerticalSpacing = 85 { $55 }; + QStylePM_CustomBase = 4026531840 { $f0000000 }; + type QStyleStyleHint = cardinal; // QStyle::StyleHint (4) @@ -7548,6 +7934,11 @@ const QStyleSH_MessageBox_CenterButtons = 74 { $4a }; QStyleSH_Menu_SelectionWrap = 75 { $4b }; QStyleSH_ItemView_MovementWithoutUpdatingSelection = 76 { $4c }; + QStyleSH_ToolTip_Mask = 77 { $4d }; + QStyleSH_FocusFrame_AboveWidget = 78 { $4e }; + QStyleSH_TextControl_FocusIndicatorTextCharFormat = 79 { $4f }; + QStyleSH_WizardStyle = 80 { $50 }; + QStyleSH_ItemView_ArrowKeysNavigateIntoChildren = 81 { $51 }; QStyleSH_CustomBase = 4026531840 { $f0000000 }; @@ -7579,6 +7970,8 @@ function QStyle_sliderPositionFromValue(min: Integer; max: Integer; val: Integer function QStyle_sliderValueFromPosition(min: Integer; max: Integer; pos: Integer; space: Integer; upsideDown: Boolean = False): Integer; cdecl; external QtIntf name 'QStyle_sliderValueFromPosition'; function QStyle_visualAlignment(direction: QtLayoutDirection; alignment: QtAlignment): QtAlignment; cdecl; external QtIntf name 'QStyle_visualAlignment'; procedure QStyle_alignedRect(retval: PRect; direction: QtLayoutDirection; alignment: QtAlignment; size: PSize; rectangle: PRect); cdecl; external QtIntf name 'QStyle_alignedRect'; +function QStyle_layoutSpacing(handle: QStyleH; control1: QSizePolicyControlType; control2: QSizePolicyControlType; orientation: QtOrientation; option: QStyleOptionH = nil; widget: QWidgetH = nil): Integer; cdecl; external QtIntf name 'QStyle_layoutSpacing'; +function QStyle_combinedLayoutSpacing(handle: QStyleH; controls1: QSizePolicyControlTypes; controls2: QSizePolicyControlTypes; orientation: QtOrientation; option: QStyleOptionH = nil; widget: QWidgetH = nil): Integer; cdecl; external QtIntf name 'QStyle_combinedLayoutSpacing'; type @@ -7676,6 +8069,7 @@ const QStyleOptionButtonHasMenu = $02; QStyleOptionButtonDefaultButton = $04; QStyleOptionButtonAutoDefaultButton = $08; + QStyleOptionButtonCommandLinkButton = $10; type @@ -7764,6 +8158,11 @@ type QStyleOptionDockWidgetVersion = 1 ); +type + QStyleOptionDockWidgetV2StyleOptionVersion = ( //QStyleOptionDockWidgetV2::StyleOptionVersion (2s) + QStyleOptionDockWidgetV2Version = 2 ); + + type QStyleOptionViewItemPosition = ( // QStyleOptionViewItem::Position (1) QStyleOptionViewItemLeft, QStyleOptionViewItemRight, QStyleOptionViewItemTop, QStyleOptionViewItemBottom ); @@ -7785,11 +8184,27 @@ const QStyleOptionViewItemV2Alternate = $02; +type + QStyleOptionViewItemV3StyleOptionVersion = ( //QStyleOptionViewItemV3::StyleOptionVersion (2s) + QStyleOptionViewItemV3Version = 3 ); + + type QStyleOptionToolBoxStyleOptionVersion = ( //QStyleOptionToolBox::StyleOptionVersion (2s) QStyleOptionToolBoxVersion = 1 ); +type + QStyleOptionToolBoxV2TabPosition = ( // QStyleOptionToolBoxV2::TabPosition (1) + QStyleOptionToolBoxV2Beginning, QStyleOptionToolBoxV2Middle, QStyleOptionToolBoxV2End, QStyleOptionToolBoxV2OnlyOneTab ); + + QStyleOptionToolBoxV2SelectedPosition = ( // QStyleOptionToolBoxV2::SelectedPosition (1) + QStyleOptionToolBoxV2NotAdjacent, QStyleOptionToolBoxV2NextIsSelected, QStyleOptionToolBoxV2PreviousIsSelected ); + + QStyleOptionToolBoxV2StyleOptionVersion = ( //QStyleOptionToolBoxV2::StyleOptionVersion (2s) + QStyleOptionToolBoxV2Version = 2 ); + + type QStyleOptionRubberBandStyleOptionVersion = ( //QStyleOptionRubberBand::StyleOptionVersion (2s) QStyleOptionRubberBandVersion = 1 ); @@ -7819,15 +8234,6 @@ type QStyleOptionToolButtonStyleOptionVersion = ( //QStyleOptionToolButton::StyleOptionVersion (2s) QStyleOptionToolButtonVersion = 1 ); -type - QStyleOptionToolButtonToolButtonFeature = cardinal; // QStyleOptionToolButton::ToolButtonFeature - QStyleOptionToolButtonToolButtonFeatures = QStyleOptionToolButtonToolButtonFeature; //QFlags<> (3) -const - QStyleOptionToolButtonNone = $00; - QStyleOptionToolButtonArrow = $01; - QStyleOptionToolButtonMenu = $04; - QStyleOptionToolButtonPopupDelay = $08; - type QStyleOptionComboBoxStyleOptionVersion = ( //QStyleOptionComboBox::StyleOptionVersion (2s) @@ -7857,7 +8263,8 @@ type type QStyleHintReturnHintReturnType = ( //QStyleHintReturn::HintReturnType (2) QStyleHintReturnSH_Default = $f000, - QStyleHintReturnSH_Mask ); + QStyleHintReturnSH_Mask, + QStyleHintReturnSH_Variant ); QStyleHintReturnStyleOptionVersion = ( //QStyleHintReturn::StyleOptionVersion (2s) QStyleHintReturnVersion = 1 ); @@ -7867,6 +8274,11 @@ type QStyleHintReturnMaskStyleOptionVersion = ( //QStyleHintReturnMask::StyleOptionVersion (2s) QStyleHintReturnMaskVersion = 1 ); + +type + QStyleHintReturnVariantStyleOptionVersion = ( //QStyleHintReturnVariant::StyleOptionVersion (2s) + QStyleHintReturnVariantVersion = 1 ); + type QStyleOptionStyleOptionType = cardinal; // QStyleOption::StyleOptionType (4) @@ -8005,6 +8417,18 @@ type const QStyleOptionToolButtonType = 983043 { $f0003 }; +type + QStyleOptionToolButtonToolButtonFeature = cardinal; // QStyleOptionToolButton::ToolButtonFeature (4) + QStyleOptionToolButtonToolButtonFeatures = QStyleOptionToolButtonToolButtonFeature; // QFlags<> + +const + QStyleOptionToolButtonNone = 0 { $0 }; + QStyleOptionToolButtonArrow = 1 { $1 }; + QStyleOptionToolButtonMenu = 4 { $4 }; + QStyleOptionToolButtonMenuButtonPopup = 4 { $4 }; + QStyleOptionToolButtonPopupDelay = 8 { $8 }; + QStyleOptionToolButtonHasMenu = 16 { $10 }; + type QStyleOptionComboBoxStyleOptionType = cardinal; // QStyleOptionComboBox::StyleOptionType (4) @@ -8047,6 +8471,12 @@ type const QStyleHintReturnMaskType = 61441 { $f001 }; +type + QStyleHintReturnVariantStyleOptionType = cardinal; // QStyleHintReturnVariant::StyleOptionType (4) + +const + QStyleHintReturnVariantType = 61442 { $f002 }; + function QStyleOption_create(version: Integer = QStyleOptionVersion; _type: Integer = QStyleOptionSO_Default): QStyleOptionH; overload; cdecl; external QtIntf name 'QStyleOption_create'; procedure QStyleOption_destroy(handle: QStyleOptionH); cdecl; external QtIntf name 'QStyleOption_destroy'; @@ -8121,6 +8551,11 @@ function QStyleOptionDockWidget_create(): QStyleOptionDockWidgetH; overload; cde procedure QStyleOptionDockWidget_destroy(handle: QStyleOptionDockWidgetH); cdecl; external QtIntf name 'QStyleOptionDockWidget_destroy'; function QStyleOptionDockWidget_create(other: QStyleOptionDockWidgetH): QStyleOptionDockWidgetH; overload; cdecl; external QtIntf name 'QStyleOptionDockWidget_create2'; +function QStyleOptionDockWidgetV2_create(): QStyleOptionDockWidgetV2H; overload; cdecl; external QtIntf name 'QStyleOptionDockWidgetV2_create'; +procedure QStyleOptionDockWidgetV2_destroy(handle: QStyleOptionDockWidgetV2H); cdecl; external QtIntf name 'QStyleOptionDockWidgetV2_destroy'; +function QStyleOptionDockWidgetV2_create(other: QStyleOptionDockWidgetV2H): QStyleOptionDockWidgetV2H; overload; cdecl; external QtIntf name 'QStyleOptionDockWidgetV2_create2'; +function QStyleOptionDockWidgetV2_create(other: QStyleOptionDockWidgetH): QStyleOptionDockWidgetV2H; overload; cdecl; external QtIntf name 'QStyleOptionDockWidgetV2_create3'; + function QStyleOptionViewItem_create(): QStyleOptionViewItemH; overload; cdecl; external QtIntf name 'QStyleOptionViewItem_create'; procedure QStyleOptionViewItem_destroy(handle: QStyleOptionViewItemH); cdecl; external QtIntf name 'QStyleOptionViewItem_destroy'; function QStyleOptionViewItem_create(other: QStyleOptionViewItemH): QStyleOptionViewItemH; overload; cdecl; external QtIntf name 'QStyleOptionViewItem_create2'; @@ -8130,10 +8565,20 @@ procedure QStyleOptionViewItemV2_destroy(handle: QStyleOptionViewItemV2H); cdecl function QStyleOptionViewItemV2_create(other: QStyleOptionViewItemV2H): QStyleOptionViewItemV2H; overload; cdecl; external QtIntf name 'QStyleOptionViewItemV2_create2'; function QStyleOptionViewItemV2_create(other: QStyleOptionViewItemH): QStyleOptionViewItemV2H; overload; cdecl; external QtIntf name 'QStyleOptionViewItemV2_create3'; +function QStyleOptionViewItemV3_create(): QStyleOptionViewItemV3H; overload; cdecl; external QtIntf name 'QStyleOptionViewItemV3_create'; +procedure QStyleOptionViewItemV3_destroy(handle: QStyleOptionViewItemV3H); cdecl; external QtIntf name 'QStyleOptionViewItemV3_destroy'; +function QStyleOptionViewItemV3_create(other: QStyleOptionViewItemV3H): QStyleOptionViewItemV3H; overload; cdecl; external QtIntf name 'QStyleOptionViewItemV3_create2'; +function QStyleOptionViewItemV3_create(other: QStyleOptionViewItemH): QStyleOptionViewItemV3H; overload; cdecl; external QtIntf name 'QStyleOptionViewItemV3_create3'; + function QStyleOptionToolBox_create(): QStyleOptionToolBoxH; overload; cdecl; external QtIntf name 'QStyleOptionToolBox_create'; procedure QStyleOptionToolBox_destroy(handle: QStyleOptionToolBoxH); cdecl; external QtIntf name 'QStyleOptionToolBox_destroy'; function QStyleOptionToolBox_create(other: QStyleOptionToolBoxH): QStyleOptionToolBoxH; overload; cdecl; external QtIntf name 'QStyleOptionToolBox_create2'; +function QStyleOptionToolBoxV2_create(): QStyleOptionToolBoxV2H; overload; cdecl; external QtIntf name 'QStyleOptionToolBoxV2_create'; +procedure QStyleOptionToolBoxV2_destroy(handle: QStyleOptionToolBoxV2H); cdecl; external QtIntf name 'QStyleOptionToolBoxV2_destroy'; +function QStyleOptionToolBoxV2_create(other: QStyleOptionToolBoxV2H): QStyleOptionToolBoxV2H; overload; cdecl; external QtIntf name 'QStyleOptionToolBoxV2_create2'; +function QStyleOptionToolBoxV2_create(other: QStyleOptionToolBoxH): QStyleOptionToolBoxV2H; overload; cdecl; external QtIntf name 'QStyleOptionToolBoxV2_create3'; + function QStyleOptionRubberBand_create(): QStyleOptionRubberBandH; overload; cdecl; external QtIntf name 'QStyleOptionRubberBand_create'; procedure QStyleOptionRubberBand_destroy(handle: QStyleOptionRubberBandH); cdecl; external QtIntf name 'QStyleOptionRubberBand_destroy'; function QStyleOptionRubberBand_create(other: QStyleOptionRubberBandH): QStyleOptionRubberBandH; overload; cdecl; external QtIntf name 'QStyleOptionRubberBand_create2'; @@ -8184,6 +8629,18 @@ procedure QStyleHintReturn_destroy(handle: QStyleHintReturnH); cdecl; external Q function QStyleHintReturnMask_create(): QStyleHintReturnMaskH; cdecl; external QtIntf name 'QStyleHintReturnMask_create'; procedure QStyleHintReturnMask_destroy(handle: QStyleHintReturnMaskH); cdecl; external QtIntf name 'QStyleHintReturnMask_destroy'; +function QStyleHintReturnVariant_create(): QStyleHintReturnVariantH; cdecl; external QtIntf name 'QStyleHintReturnVariant_create'; +procedure QStyleHintReturnVariant_destroy(handle: QStyleHintReturnVariantH); cdecl; external QtIntf name 'QStyleHintReturnVariant_destroy'; + +type + QGraphicsSceneSceneLayer = cardinal; // QGraphicsScene::SceneLayer + QGraphicsSceneSceneLayers = QGraphicsSceneSceneLayer; //QFlags<> (3) +const + QGraphicsSceneItemLayer = $1; + QGraphicsSceneBackgroundLayer = $2; + QGraphicsSceneForegroundLayer = $4; + QGraphicsSceneAllLayers = $ffff; + type QGraphicsSceneItemIndexMethod = cardinal; // QGraphicsScene::ItemIndexMethod (4) @@ -8204,20 +8661,28 @@ procedure QGraphicsScene_setSceneRect(handle: QGraphicsSceneH; x: Double; y: Dou procedure QGraphicsScene_render(handle: QGraphicsSceneH; painter: QPainterH; target: QRectFH = nil; source: QRectFH = nil; aspectRatioMode: QtAspectRatioMode = QtKeepAspectRatio); cdecl; external QtIntf name 'QGraphicsScene_render'; function QGraphicsScene_itemIndexMethod(handle: QGraphicsSceneH): QGraphicsSceneItemIndexMethod; cdecl; external QtIntf name 'QGraphicsScene_itemIndexMethod'; procedure QGraphicsScene_setItemIndexMethod(handle: QGraphicsSceneH; method: QGraphicsSceneItemIndexMethod); cdecl; external QtIntf name 'QGraphicsScene_setItemIndexMethod'; +function QGraphicsScene_bspTreeDepth(handle: QGraphicsSceneH): Integer; cdecl; external QtIntf name 'QGraphicsScene_bspTreeDepth'; +procedure QGraphicsScene_setBspTreeDepth(handle: QGraphicsSceneH; depth: Integer); cdecl; external QtIntf name 'QGraphicsScene_setBspTreeDepth'; procedure QGraphicsScene_itemsBoundingRect(handle: QGraphicsSceneH; retval: QRectFH); cdecl; external QtIntf name 'QGraphicsScene_itemsBoundingRect'; function QGraphicsScene_itemAt(handle: QGraphicsSceneH; pos: QPointFH): QGraphicsItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_itemAt'; function QGraphicsScene_itemAt(handle: QGraphicsSceneH; x: Double; y: Double): QGraphicsItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_itemAt2'; -procedure QGraphicsScene_setSelectionArea(handle: QGraphicsSceneH; path: QPainterPathH); cdecl; external QtIntf name 'QGraphicsScene_setSelectionArea'; +procedure QGraphicsScene_selectionArea(handle: QGraphicsSceneH; retval: QPainterPathH); cdecl; external QtIntf name 'QGraphicsScene_selectionArea'; +procedure QGraphicsScene_setSelectionArea(handle: QGraphicsSceneH; path: QPainterPathH); overload; cdecl; external QtIntf name 'QGraphicsScene_setSelectionArea'; +procedure QGraphicsScene_setSelectionArea(handle: QGraphicsSceneH; path: QPainterPathH; p2: QtItemSelectionMode); overload; cdecl; external QtIntf name 'QGraphicsScene_setSelectionArea2'; procedure QGraphicsScene_clearSelection(handle: QGraphicsSceneH); cdecl; external QtIntf name 'QGraphicsScene_clearSelection'; procedure QGraphicsScene_destroyItemGroup(handle: QGraphicsSceneH; group: QGraphicsItemGroupH); cdecl; external QtIntf name 'QGraphicsScene_destroyItemGroup'; procedure QGraphicsScene_addItem(handle: QGraphicsSceneH; item: QGraphicsItemH); cdecl; external QtIntf name 'QGraphicsScene_addItem'; -function QGraphicsScene_addEllipse(handle: QGraphicsSceneH; rect: QRectFH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsEllipseItemH; cdecl; external QtIntf name 'QGraphicsScene_addEllipse'; -function QGraphicsScene_addLine(handle: QGraphicsSceneH; line: QLineFH; pen: QPenH = nil): QGraphicsLineItemH; cdecl; external QtIntf name 'QGraphicsScene_addLine'; +function QGraphicsScene_addEllipse(handle: QGraphicsSceneH; rect: QRectFH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsEllipseItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addEllipse'; +function QGraphicsScene_addLine(handle: QGraphicsSceneH; line: QLineFH; pen: QPenH = nil): QGraphicsLineItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addLine'; function QGraphicsScene_addPath(handle: QGraphicsSceneH; path: QPainterPathH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsPathItemH; cdecl; external QtIntf name 'QGraphicsScene_addPath'; function QGraphicsScene_addPixmap(handle: QGraphicsSceneH; pixmap: QPixmapH): QGraphicsPixmapItemH; cdecl; external QtIntf name 'QGraphicsScene_addPixmap'; function QGraphicsScene_addPolygon(handle: QGraphicsSceneH; polygon: QPolygonFH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsPolygonItemH; cdecl; external QtIntf name 'QGraphicsScene_addPolygon'; -function QGraphicsScene_addRect(handle: QGraphicsSceneH; rect: QRectFH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsRectItemH; cdecl; external QtIntf name 'QGraphicsScene_addRect'; +function QGraphicsScene_addRect(handle: QGraphicsSceneH; rect: QRectFH; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsRectItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addRect'; function QGraphicsScene_addText(handle: QGraphicsSceneH; text: PWideString; font: QFontH = nil): QGraphicsTextItemH; cdecl; external QtIntf name 'QGraphicsScene_addText'; +function QGraphicsScene_addSimpleText(handle: QGraphicsSceneH; text: PWideString; font: QFontH = nil): QGraphicsSimpleTextItemH; cdecl; external QtIntf name 'QGraphicsScene_addSimpleText'; +function QGraphicsScene_addEllipse(handle: QGraphicsSceneH; x: Double; y: Double; w: Double; h: Double; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsEllipseItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addEllipse2'; +function QGraphicsScene_addLine(handle: QGraphicsSceneH; x1: Double; y1: Double; x2: Double; y2: Double; pen: QPenH = nil): QGraphicsLineItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addLine2'; +function QGraphicsScene_addRect(handle: QGraphicsSceneH; x: Double; y: Double; w: Double; h: Double; pen: QPenH = nil; brush: QBrushH = nil): QGraphicsRectItemH; overload; cdecl; external QtIntf name 'QGraphicsScene_addRect2'; procedure QGraphicsScene_removeItem(handle: QGraphicsSceneH; item: QGraphicsItemH); cdecl; external QtIntf name 'QGraphicsScene_removeItem'; function QGraphicsScene_focusItem(handle: QGraphicsSceneH): QGraphicsItemH; cdecl; external QtIntf name 'QGraphicsScene_focusItem'; procedure QGraphicsScene_setFocusItem(handle: QGraphicsSceneH; item: QGraphicsItemH; focusReason: QtFocusReason = QtOtherFocusReason); cdecl; external QtIntf name 'QGraphicsScene_setFocusItem'; @@ -8230,12 +8695,16 @@ procedure QGraphicsScene_setBackgroundBrush(handle: QGraphicsSceneH; brush: QBru procedure QGraphicsScene_foregroundBrush(handle: QGraphicsSceneH; retval: QBrushH); cdecl; external QtIntf name 'QGraphicsScene_foregroundBrush'; procedure QGraphicsScene_setForegroundBrush(handle: QGraphicsSceneH; brush: QBrushH); cdecl; external QtIntf name 'QGraphicsScene_setForegroundBrush'; procedure QGraphicsScene_inputMethodQuery(handle: QGraphicsSceneH; retval: QVariantH; query: QtInputMethodQuery); cdecl; external QtIntf name 'QGraphicsScene_inputMethodQuery'; -procedure QGraphicsScene_update(handle: QGraphicsSceneH; rect: QRectFH = nil); cdecl; external QtIntf name 'QGraphicsScene_update'; +procedure QGraphicsScene_update(handle: QGraphicsSceneH; x: Double; y: Double; w: Double; h: Double); overload; cdecl; external QtIntf name 'QGraphicsScene_update'; +procedure QGraphicsScene_invalidate(handle: QGraphicsSceneH; x: Double; y: Double; w: Double; h: Double; layers: QGraphicsSceneSceneLayers = QGraphicsSceneAllLayers); overload; cdecl; external QtIntf name 'QGraphicsScene_invalidate'; +procedure QGraphicsScene_update(handle: QGraphicsSceneH; rect: QRectFH = nil); overload; cdecl; external QtIntf name 'QGraphicsScene_update2'; +procedure QGraphicsScene_invalidate(handle: QGraphicsSceneH; rect: QRectFH = nil; layers: QGraphicsSceneSceneLayers = QGraphicsSceneAllLayers); overload; cdecl; external QtIntf name 'QGraphicsScene_invalidate2'; procedure QGraphicsScene_advance(handle: QGraphicsSceneH); cdecl; external QtIntf name 'QGraphicsScene_advance'; type QGraphicsScene_sceneRectChanged_Event = procedure (rect: QRectFH) of object cdecl; + QGraphicsScene_selectionChanged_Event = procedure () of object cdecl; @@ -8246,6 +8715,9 @@ type QGraphicsViewDragMode = ( // QGraphicsView::DragMode (1) QGraphicsViewNoDrag, QGraphicsViewScrollHandDrag, QGraphicsViewRubberBandDrag ); + QGraphicsViewViewportUpdateMode = ( // QGraphicsView::ViewportUpdateMode (1) + QGraphicsViewFullViewportUpdate, QGraphicsViewMinimalViewportUpdate, QGraphicsViewSmartViewportUpdate, QGraphicsViewNoViewportUpdate ); + type QGraphicsViewCacheModeFlag = cardinal; // QGraphicsView::CacheModeFlag QGraphicsViewCacheMode = QGraphicsViewCacheModeFlag; //QFlags<> (3) @@ -8253,6 +8725,14 @@ const QGraphicsViewCacheNone = $0; QGraphicsViewCacheBackground = $1; +type + QGraphicsViewOptimizationFlag = cardinal; // QGraphicsView::OptimizationFlag + QGraphicsViewOptimizationFlags = QGraphicsViewOptimizationFlag; //QFlags<> (3) +const + QGraphicsViewDontClipPainter = $1; + QGraphicsViewDontSavePainterState = $2; + QGraphicsViewDontAdjustForAntialiasing = $4; + function QGraphicsView_create(parent: QWidgetH = nil): QGraphicsViewH; overload; cdecl; external QtIntf name 'QGraphicsView_create'; procedure QGraphicsView_destroy(handle: QGraphicsViewH); cdecl; external QtIntf name 'QGraphicsView_destroy'; function QGraphicsView_create(scene: QGraphicsSceneH; parent: QWidgetH = nil): QGraphicsViewH; overload; cdecl; external QtIntf name 'QGraphicsView_create2'; @@ -8266,8 +8746,15 @@ function QGraphicsView_transformationAnchor(handle: QGraphicsViewH): QGraphicsVi procedure QGraphicsView_setTransformationAnchor(handle: QGraphicsViewH; anchor: QGraphicsViewViewportAnchor); cdecl; external QtIntf name 'QGraphicsView_setTransformationAnchor'; function QGraphicsView_resizeAnchor(handle: QGraphicsViewH): QGraphicsViewViewportAnchor; cdecl; external QtIntf name 'QGraphicsView_resizeAnchor'; procedure QGraphicsView_setResizeAnchor(handle: QGraphicsViewH; anchor: QGraphicsViewViewportAnchor); cdecl; external QtIntf name 'QGraphicsView_setResizeAnchor'; +function QGraphicsView_viewportUpdateMode(handle: QGraphicsViewH): QGraphicsViewViewportUpdateMode; cdecl; external QtIntf name 'QGraphicsView_viewportUpdateMode'; +procedure QGraphicsView_setViewportUpdateMode(handle: QGraphicsViewH; mode: QGraphicsViewViewportUpdateMode); cdecl; external QtIntf name 'QGraphicsView_setViewportUpdateMode'; +function QGraphicsView_optimizationFlags(handle: QGraphicsViewH): QGraphicsViewOptimizationFlags; cdecl; external QtIntf name 'QGraphicsView_optimizationFlags'; +procedure QGraphicsView_setOptimizationFlag(handle: QGraphicsViewH; flag: QGraphicsViewOptimizationFlag; enabled: Boolean = True); cdecl; external QtIntf name 'QGraphicsView_setOptimizationFlag'; +procedure QGraphicsView_setOptimizationFlags(handle: QGraphicsViewH; flags: QGraphicsViewOptimizationFlags); cdecl; external QtIntf name 'QGraphicsView_setOptimizationFlags'; function QGraphicsView_dragMode(handle: QGraphicsViewH): QGraphicsViewDragMode; cdecl; external QtIntf name 'QGraphicsView_dragMode'; procedure QGraphicsView_setDragMode(handle: QGraphicsViewH; mode: QGraphicsViewDragMode); cdecl; external QtIntf name 'QGraphicsView_setDragMode'; +function QGraphicsView_rubberBandSelectionMode(handle: QGraphicsViewH): QtItemSelectionMode; cdecl; external QtIntf name 'QGraphicsView_rubberBandSelectionMode'; +procedure QGraphicsView_setRubberBandSelectionMode(handle: QGraphicsViewH; mode: QtItemSelectionMode); cdecl; external QtIntf name 'QGraphicsView_setRubberBandSelectionMode'; function QGraphicsView_cacheMode(handle: QGraphicsViewH): QGraphicsViewCacheMode; cdecl; external QtIntf name 'QGraphicsView_cacheMode'; procedure QGraphicsView_setCacheMode(handle: QGraphicsViewH; mode: QGraphicsViewCacheMode); cdecl; external QtIntf name 'QGraphicsView_setCacheMode'; procedure QGraphicsView_resetCachedContent(handle: QGraphicsViewH); cdecl; external QtIntf name 'QGraphicsView_resetCachedContent'; @@ -8281,6 +8768,10 @@ procedure QGraphicsView_setSceneRect(handle: QGraphicsViewH; x: Double; y: Doubl procedure QGraphicsView_matrix(handle: QGraphicsViewH; retval: QMatrixH); cdecl; external QtIntf name 'QGraphicsView_matrix'; procedure QGraphicsView_setMatrix(handle: QGraphicsViewH; matrix: QMatrixH; combine: Boolean = False); cdecl; external QtIntf name 'QGraphicsView_setMatrix'; procedure QGraphicsView_resetMatrix(handle: QGraphicsViewH); cdecl; external QtIntf name 'QGraphicsView_resetMatrix'; +procedure QGraphicsView_transform(handle: QGraphicsViewH; retval: QTransformH); cdecl; external QtIntf name 'QGraphicsView_transform'; +procedure QGraphicsView_viewportTransform(handle: QGraphicsViewH; retval: QTransformH); cdecl; external QtIntf name 'QGraphicsView_viewportTransform'; +procedure QGraphicsView_setTransform(handle: QGraphicsViewH; matrix: QTransformH; combine: Boolean = False); cdecl; external QtIntf name 'QGraphicsView_setTransform'; +procedure QGraphicsView_resetTransform(handle: QGraphicsViewH); cdecl; external QtIntf name 'QGraphicsView_resetTransform'; procedure QGraphicsView_rotate(handle: QGraphicsViewH; angle: Double); cdecl; external QtIntf name 'QGraphicsView_rotate'; procedure QGraphicsView_scale(handle: QGraphicsViewH; sx: Double; sy: Double); cdecl; external QtIntf name 'QGraphicsView_scale'; procedure QGraphicsView_shear(handle: QGraphicsViewH; sh: Double; sv: Double); cdecl; external QtIntf name 'QGraphicsView_shear'; @@ -8314,6 +8805,7 @@ procedure QGraphicsView_backgroundBrush(handle: QGraphicsViewH; retval: QBrushH) procedure QGraphicsView_setBackgroundBrush(handle: QGraphicsViewH; brush: QBrushH); cdecl; external QtIntf name 'QGraphicsView_setBackgroundBrush'; procedure QGraphicsView_foregroundBrush(handle: QGraphicsViewH; retval: QBrushH); cdecl; external QtIntf name 'QGraphicsView_foregroundBrush'; procedure QGraphicsView_setForegroundBrush(handle: QGraphicsViewH; brush: QBrushH); cdecl; external QtIntf name 'QGraphicsView_setForegroundBrush'; +procedure QGraphicsView_invalidateScene(handle: QGraphicsViewH; rect: QRectFH = nil; layers: QGraphicsSceneSceneLayers = QGraphicsSceneAllLayers); cdecl; external QtIntf name 'QGraphicsView_invalidateScene'; procedure QGraphicsView_updateSceneRect(handle: QGraphicsViewH; rect: QRectFH); cdecl; external QtIntf name 'QGraphicsView_updateSceneRect'; type @@ -8628,6 +9120,15 @@ function QToolButton_hook_create(handle: QObjectH): QToolButton_hookH; cdecl; ex procedure QToolButton_hook_destroy(handle: QToolButton_hookH); cdecl; external QtIntf name 'QToolButton_hook_destroy'; procedure QToolButton_hook_hook_triggered(handle: QToolButton_hookH; hook: QHookH); cdecl; external QtIntf name 'QToolButton_hook_hook_triggered'; +function QMdiArea_hook_create(handle: QObjectH): QMdiArea_hookH; cdecl; external QtIntf name 'QMdiArea_hook_create'; +procedure QMdiArea_hook_destroy(handle: QMdiArea_hookH); cdecl; external QtIntf name 'QMdiArea_hook_destroy'; +procedure QMdiArea_hook_hook_subWindowActivated(handle: QMdiArea_hookH; hook: QHookH); cdecl; external QtIntf name 'QMdiArea_hook_hook_subWindowActivated'; + +function QMdiSubWindow_hook_create(handle: QObjectH): QMdiSubWindow_hookH; cdecl; external QtIntf name 'QMdiSubWindow_hook_create'; +procedure QMdiSubWindow_hook_destroy(handle: QMdiSubWindow_hookH); cdecl; external QtIntf name 'QMdiSubWindow_hook_destroy'; +procedure QMdiSubWindow_hook_hook_windowStateChanged(handle: QMdiSubWindow_hookH; hook: QHookH); cdecl; external QtIntf name 'QMdiSubWindow_hook_hook_windowStateChanged'; +procedure QMdiSubWindow_hook_hook_aboutToActivate(handle: QMdiSubWindow_hookH; hook: QHookH); cdecl; external QtIntf name 'QMdiSubWindow_hook_hook_aboutToActivate'; + function QCalendarWidget_hook_create(handle: QObjectH): QCalendarWidget_hookH; cdecl; external QtIntf name 'QCalendarWidget_hook_create'; procedure QCalendarWidget_hook_destroy(handle: QCalendarWidget_hookH); cdecl; external QtIntf name 'QCalendarWidget_hook_destroy'; procedure QCalendarWidget_hook_hook_selectionChanged(handle: QCalendarWidget_hookH; hook: QHookH); cdecl; external QtIntf name 'QCalendarWidget_hook_hook_selectionChanged'; @@ -8690,11 +9191,13 @@ procedure QHeaderView_hook_hook_sectionMoved(handle: QHeaderView_hookH; hook: QH procedure QHeaderView_hook_hook_sectionResized(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionResized'; procedure QHeaderView_hook_hook_sectionPressed(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionPressed'; procedure QHeaderView_hook_hook_sectionClicked(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionClicked'; +procedure QHeaderView_hook_hook_sectionEntered(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionEntered'; procedure QHeaderView_hook_hook_sectionDoubleClicked(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionDoubleClicked'; procedure QHeaderView_hook_hook_sectionCountChanged(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionCountChanged'; procedure QHeaderView_hook_hook_sectionHandleDoubleClicked(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionHandleDoubleClicked'; procedure QHeaderView_hook_hook_sectionAutoResize(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sectionAutoResize'; procedure QHeaderView_hook_hook_geometriesChanged(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_geometriesChanged'; +procedure QHeaderView_hook_hook_sortIndicatorChanged(handle: QHeaderView_hookH; hook: QHookH); cdecl; external QtIntf name 'QHeaderView_hook_hook_sortIndicatorChanged'; function QStandardItem_hook_create(handle: QObjectH): QStandardItem_hookH; cdecl; external QtIntf name 'QStandardItem_hook_create'; procedure QStandardItem_hook_destroy(handle: QStandardItem_hookH); cdecl; external QtIntf name 'QStandardItem_hook_destroy'; @@ -8721,6 +9224,7 @@ procedure QSystemTrayIcon_hook_hook_messageClicked(handle: QSystemTrayIcon_hookH function QGraphicsScene_hook_create(handle: QObjectH): QGraphicsScene_hookH; cdecl; external QtIntf name 'QGraphicsScene_hook_create'; procedure QGraphicsScene_hook_destroy(handle: QGraphicsScene_hookH); cdecl; external QtIntf name 'QGraphicsScene_hook_destroy'; procedure QGraphicsScene_hook_hook_sceneRectChanged(handle: QGraphicsScene_hookH; hook: QHookH); cdecl; external QtIntf name 'QGraphicsScene_hook_hook_sceneRectChanged'; +procedure QGraphicsScene_hook_hook_selectionChanged(handle: QGraphicsScene_hookH; hook: QHookH); cdecl; external QtIntf name 'QGraphicsScene_hook_hook_selectionChanged'; function QIODevice_hook_create(handle: QObjectH): QIODevice_hookH; cdecl; external QtIntf name 'QIODevice_hook_create'; procedure QIODevice_hook_destroy(handle: QIODevice_hookH); cdecl; external QtIntf name 'QIODevice_hook_destroy'; diff --git a/lcl/interfaces/qt/qtint.pp b/lcl/interfaces/qt/qtint.pp index 2b13603cd5..3ad0c24221 100644 --- a/lcl/interfaces/qt/qtint.pp +++ b/lcl/interfaces/qt/qtint.pp @@ -34,9 +34,9 @@ interface {$endif} uses - // Bindings - qt4 must come first to avoid type redefinition problems on Windows -{$ifdef USE_QT_4_2} - qt42, + // Bindings - qt4 must come first to avoid type redefinition problems +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} @@ -44,7 +44,7 @@ uses Classes, SysUtils, Math, Types, // LCL InterfaceBase, LCLProc, LCLType, LMessages, Controls, ExtCtrls, Forms, - Dialogs, StdCtrls, Comctrls, LCLIntf, GraphType, Themes; + Dialogs, StdCtrls, Comctrls, Calendar, LCLIntf, GraphType, Themes; type @@ -124,7 +124,7 @@ uses // QtWSActnList, // QtWSArrow, QtWSButtons, -// QtWSCalendar, + QtWSCalendar, // QtWSCheckLst, // QtWSCListBox, QtWSComCtrls, diff --git a/lcl/interfaces/qt/qtobjects.pas b/lcl/interfaces/qt/qtobjects.pas index e1362a3954..b21db4ee02 100644 --- a/lcl/interfaces/qt/qtobjects.pas +++ b/lcl/interfaces/qt/qtobjects.pas @@ -27,8 +27,8 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} @@ -268,6 +268,24 @@ type procedure show; procedure hide; end; + + { TQtButtonGroup } + + TQtButtonGroup = class(TObject) + private + public + constructor Create(AParent: QObjectH); virtual; + destructor Destroy; override; + Handle: QButtonGroupH; + public + procedure AddButton(AButton: QAbstractButtonH); overload; + procedure AddButton(AButton: QAbstractButtonH; Id: Integer); overload; + function ButtonFromId(id: Integer): QAbstractButtonH; + procedure RemoveButton(AButton: QAbstractButtonH); + function GetExclusive: Boolean; + procedure SetExclusive(AExclusive: Boolean); + procedure SignalButtonClicked(AButton: QAbstractButtonH); cdecl; + end; procedure TQColorToColorRef(const AColor: TQColor; out AColorRef: TColorRef); procedure ColorRefToTQColor(const AColorRef: TColorRef; var AColor:TQColor); @@ -1414,5 +1432,58 @@ begin QSystemTrayIcon_hide(handle); end; +{ TQtButtonGroup } + +constructor TQtButtonGroup.Create(AParent: QObjectH); +var + Hook: QObject_hookH; + Method: TMethod; +begin + inherited Create; + + Handle := QButtonGroup_create(AParent); +end; + +destructor TQtButtonGroup.Destroy; +begin + QButtonGroup_destroy(Handle); + inherited Destroy; +end; + +procedure TQtButtonGroup.AddButton(AButton: QAbstractButtonH); overload; +begin + QButtonGroup_addButton(Handle, AButton); +end; + +procedure TQtButtonGroup.AddButton(AButton: QAbstractButtonH; id: Integer); overload; +begin + QButtonGroup_addButton(Handle, AButton, id); +end; + +function TQtButtonGroup.ButtonFromId(id: Integer): QAbstractButtonH; +begin + Result := QButtonGroup_button(Handle, id); +end; + +procedure TQtButtonGroup.RemoveButton(AButton: QAbstractButtonH); +begin + QButtonGroup_removeButton(Handle, AButton); +end; + +procedure TQtButtonGroup.SetExclusive(AExclusive: Boolean); +begin + QButtonGroup_setExclusive(Handle, AExclusive); +end; + +function TQtButtonGroup.GetExclusive: Boolean; +begin + QButtonGroup_exclusive(Handle); +end; + +procedure TQtButtonGroup.SignalButtonClicked(AButton: QAbstractButtonH); cdecl; +begin + {todo} +end; + end. diff --git a/lcl/interfaces/qt/qtprivate.pp b/lcl/interfaces/qt/qtprivate.pp index 684a7d1dbe..9fb99ee0e6 100644 --- a/lcl/interfaces/qt/qtprivate.pp +++ b/lcl/interfaces/qt/qtprivate.pp @@ -27,8 +27,8 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} diff --git a/lcl/interfaces/qt/qtthemes.pas b/lcl/interfaces/qt/qtthemes.pas index 89df61e763..166cc15931 100644 --- a/lcl/interfaces/qt/qtthemes.pas +++ b/lcl/interfaces/qt/qtthemes.pas @@ -18,8 +18,8 @@ uses // rtl Types, Classes, SysUtils, // qt bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas index b0aecfbdd3..dd5820e939 100644 --- a/lcl/interfaces/qt/qtwidgets.pas +++ b/lcl/interfaces/qt/qtwidgets.pas @@ -27,8 +27,8 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} @@ -114,6 +114,11 @@ type procedure Text(retval: PWideString); function isChecked: Boolean; procedure setChecked(p1: Boolean); + procedure SignalPressed; cdecl; + procedure SignalReleased; cdecl; + procedure SignalClicked(Checked: Boolean = False); cdecl; + procedure SignalClicked2; cdecl; + procedure SignalToggled(Checked: Boolean); cdecl; end; { TQtPushButton } @@ -137,7 +142,7 @@ type protected function CreateWidget(const AParams: TCreateParams):QWidgetH; override; public -{$ifndef USE_QT_4_2} +{$ifdef USE_QT_4_3} MDIAreaHandle: QMDIAreaH; {$endif} Splitter: QSplitterH; @@ -186,6 +191,7 @@ type function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; override; function CheckState: QtCheckState; procedure setCheckState(state: QtCheckState); + procedure signalStateChanged(p1: Integer); cdecl; end; { TQtRadioButton } @@ -205,10 +211,17 @@ type protected function CreateWidget(const AParams: TCreateParams):QWidgetH; override; private - VBoxLayout: QVBoxLayoutH; public destructor Destroy; override; end; + + TQtButtonGroupBox = class(TQtGroupBox) + protected + private + public + ButtonGroup: TQtButtonGroup; + VBoxLayout: QVBoxLayoutH; + end; { TQtFrame } @@ -457,10 +470,8 @@ type procedure SignalItemCollapsed(item: QTreeWidgetItemH) cdecl; procedure SignalCurrentItemChanged(current: QTreeWidgetItemH; previous: QTreeWidgetItemH) cdecl; procedure SignalItemSelectionChanged; cdecl; - end; - { TQtMenu } TQtMenu = class(TQtWidget) @@ -556,6 +567,21 @@ type procedure setViewPort(AWidget: TQtWidget); end; + { TQtCalendar } + + TQtCalendar = class(TQtWidget) + private + protected + function CreateWidget(const AParams: TCreateParams):QWidgetH; override; + public + AYear, AMonth, ADay: Word; + destructor Destroy; override; + procedure SignalActivated(ADate: QDateH); cdecl; + procedure SignalClicked(ADate: QDateH); cdecl; + procedure SignalSelectionChanged; cdecl; + procedure SignalCurrentPageChanged(p1, p2: Integer); cdecl; + end; + implementation const AlignmentMap: array[TAlignment] of QtAlignment = @@ -657,7 +683,7 @@ begin inherited Destroy; end; -{.$IFDEF VerboseQt} +{$IFDEF VerboseQt} function EventTypeToStr(Event:QEventH):string; begin case QEvent_type(Event) of @@ -772,7 +798,7 @@ begin QEventMaxUser: result:='QEventMaxUser'; end; end; -{.$ENDIF} +{$ENDIF} {------------------------------------------------------------------------------ Function: TQtWidget.EventFilter @@ -973,8 +999,6 @@ begin WriteLn(' message: ', Msg.Msg); {$endif} try - {TODO: TStringGrid raises AV here while calling - editor ... fixme} LCLObject.WindowProc(TLMessage(Msg)); except Application.HandleException(nil); @@ -1012,11 +1036,10 @@ begin MousePos := QMouseEvent_pos(QMouseEventH(Event))^; Msg.Keys := 0; - //TODO: test this. Modifiers := QInputEvent_modifiers(QInputEventH(Event)); if Modifiers and qtShiftModifier <> 0 then Msg.Keys := Msg.Keys or MK_SHIFT; if Modifiers and qtControlModifier<>0 then Msg.Keys := Msg.Keys or MK_CONTROL; - //TODO: what about ALT, META, NUMKEYPAD? + { TODO: add support for ALT, META and NUMKEYPAD } Msg.XPos := SmallInt(MousePos.X); Msg.YPos := SmallInt(MousePos.Y); @@ -1781,6 +1804,73 @@ begin QAbstractButton_setChecked(QAbstractButtonH(Widget), p1); end; +{------------------------------------------------------------------------------ + Function: TQtAbstractButton.SignalPressed + Params: None + Returns: Nothing + ------------------------------------------------------------------------------} +procedure TQtAbstractButton.SignalPressed; cdecl; +var + Msg: TLMessage; +begin + FillChar(Msg, SizeOf(Msg), #0); + Msg.Msg := LM_KEYDOWN; + DeliverMessage(Msg); +end; + +{------------------------------------------------------------------------------ + Function: TQtAbstractButton.SignalReleased + Params: None + Returns: Nothing + ------------------------------------------------------------------------------} +procedure TQtAbstractButton.SignalReleased; cdecl; +var + Msg: TLMessage; +begin + FillChar(Msg, SizeOf(Msg), #0); + Msg.Msg := LM_KEYUP; + DeliverMessage(Msg); +end; + +{------------------------------------------------------------------------------ + Function: TQtAbstractButton.SignalClicked + Params: None + Returns: Nothing + ------------------------------------------------------------------------------} +procedure TQtAbstractButton.SignalClicked(Checked: Boolean = False); cdecl; +var + Msg: TLMessage; +begin + FillChar(Msg, SizeOf(Msg), #0); + Msg.Msg := LM_CHANGED; + DeliverMessage(Msg); +end; + +{------------------------------------------------------------------------------ + Function: TQtAbstractButton.SignalClicked2 + Params: None + Returns: Nothing + ------------------------------------------------------------------------------} +procedure TQtAbstractButton.SignalClicked2; cdecl; +var + Msg: TLMessage; +begin + FillChar(Msg, SizeOf(Msg), #0); + Msg.Msg := LM_CLICKED; + DeliverMessage(Msg); +end; + +{------------------------------------------------------------------------------ + Function: TQtAbstractButton.SignalToggled + Params: None + Returns: Nothing + ------------------------------------------------------------------------------} +procedure TQtAbstractButton.SignalToggled(Checked: Boolean); cdecl; +begin + {use this for TToggleButton } +end; + + { TQtPushButton } function TQtPushButton.CreateWidget(const AParams: TCreateParams): QWidgetH; @@ -1855,7 +1945,7 @@ function TQtMainWindow.CreateWidget(const AParams: TCreateParams): QWidgetH; var w: QWidgetH; r: TRect; -{$ifndef USE_QT_4_2} +{$ifdef USE_QT_4_3} mdihandle: QMdiAreaH; toolbar: QToolBarH; {$endif} @@ -1867,10 +1957,6 @@ begin w := QApplication_activeWindow; - // mainform should be TQtMainWindow ... - {$ifndef USE_QT_4_2} - {$define mdidevel} - {$endif} if not Assigned(w) and not (Application.MainForm.Visible) then begin Result := QMainWindow_create(nil, QtWindow); @@ -1881,30 +1967,31 @@ begin if Assigned(Application.MainForm.Menu) then QMainWindow_setMenuBar(QMainWindowH(Result), QMenuBarH(MenuBar.Widget)); - {$ifdef mdidevel} - MDIAreaHandle := QMdiArea_create(Result); + {$ifdef USE_QT_4_3} + MDIAreaHandle := QMdiArea_create(Result); + + QMainWindow_setCentralWidget(QMainWindowH(Result), MDIAreaHandle); - QMainWindow_setCentralWidget(QMainWindowH(Result), MDIAreaHandle); - {$endif} - - {$ifndef USE_QT_4_2} QMainWindow_setDockOptions(QMainWindowH(Result), QMainWindowAnimatedDocks); {$endif} - + end else begin - {$ifdef mdidevel} - if LCLObject.Tag = 9999 then - begin - Result := QMdiSubWindow_create(NiL, QtWindow); + {$ifdef USE_QT_4_3} + if LCLObject.Tag = 9999 then + begin + Result := QMdiSubWindow_create(NiL, QtWindow); - mdiHandle := TQtMainWindow(Application.MainForm.Handle).MDIAreaHandle; - if Assigned(mdiHandle) then - QMdiArea_addSubWindow(mdiHandle, QMdiSubWindowH(Result), QtWindow); - - end else + mdiHandle := TQtMainWindow(Application.MainForm.Handle).MDIAreaHandle; + if Assigned(mdiHandle) then + QMdiArea_addSubWindow(mdiHandle, QMdiSubWindowH(Result), QtWindow); + end + else + Result := QWidget_create(nil, QtWindow); + {$else} + Result := QWidget_create(nil, QtWindow); {$endif} - Result := QWidget_create(nil, QtWindow); + // Main menu bar MenuBar := TQtMenuBar.Create(Result); end; @@ -2152,17 +2239,24 @@ begin {$ifdef VerboseQt} WriteLn('TQtCheckBox.Create'); {$endif} - + if (LCLObject.Parent is TCustomCheckGroup) then begin Result := QCheckBox_create; - QLayout_addWidget(TQtGroupBox(LCLObject.Parent.Handle).VBoxLayout, Result); + + QLayout_addWidget(TQtButtonGroupBox(LCLObject.Parent.Handle).VBoxLayout, Result); + + if TQtButtonGroupBox(LCLObject.Parent.Handle).ButtonGroup.GetExclusive then + TQtButtonGroupBox(LCLObject.Parent.Handle).ButtonGroup.SetExclusive(False); + + TQtButtonGroupBox(LCLObject.Parent.Handle).ButtonGroup.AddButton(QCheckBoxH(Result)); end else begin Parent := TQtWidget(LCLObject.Parent.Handle).Widget; Result := QCheckBox_create(Parent); end; + end; procedure TQtCheckBox.SetGeometry; @@ -2197,8 +2291,7 @@ end; function TQtCheckBox.EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; begin Result := False; - - // Inherited Callbacks + inherited EventFilter(Sender, Event); end; @@ -2222,6 +2315,20 @@ begin QCheckBox_setCheckState(QCheckBoxH(Widget), state); end; +{------------------------------------------------------------------------------ + Function: TQtCheckBox.signalStateChanged + Params: None + Returns: Nothing + ------------------------------------------------------------------------------} +procedure TQtCheckBox.signalStateChanged(p1: Integer); cdecl; +var + Msg: TLMessage; +begin + FillChar(Msg, SizeOf(Msg), #0); + Msg.Msg := LM_CHANGED; + DeliverMessage(Msg); +end; + { TQtRadioButton } function TQtRadioButton.CreateWidget(const AParams: TCreateParams): QWidgetH; @@ -2237,7 +2344,22 @@ begin if (LCLObject.Parent is TCustomRadioGroup) then begin Result := QRadioButton_create; - QLayout_addWidget(TQtGroupBox(LCLObject.Parent.Handle).VBoxLayout, Result); + +{$ifdef QT_HIDDEN_BUTTON_WORKAROUND} + if LCLObject.Name = 'HiddenRadioButton' then + QWidget_hide(Result) + else + begin +{$endif} + QLayout_addWidget(TQtButtonGroupBox(LCLObject.Parent.Handle).VBoxLayout, Result); + + if not TQtButtonGroupBox(LCLObject.Parent.Handle).ButtonGroup.GetExclusive then + TQtButtonGroupBox(LCLObject.Parent.Handle).ButtonGroup.SetExclusive(True); + + TQtButtonGroupBox(LCLObject.Parent.Handle).ButtonGroup.AddButton(QRadioButtonH(Result)); +{$ifdef QT_HIDDEN_BUTTON_WORKAROUND} + end; +{$endif} end else begin @@ -2288,6 +2410,8 @@ end; function TQtGroupBox.CreateWidget(const AParams: TCreateParams): QWidgetH; var Parent: QWidgetH; + R: TRect; + Method: TMethod; begin // Creates the widget {$ifdef VerboseQt} @@ -2295,15 +2419,6 @@ begin {$endif} Parent := TQtWidget(LCLObject.Parent.Handle).Widget; Result := QGroupBox_create(Parent); - - {------------------------------------------------------------------------------ - Adds a vertical layout if the control is a group - ------------------------------------------------------------------------------} - if (LCLOBject is TCustomRadioGroup) or (LCLObject is TCustomCheckGroup) then - begin - VBoxLayout := QVBoxLayout_create; - QWidget_setLayout(Result, VBoxLayout); - end; end; @@ -2324,6 +2439,7 @@ begin inherited Destroy; end; + { TQtFrame } function TQtFrame.CreateWidget(const AParams: TCreateParams): QWidgetH; @@ -2425,7 +2541,8 @@ end; ------------------------------------------------------------------------------} procedure TQtAbstractSlider.SlotRangeChanged(minimum: Integer; maximum: Integer); cdecl; begin - {TODO: what to do on rangeChanged ? repaint or recount pageSize() } + { TODO: find out what needs to be done on rangeChanged event + Possibilities: repaint or recount pageSize() } {$ifdef VerboseQt} writeln('TQtAbstractSlider.rangeChanged() to min=',minimum,' max=',maximum); {$endif} @@ -2572,7 +2689,7 @@ begin LMScroll.Msg := LM_VSCROLL; LMScroll.Pos := p1; - LMScroll.ScrollCode := SIF_POS; {what about SIF_TRACKPOS ?!?} + LMScroll.ScrollCode := SIF_POS; { SIF_TRACKPOS } Msg := @LMScroll; @@ -2917,7 +3034,6 @@ procedure TQtTextEdit.SetAlignment(const AAlignment: TAlignment); var TextCursor: QTextCursorH; begin - // Paul Ishenin: // QTextEdit supports alignment for every paragraph. We need to align all text. // So, we should select all text, set format, and clear selection @@ -3207,12 +3323,12 @@ begin WriteLn('TQtAbstractSpinBox.SignalEditingFinished'); {$endif} FillChar(Msg, SizeOf(Msg), #0); - {TODO: What message should be sended here ?!? - problem: - everything is fine when we work with mouse,or - press TabKey to select next control, but if we - connect OnKeyDown and say eg. VK_RETURN:SelectNext(ActiveControl, true, true) - then spinedit text is always selected, nothing important but looks ugly.} + { TODO: Find out which message should be sended here + problem: + everything is fine when we work with mouse, or + press TabKey to select next control, but if we + connect OnKeyDown and say eg. VK_RETURN: SelectNext(ActiveControl, true, true) + then spinedit text is always selected, nothing important but looks ugly.} // Msg.Msg := LM_EXIT; // DeliverMessage(Msg); end; @@ -4235,6 +4351,135 @@ begin end; end; + { TQtCalendar } + +{------------------------------------------------------------------------------ + Function: TQtCalendar.CreateWidget + Params: None + Returns: Nothing + ------------------------------------------------------------------------------} +function TQtCalendar.CreateWidget(const AParams: TCreateParams):QWidgetH; +var + Parent: QWidgetH; +begin + // Creates the widget + {$ifdef VerboseQt} + WriteLn('TQtCalendar.Create'); + {$endif} + Parent := TQtWidget(LCLObject.Parent.Handle).Widget; + Result := QCalendarWidget_create(Parent); +end; + +{------------------------------------------------------------------------------ + Function: TQtCalendar.Destroy + Params: None + Returns: Nothing + ------------------------------------------------------------------------------} +destructor TQtCalendar.Destroy; +begin + {$ifdef VerboseQt} + WriteLn('TQtCalendar.Destroy'); + {$endif} + QCalendarWidget_destroy(QCalendarWidgetH(Widget)); + Widget:=nil; + + inherited Destroy; +end; + +{------------------------------------------------------------------------------ + Function: TQtCalendar.SignalActivated + Params: None + Returns: Nothing + Sends signal when RETURN pressed on selected date. + ------------------------------------------------------------------------------} +procedure TQtCalendar.SignalActivated(ADate: QDateH); cdecl; +var + Msg: TLMessage; + y,m,d: Integer; +begin + {this one triggers if we press RETURN on selected date + shell we send KeyDown here ?!?} + FillChar(Msg, SizeOf(Msg), #0); + Msg.Msg := LM_DAYCHANGED; + y := QDate_year(ADate); + m := QDate_month(ADate); + d := QDate_day(ADate); + if (y <> aYear) or (m <> aMonth) + or (d <> aDay) then + DeliverMessage(Msg); +end; + +{------------------------------------------------------------------------------ + Function: TQtCalendar.SignalClicked + Params: None + Returns: Nothing + Sends msg LM_DAYCHANGED when OldDate<>NewDate + ------------------------------------------------------------------------------} +procedure TQtCalendar.SignalClicked(ADate: QDateH); cdecl; +var + Msg: TLMessage; + y,m,d: Integer; +begin +// writeln('TQtCalendar.signalClicked'); + FillChar(Msg, SizeOf(Msg), #0); + Msg.Msg := LM_DAYCHANGED; + y := QDate_year(ADate); + m := QDate_month(ADate); + d := QDate_day(ADate); + if (y <> aYear) or (m <> aMonth) + or (d <> aDay) then + DeliverMessage(Msg); +end; + +{------------------------------------------------------------------------------ + Function: TQtCalendar.SignalSelectionChanged + Params: None + Returns: Nothing + + Notes: no event for date changed by keyboard ?!? + always triggers even if selection isn't changed ... + this is not Qt4 bug ... tested with pure Qt C++ app + ------------------------------------------------------------------------------} +procedure TQtCalendar.SignalSelectionChanged; cdecl; +var + Msg: TLMessage; +begin +// writeln('TQtCalendar.SignalSelectionChanged'); + + FillChar(Msg, SizeOf(Msg), #0); + Msg.Msg := LM_DAYCHANGED; + DeliverMessage(Msg); +end; + +{------------------------------------------------------------------------------ + Function: TQtCalendar.SignalCurrentPageChanged + Params: None + Returns: Nothing + + Notes: fixme what's wrong with those values ?!? + with pure Qt C++ app this works ok, but via bindings get + impossible year & month values ... + ------------------------------------------------------------------------------} +procedure TQtCalendar.SignalCurrentPageChanged(p1, p2: Integer); cdecl; +var + Msg: TLMessage; +begin + // writeln('TQtCalendar.SignalCurrentPageChanged p1=',p1,' p2=',p2); + + FillChar(Msg, SizeOf(Msg), #0); + if AYear<>p1 then + begin + Msg.Msg := LM_YEARCHANGED; + DeliverMessage(Msg); + end; + + if AMonth<>p2 then + begin + Msg.Msg := LM_MONTHCHANGED; + DeliverMessage(Msg); + end; +end; + end. diff --git a/lcl/interfaces/qt/qtwsbuttons.pp b/lcl/interfaces/qt/qtwsbuttons.pp index 4dd1e714df..941cbf0c21 100644 --- a/lcl/interfaces/qt/qtwsbuttons.pp +++ b/lcl/interfaces/qt/qtwsbuttons.pp @@ -28,8 +28,8 @@ interface uses // Libs -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} @@ -153,8 +153,8 @@ var Str: WideString; begin Result := False; - if not WSCheckHandleAllocated(AWincontrol, 'GetText') - then Exit; + + if not WSCheckHandleAllocated(AWincontrol, 'GetText') then Exit; TQtAbstractButton(AWinControl.Handle).Text(@Str); @@ -172,8 +172,7 @@ class procedure TQtWSButton.SetText(const AWinControl: TWinControl; const AText: var Str: WideString; begin - if not WSCheckHandleAllocated(AWincontrol, 'SetText') - then Exit; + if not WSCheckHandleAllocated(AWincontrol, 'SetText') then Exit; Str := UTF8Decode(AText); @@ -193,8 +192,7 @@ var QColor: TQColor; Color: TColor; begin - if not WSCheckHandleAllocated(AWincontrol, 'SetColor') - then Exit; + if not WSCheckHandleAllocated(AWincontrol, 'SetColor') then Exit; if AWinControl.Color = CLR_INVALID then exit; @@ -273,8 +271,8 @@ var Str: WideString; begin Result := False; - if not WSCheckHandleAllocated(AWincontrol, 'GetText') - then Exit; + + if not WSCheckHandleAllocated(AWincontrol, 'GetText') then Exit; TQtAbstractButton(AWinControl.Handle).Text(@Str); @@ -293,8 +291,8 @@ class procedure TQtWSBitBtn.SetText(const AWinControl: TWinControl; var Str: WideString; begin - if not WSCheckHandleAllocated(AWincontrol, 'SetText') - then Exit; + if not WSCheckHandleAllocated(AWincontrol, 'SetText') then Exit; + Str := UTF8Decode(AText); TQtAbstractButton(AWinControl.Handle).SetText(@Str); @@ -313,8 +311,7 @@ var QColor: TQColor; Color: TColor; begin - if not WSCheckHandleAllocated(AWincontrol, 'SetColor') - then Exit; + if not WSCheckHandleAllocated(AWincontrol, 'SetColor') then Exit; if AWinControl.Color = CLR_INVALID then exit; diff --git a/lcl/interfaces/qt/qtwscalendar.pp b/lcl/interfaces/qt/qtwscalendar.pp index 0a6efd6c82..f43bf24736 100644 --- a/lcl/interfaces/qt/qtwscalendar.pp +++ b/lcl/interfaces/qt/qtwscalendar.pp @@ -22,19 +22,21 @@ } unit QtWSCalendar; -{$mode objfpc}{$H+} +{$mode delphi}{$H+} interface uses -//////////////////////////////////////////////////// -// I M P O R T A N T -//////////////////////////////////////////////////// -// To get as little as posible circles, -// uncomment only when needed for registration -//////////////////////////////////////////////////// -// Calendar, -//////////////////////////////////////////////////// + // Bindings +{$ifdef USE_QT_4_3} + qt43, +{$else} + qt4, +{$endif} + qtwidgets, + // LCL + SysUtils, DateUtils, Controls, Calendar, LCLType, LCLIntf, LCLProc, + // Widgetset WSCalendar, WSLCLClasses; type @@ -45,11 +47,135 @@ type private protected public + class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override; + class procedure DestroyHandle(const AWinControl: TWinControl); override; + public + class function GetDateTime(const ACalendar: TCustomCalendar): TDateTime; override; + class procedure SetDateTime(const ACalendar: TCustomCalendar; const ADateTime: TDateTime); override; + class procedure SetDisplaySettings(const ACalendar: TCustomCalendar; const ADisplaySettings: TDisplaySettings); override; + class procedure SetReadOnly(const ACalendar: TCustomCalendar; const AReadOnly: boolean); override; end; implementation +{ TQtWSCustomCalendar } + +class function TQtWSCustomCalendar.CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; +var + QtCalendar: TQtCalendar; + Hook: QCalendarWidget_hookH; + Method: TMethod; +begin + QtCalendar := TQtCalendar.Create(AWinControl, AParams); + + Hook := QCalendarWidget_hook_create(QtCalendar.Widget); + TEventFilterMethod(Method) := QtCalendar.EventFilter; + QObject_hook_hook_events(Hook, Method); + + QCalendarWidget_clicked_Event(Method) := QtCalendar.SignalClicked; + QCalendarWidget_hook_hook_clicked(QCalendarWidget_hook_create(QtCalendar.Widget), Method); + + QCalendarWidget_activated_Event(Method) := QtCalendar.SignalActivated; + QCalendarWidget_hook_hook_activated(QCalendarWidget_hook_create(QtCalendar.Widget), Method); + + QCalendarWidget_selectionChanged_Event(Method) := QtCalendar.SignalSelectionChanged; + QCalendarWidget_hook_hook_clicked(QCalendarWidget_hook_create(QtCalendar.Widget), Method); + + QCalendarWidget_currentPageChanged_Event(Method) := QtCalendar.SignalCurrentPageChanged; + QCalendarWidget_hook_hook_clicked(QCalendarWidget_hook_create(QtCalendar.Widget), Method); + + QWidget_setFocusPolicy(QtCalendar.Widget, QtTabFocus or QtClickFocus); + + Result := THandle(QtCalendar); +end; + +class procedure TQtWSCustomCalendar.DestroyHandle(const AWinControl: TWinControl); +begin + TQtCalendar(AWinControl.Handle).Free; + AWinControl.Handle := 0; +end; + +class procedure TQtWSCustomCalendar.SetReadOnly(const ACalendar: TCustomCalendar; const AReadOnly: boolean); +var + QtCalendar: TQtCalendar; +begin + QtCalendar := TQtCalendar(ACalendar.Handle); + + if AReadOnly then + QCalendarWidget_setSelectionMode(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetNoSelection) + else QCalendarWidget_setSelectionMode(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetSingleSelection); + +{$ifdef USE_QT_4_3} + QCalendarWidget_setDateEditEnabled(QCalendarWidgetH(QtCalendar.Widget), not AReadOnly); +{$endif} +end; + +class function TQtWSCustomCalendar.GetDateTime(const ACalendar: TCustomCalendar): TDateTime; +var + QtCalendar: TQtCalendar; + ADate: QDateH; +begin + QtCalendar := TQtCalendar(ACalendar.Handle); + ADate := QDate_create; + + try + QCalendarWidget_selectedDate(QCalendarWidgetH(QtCalendar.Widget), ADate); + QtCalendar.AYear := QDate_year(ADate); + QtCalendar.AMonth := QDate_month(ADate); + QtCalendar.ADay := QDate_day(ADate); + Result := EncodeDate(QtCalendar.AYear, QtCalendar.AMonth, QtCalendar.ADay); + finally + QDate_destroy(ADate); + end; +end; + +class procedure TQtWSCustomCalendar.SetDateTime(const ACalendar: TCustomCalendar; const ADateTime: TDateTime); +var + QtCalendar: TQtCalendar; + ADate: QDateH; +begin + QtCalendar := TQtCalendar(ACalendar.Handle); + DecodeDate(ADateTime, QtCalendar.AYear, QtCalendar.AMonth, QtCalendar.ADay); + ADate := QDate_create(QtCalendar.AYear, QtCalendar.AMonth, QtCalendar.ADay); + + try + QCalendarWidget_setCurrentPage(QCalendarWidgetH(QtCalendar.Widget), QtCalendar.AYear, QtCalendar.AMonth); + QCalendarWidget_setSelectedDate(QCalendarWidgetH(QtCalendar.Widget), ADate); + finally + QDate_destroy(ADate); + end; +end; + +class procedure TQtWSCustomCalendar.SetDisplaySettings(const ACalendar: TCustomCalendar; + const ADisplaySettings: TDisplaySettings); +var + QtCalendar: TQtCalendar; +begin + QtCalendar := TQtCalendar(ACalendar.Handle); + + QCalendarWidget_setHeaderVisible(QCalendarWidgetH(QtCalendar.Widget), dsShowHeadings in ADisplaySettings); + + if dsShowDayNames in ADisplaySettings then + QCalendarWidget_setHorizontalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget),QCalendarWidgetShortDayNames) + else QCalendarWidget_setHorizontalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetNoHorizontalHeader); + +{$ifdef USE_QT_4_3} + QCalendarWidget_setNavigationBarVisible(QCalendarWidgetH(QtCalendar.Widget), not (dsNoMonthChange in ADisplaySettings)); +{$endif} + + if dsShowWeekNumbers in ADisplaySettings then + QCalendarWidget_setVerticalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetISOWeekNumbers) + else QCalendarWidget_setVerticalHeaderFormat(QCalendarWidgetH(QtCalendar.Widget), QCalendarWidgetNoVerticalHeader); + + QCalendarWidget_setGridVisible(QCalendarWidgetH(QtCalendar.Widget), dsShowWeekNumbers in ADisplaySettings); + + if dsStartMonday in ADisplaySettings then + QCalendarWidget_setFirstDayOfWeek(QCalendarWidgetH(QtCalendar.Widget), QtMonday) + else QCalendarWidget_setFirstDayOfWeek(QCalendarWidgetH(QtCalendar.Widget), QtSunday); +end; + + initialization //////////////////////////////////////////////////// @@ -58,6 +184,6 @@ initialization // To improve speed, register only classes // which actually implement something //////////////////////////////////////////////////// -// RegisterWSComponent(TCustomCalendar, TQtWSCustomCalendar); + RegisterWSComponent(TCustomCalendar, TQtWSCustomCalendar); //////////////////////////////////////////////////// -end. \ No newline at end of file +end. diff --git a/lcl/interfaces/qt/qtwscomctrls.pp b/lcl/interfaces/qt/qtwscomctrls.pp index 09f737e81b..86de78219a 100644 --- a/lcl/interfaces/qt/qtwscomctrls.pp +++ b/lcl/interfaces/qt/qtwscomctrls.pp @@ -28,8 +28,8 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} diff --git a/lcl/interfaces/qt/qtwscontrols.pp b/lcl/interfaces/qt/qtwscontrols.pp index fc986871c5..e3f7295507 100644 --- a/lcl/interfaces/qt/qtwscontrols.pp +++ b/lcl/interfaces/qt/qtwscontrols.pp @@ -28,8 +28,8 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} diff --git a/lcl/interfaces/qt/qtwsdialogs.pp b/lcl/interfaces/qt/qtwsdialogs.pp index 9fef68d80c..ad72efbf95 100644 --- a/lcl/interfaces/qt/qtwsdialogs.pp +++ b/lcl/interfaces/qt/qtwsdialogs.pp @@ -28,8 +28,8 @@ interface uses // Libs -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} diff --git a/lcl/interfaces/qt/qtwsextctrls.pp b/lcl/interfaces/qt/qtwsextctrls.pp index 8d8a4455f1..1f0ac8cd7e 100644 --- a/lcl/interfaces/qt/qtwsextctrls.pp +++ b/lcl/interfaces/qt/qtwsextctrls.pp @@ -28,14 +28,14 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} - qtwidgets, + qtwidgets, qtobjects, // LCL - SysUtils, Controls, Forms, ExtCtrls, LCLType, + SysUtils, Classes, Controls, Forms, StdCtrls, ExtCtrls, LCLType, // Widgetset WSExtCtrls, WSLCLClasses; @@ -158,6 +158,10 @@ type private protected public + class function CreateHandle(const AWinControl: TWinControl; + const AParams: TCreateParams): TLCLIntfHandle; override; + class procedure DestroyHandle(const AWinControl: TWinControl); override; + class procedure ShowHide(const AWinControl: TWinControl); override; end; { TQtWSRadioGroup } @@ -174,6 +178,10 @@ type private protected public + class function CreateHandle(const AWinControl: TWinControl; + const AParams: TCreateParams): TLCLIntfHandle; override; + class procedure DestroyHandle(const AWinControl: TWinControl); override; + class procedure ShowHide(const AWinControl: TWinControl); override; end; { TQtWSCheckGroup } @@ -419,6 +427,117 @@ begin TQtTabWidget(ANotebook.Handle).SetTabPosition(QTabWidgetTabPositionMap[ATabPosition]); end; +{ TQtWSCustomRadioGroup } + +{------------------------------------------------------------------------------ + Method: TQtWSCustomRadioGroup.CreateHandle + Params: None + Returns: Nothing + + Allocates memory and resources for the control and shows it + ------------------------------------------------------------------------------} + +class function TQtWSCustomRadioGroup.CreateHandle(const AWinControl: TWinControl; + const AParams: TCreateParams): TLCLIntfHandle; +var + QtGroupBox: TQtButtonGroupBox; + Str: WideString; + Method: TMethod; + Hook : QGroupBox_hookH; +begin + + QtGroupBox := TQtButtonGroupBox.Create(AWinControl, AParams); + + QtGroupBox.VBoxLayout := QVBoxLayout_create; + QWidget_setLayout(QtGroupBox.Widget, QtGroupBox.VBoxLayout); + QtGroupBox.ButtonGroup := TQtButtonGroup.Create(QObjectH(QtGroupBox.VBoxLayout)); + + Hook := QGroupBox_hook_create(QtGroupBox.Widget); + TEventFilterMethod(Method) := QtGroupBox.EventFilter; + QObject_hook_hook_events(Hook, Method); + + Str := UTF8Decode(AWinControl.Caption); + QGroupBox_setTitle(QGroupBoxH(QtGroupBox.Widget), @Str); + + Result := THandle(QtGroupBox); +end; + +{------------------------------------------------------------------------------ + Method: TQtWSCustomRadioGroup.DestroyHandle + Params: None + Returns: Nothing + + Releases allocated memory and resources + ------------------------------------------------------------------------------} +class procedure TQtWSCustomRadioGroup.DestroyHandle(const AWinControl: TWinControl); +begin + TQtGroupBox(AWinControl.Handle).Free; + + AWinControl.Handle := 0; +end; + + +class procedure TQtWSCustomRadioGroup.ShowHide(const AWinControl: TWinControl); +begin + inherited ShowHide(AWinControl); + {without this we have invisible radio buttons} +end; + +{ TQtWSCustomCheckGroup } + +{------------------------------------------------------------------------------ + Method: TQtWSCustomCheckGroup.CreateHandle + Params: None + Returns: Nothing + + Allocates memory and resources for the control and shows it + ------------------------------------------------------------------------------} + +class function TQtWSCustomCheckGroup.CreateHandle(const AWinControl: TWinControl; + const AParams: TCreateParams): TLCLIntfHandle; +var + QtGroupBox: TQtButtonGroupBox; + Str: WideString; + Method: TMethod; + Hook : QGroupBox_hookH; +begin + + QtGroupBox := TQtButtonGroupBox.Create(AWinControl, AParams); + QtGroupBox.VBoxLayout := QVBoxLayout_create; + QWidget_setLayout(QtGroupBox.Widget, QtGroupBox.VBoxLayout); + QtGroupBox.ButtonGroup := TQtButtonGroup.Create(QObjectH(QtGroupBox.VBoxLayout)); + + Hook := QGroupBox_hook_create(QtGroupBox.Widget); + TEventFilterMethod(Method) := QtGroupBox.EventFilter; + QObject_hook_hook_events(Hook, Method); + + Str := UTF8Decode(AWinControl.Caption); + QGroupBox_setTitle(QGroupBoxH(QtGroupBox.Widget), @Str); + + Result := THandle(QtGroupBox); +end; + +{------------------------------------------------------------------------------ + Method: TQtWSCustomCheckGroup.DestroyHandle + Params: None + Returns: Nothing + + Releases allocated memory and resources + ------------------------------------------------------------------------------} +class procedure TQtWSCustomCheckGroup.DestroyHandle(const AWinControl: TWinControl); +begin + TQtGroupBox(AWinControl.Handle).Free; + + AWinControl.Handle := 0; +end; + + +class procedure TQtWSCustomCheckGroup.ShowHide(const AWinControl: TWinControl); +begin + inherited ShowHide(AWinControl); + {without this checkboxes are invisible} +end; + initialization //////////////////////////////////////////////////// @@ -438,9 +557,9 @@ initialization // RegisterWSComponent(TCustomImage, TQtWSCustomImage); // RegisterWSComponent(TImage, TQtWSImage); // RegisterWSComponent(TBevel, TQtWSBevel); -// RegisterWSComponent(TCustomRadioGroup, TQtWSCustomRadioGroup); + RegisterWSComponent(TCustomRadioGroup, TQtWSCustomRadioGroup); // RegisterWSComponent(TRadioGroup, TQtWSRadioGroup); -// RegisterWSComponent(TCustomCheckGroup, TQtWSCustomCheckGroup); + RegisterWSComponent(TCustomCheckGroup, TQtWSCustomCheckGroup); // RegisterWSComponent(TCheckGroup, TQtWSCheckGroup); // RegisterWSComponent(TCustomLabeledEdit, TQtWSCustomLabeledEdit); // RegisterWSComponent(TLabeledEdit, TQtWSLabeledEdit); diff --git a/lcl/interfaces/qt/qtwsforms.pp b/lcl/interfaces/qt/qtwsforms.pp index 5af8e5d616..359e46fea1 100644 --- a/lcl/interfaces/qt/qtwsforms.pp +++ b/lcl/interfaces/qt/qtwsforms.pp @@ -28,8 +28,8 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} diff --git a/lcl/interfaces/qt/qtwsgrids.pp b/lcl/interfaces/qt/qtwsgrids.pp index cadead3512..bd9e027240 100644 --- a/lcl/interfaces/qt/qtwsgrids.pp +++ b/lcl/interfaces/qt/qtwsgrids.pp @@ -28,8 +28,8 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} diff --git a/lcl/interfaces/qt/qtwsmenus.pp b/lcl/interfaces/qt/qtwsmenus.pp index 4f20d74139..08ac1f7ccb 100644 --- a/lcl/interfaces/qt/qtwsmenus.pp +++ b/lcl/interfaces/qt/qtwsmenus.pp @@ -28,8 +28,8 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} diff --git a/lcl/interfaces/qt/qtwsspin.pp b/lcl/interfaces/qt/qtwsspin.pp index 5cfcc0478e..78bf30072a 100644 --- a/lcl/interfaces/qt/qtwsspin.pp +++ b/lcl/interfaces/qt/qtwsspin.pp @@ -28,8 +28,8 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} @@ -96,7 +96,7 @@ var FIsFloat: Boolean; begin - {qt4 have two different QSpinBoxes, one is QSpinBox (integer), another is QDoubleSpinBox (double) } + { qt4 has two different QSpinBoxes, one is QSpinBox (integer), another is QDoubleSpinBox (double) } FIsFloat := TCustomFloatSpinEdit(AWinControl).DecimalPlaces > 0; @@ -110,7 +110,9 @@ begin Hook := QAbstractSpinBox_hook_create(QtFloatSpinBox.Widget); TEventFilterMethod(Method) := QtFloatSpinBox.EventFilter; QObject_hook_hook_events(Hook, Method); - {TODO: what TLMessage should be sended ? } + + {TODO: find out which TLMessage should be sended } + QAbstractSpinBox_editingFinished_Event(Method) := QtFloatSpinBox.SignalEditingFinished; QAbstractSpinBox_hook_hook_editingFinished(QAbstractSpinBox_hook_create(QtFloatSpinBox.Widget), Method); @@ -122,19 +124,18 @@ begin Hook := QAbstractSpinBox_hook_create(QtSpinBox.Widget); TEventFilterMethod(Method) := QtSpinBox.EventFilter; QObject_hook_hook_events(Hook, Method); - {TODO: what TLMessage should be sended ? } + + {TODO: find out which TLMessage should be sended } + QAbstractSpinBox_editingFinished_Event(Method) := QtSpinBox.SignalEditingFinished; QAbstractSpinBox_hook_hook_editingFinished(QAbstractSpinBox_hook_create(QtSpinBox.Widget), Method); QSpinBox_valueChanged_Event(Method) := QtSpinBox.SignalValueChanged; QSpinBox_hook_hook_valueChanged(QSpinBox_hook_create(QtSpinBox.Widget), Method); end; - - if FIsFloat then - Result := THandle(QtFloatSpinBox) - else - Result := THandle(QtSpinBox); + if FIsFloat then Result := THandle(QtFloatSpinBox) + else Result := THandle(QtSpinBox); end; {------------------------------------------------------------------------------ @@ -144,11 +145,10 @@ end; ------------------------------------------------------------------------------} class procedure TQtWSCustomFloatSpinEdit.DestroyHandle(const AWinControl: TWinControl); begin - if TCustomFloatSpinEdit(AWinControl).DecimalPlaces > 0 then - TQtFloatSpinBox(AWinControl.Handle).Free + TQtFloatSpinBox(AWinControl.Handle).Free else - TQtSpinBox(AWinControl.Handle).Free; + TQtSpinBox(AWinControl.Handle).Free; AWinControl.Handle := 0; end; @@ -156,17 +156,16 @@ end; class function TQtWSCustomFloatSpinEdit.GetValue(const ACustomFloatSpinEdit: TCustomFloatSpinEdit): single; begin if ACustomFloatSpinEdit.DecimalPlaces > 0 then - Result := QDoubleSpinBox_value(QDoubleSpinBoxH(TQtFloatSpinBox(ACustomFloatSpinEdit.Handle).Widget)) + Result := QDoubleSpinBox_value(QDoubleSpinBoxH(TQtFloatSpinBox(ACustomFloatSpinEdit.Handle).Widget)) else - Result := QSpinBox_value(QSpinBoxH(TQtFloatSpinBox(ACustomFloatSpinEdit.Handle).Widget)); + Result := QSpinBox_value(QSpinBoxH(TQtFloatSpinBox(ACustomFloatSpinEdit.Handle).Widget)); end; class procedure TQtWSCustomFloatSpinEdit.UpdateControl(const ACustomFloatSpinEdit: TCustomFloatSpinEdit); var - QtSpinEdit: TQtSpinBox; - QtFloatSpinEdit: TQtFloatSpinBox; + QtSpinEdit: TQtSpinBox; + QtFloatSpinEdit: TQtFloatSpinBox; begin - if ACustomFloatSpinEdit.DecimalPlaces > 0 then begin QtFloatSpinEdit := TQtFloatSpinBox(ACustomFloatSpinEdit.Handle); @@ -175,7 +174,8 @@ begin QDoubleSpinBox_setMinimum(QDoubleSpinBoxH(QtFloatSpinEdit.Widget), ACustomFloatSpinEdit.MinValue); QDoubleSpinBox_setMaximum(QDoubleSpinBoxH(QtFloatSpinEdit.Widget), ACustomFloatSpinEdit.MaxValue); QDoubleSpinBox_setSingleStep(QDoubleSpinBoxH(QtFloatSpinEdit.Widget), ACustomFloatSpinEdit.Increment); - end else + end + else begin QtSpinEdit := TQtSpinBox(ACustomFloatSpinEdit.Handle); QSpinBox_setValue(QSpinBoxH(QtSpinEdit.Widget), Round(ACustomFloatSpinEdit.Value)); @@ -183,7 +183,6 @@ begin QSpinBox_setMaximum(QSpinBoxH(QtSpinEdit.Widget), Round(ACustomFloatSpinEdit.MaxValue)); QSpinBox_setSingleStep(QSpinBoxH(QtSpinEdit.Widget), Round(ACustomFloatSpinEdit.Increment)); end; - end; initialization diff --git a/lcl/interfaces/qt/qtwsstdctrls.pp b/lcl/interfaces/qt/qtwsstdctrls.pp index 58aa19902f..9bfa08408e 100644 --- a/lcl/interfaces/qt/qtwsstdctrls.pp +++ b/lcl/interfaces/qt/qtwsstdctrls.pp @@ -28,8 +28,8 @@ interface uses // Bindings -{$ifdef USE_QT_4_2} - qt42, +{$ifdef USE_QT_4_3} + qt43, {$else} qt4, {$endif} @@ -1024,14 +1024,29 @@ end; class function TQtWSCustomCheckBox.CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; var QtCheckBox: TQtCheckBox; + Method: TMethod; + Hook : QAbstractButton_hookH; begin QtCheckBox := TQtCheckBox.Create(AWinControl, AParams); // Focus + // QWidget_setFocusPolicy(QtCheckBox.Widget, QtStrongFocus); + {we have a bug in LCL when parent is TCustomCheckGroup, it doesn't set sizes for items ?!? Width = 0 , Height = 0} + // writeln('WW=',QWidget_width(QtCheckBox.Widget),' WH=',QWidget_height(QtCheckBox.Widget),' WCW=',AWinControl.Width,' WCH=',AWinControl.Height,' CAPTION=',TCustomCheckBox(AWinControl).Caption); - //QWidget_setFocusPolicy(QtCheckBox.Widget, QtStrongFocus); - - // Returns the Handle + Hook := QCheckBox_hook_create(QtCheckBox.Widget); + + TEventFilterMethod(Method) := QtCheckBox.EventFilter; + + QObject_hook_hook_events(Hook, Method); + + + QCheckBox_stateChanged_Event(Method) := QtCheckBox.SignalStateChanged; + QCheckBox_hook_hook_stateChanged(QCheckBox_hook_create(QtCheckBox.Widget), Method); + + {we must cheat TCustomCheckGroup here with some reasonable CheckBox size...} + if AWinControl.Height = 0 then + AWinControl.SetInitialBounds(0, 0, 100, 20); Result := THandle(QtCheckBox); end; @@ -1132,19 +1147,27 @@ class function TQtWSRadioButton.CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; var QtRadioButton: TQtRadioButton; -{ Method: TMethod; - Hook : QObject_hookH;} + Method: TMethod; + Hook : QAbstractButton_hookH; begin + QtRadioButton := TQtRadioButton.Create(AWinControl, AParams); // Various Events -{ Hook := QObject_hook_create(QtRadioButton.Widget); + Hook := QAbstractButton_hook_create(QtRadioButton.Widget); TEventFilterMethod(Method) := QtRadioButton.EventFilter; - QObject_hook_hook_events(Hook, Method);} + QObject_hook_hook_events(Hook, Method); + {we must cheat TCustomRadioGroup here with some reasonable RadioButton size...} + if AWinControl.Height = 0 then + AWinControl.SetInitialBounds(0, 0, 100, 20); + + QAbstractButton_clicked_Event(Method) := QtRadioButton.SignalClicked; + QAbstractButton_hook_hook_clicked(QAbstractButton_hook_create(QtRadioButton.Widget), Method); + // Focus //QWidget_setFocusPolicy(QtRadioButton.Widget, QtStrongFocus); @@ -1182,15 +1205,24 @@ class function TQtWSCustomGroupBox.CreateHandle(const AWinControl: TWinControl; var QtGroupBox: TQtGroupBox; Str: WideString; + Method: TMethod; + Hook : QGroupBox_hookH; begin QtGroupBox := TQtGroupBox.Create(AWinControl, AParams); // If SetSlots is uncommented, then TRadioGroup stops working -// This needs further investigation -// SetSlots(QtButtonGroup); +// This needs further investigation --> Problem is with child controls sizes (zeljko@holobit.net) +// SetSlots(QtButtonGroup); + Hook := QGroupBox_hook_create(QtGroupBox.Widget); + TEventFilterMethod(Method) := QtGroupBox.EventFilter; + QObject_hook_hook_events(Hook, Method); + Str := UTF8Decode(AWinControl.Caption); QGroupBox_setTitle(QGroupBoxH(QtGroupBox.Widget), @Str); + +// LCL doesn't have such features ... +// QGroupBox_setCheckable(QGroupBoxH(QtGroupBox.Widget), True); // Returns the Handle