paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-13 13:39:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt6: various fixes in bindings.

Browse Source 
(cherry picked from commit 7bace9858e)

Co-authored-by: Željan Rikalo <zeljko@lazarus-ide.org>
This commit is contained in:
Željan Rikalo 2024-11-22 07:27:11 +00:00 committed by Željan Rikalo
parent e80a882d73
commit 3a11092878
7 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/interfaces/qt6/cbindings/src/chandles.h
View File

@ -43,6 +43,8 @@ typedef struct QWidget__ { PTRINT dummy; } *QWidgetH;
typedef struct QLCLOpenGLWidget__ { PTRINT dummy; } *QLCLOpenGLWidgetH;
typedef struct QRadialGradient__ { PTRINT dummy; } *QRadialGradientH;
typedef struct QStyle__ { PTRINT dummy; } *QStyleH;
typedef struct QCommonStyle__ { PTRINT dummy; } *QCommonStyleH;
typedef struct QLCLProxyStyle__ { PTRINT dummy; } *QLCLProxyStyleH;
typedef struct QFontComboBox_hook__ { PTRINT dummy; } *QFontComboBox_hookH;
typedef struct QWhatsThisClickedEvent__ { PTRINT dummy; } *QWhatsThisClickedEventH;
typedef struct QSwipeGesture__ { PTRINT dummy; } *QSwipeGestureH;
@ -125,6 +127,7 @@ typedef struct QPrinter__ { PTRINT dummy; } *QPrinterH;
typedef struct QLCLMessageEvent__ { PTRINT dummy; } *QLCLMessageEventH;
typedef struct QKeySequence__ { PTRINT dummy; } *QKeySequenceH;
typedef struct QKeyCombination__ { PTRINT dummy; } *QKeyCombinationH;
typedef struct QToolBar_hook__ { PTRINT dummy; } *QToolBar_hookH;
typedef struct QStyleOptionComplex__ { PTRINT dummy; } *QStyleOptionComplexH;
@ -274,6 +277,7 @@ typedef struct QDragMoveEvent__ { PTRINT dummy; } *QDragMoveEventH;
typedef struct QTabWidget__ { PTRINT dummy; } *QTabWidgetH;
typedef struct QTableWidgetSelectionRange__ { PTRINT dummy; } *QTableWidgetSelectionRangeH;
typedef struct QBrush__ { PTRINT dummy; } *QBrushH;
typedef struct QInputMethod_hook__ { PTRINT dummy; } *QInputMethod_hookH;
typedef struct QInputMethod__ { PTRINT dummy; } *QInputMethodH;
typedef struct QIconEngine__ { PTRINT dummy; } *QIconEngineH;
typedef struct QSplitter__ { PTRINT dummy; } *QSplitterH;

5
lcl/interfaces/qt6/cbindings/src/qevent_c.cpp
View File

@ -861,6 +861,11 @@ quint32 QKeyEvent_nativeModifiers(QKeyEventH handle)
return (quint32) ((QKeyEvent *)handle)->nativeModifiers();
}
void QKeyEvent_keyCombination(QKeyEventH handle, QKeyCombinationH retval)
{
*(QKeyCombination *) retval = ((QKeyEvent *)handle)->keyCombination();
}
QFocusEventH QFocusEvent_Create(QEvent::Type type, Qt::FocusReason reason)
{
return (QFocusEventH) new QFocusEvent(type, reason);

1
lcl/interfaces/qt6/cbindings/src/qevent_c.h
View File

@ -194,6 +194,7 @@ C_EXPORT int QKeyEvent_count(QKeyEventH handle);
C_EXPORT quint32 QKeyEvent_nativeScanCode(QKeyEventH handle);
C_EXPORT quint32 QKeyEvent_nativeVirtualKey(QKeyEventH handle);
C_EXPORT quint32 QKeyEvent_nativeModifiers(QKeyEventH handle);
C_EXPORT void QKeyEvent_keyCombination(QKeyEventH handle, QKeyCombinationH retval);
C_EXPORT QFocusEventH QFocusEvent_Create(QEvent::Type type, Qt::FocusReason reason);
C_EXPORT void QFocusEvent_Destroy(QFocusEventH handle);
C_EXPORT bool QFocusEvent_gotFocus(QFocusEventH handle);

10
lcl/interfaces/qt6/cbindings/src/qfontmetrics_c.cpp
View File

@ -372,6 +372,11 @@ qreal QFontMetricsF_horizontalAdvance2(QFontMetricsFH handle, PWideChar AnonPara
return (qreal) ((QFontMetricsF *)handle)->horizontalAdvance(*(QChar *)AnonParam1);
}
qreal QFontMetricsF_horizontalAdvance3(QFontMetricsFH handle, const QStringH text, int len)
{
return (qreal) ((QFontMetricsF *)handle)->horizontalAdvance(*(const QString *)text, len);
}
void QFontMetricsF_boundingRect(QFontMetricsFH handle, QRectFH retval, PWideString string)
{
QString t_string;
@ -414,11 +419,6 @@ void QFontMetricsF_elidedText(QFontMetricsFH handle, PWideString retval, PWideSt
copyQStringToPWideString(t_retval, retval);
}
int QFontMetricsF_horizontalAdvance3(QFontMetricsFH handle, const QStringH text, int len)
{
return (int) ((QFontMetricsF *)handle)->horizontalAdvance(*(const QString *)text, len);
}
void QFontMetricsF_boundingRect5(QFontMetricsFH handle, QRectFH retval, const QStringH text)
{
*(QRectF *) retval = ((QFontMetricsF *)handle)->boundingRect(*(const QString*)text);

16
lcl/interfaces/qt6/cbindings/src/qfontmetrics_c.h
View File

@ -85,8 +85,9 @@ C_EXPORT bool QFontMetricsF_inFont(QFontMetricsFH handle, PWideChar AnonParam1);
C_EXPORT bool QFontMetricsF_inFontUcs4(QFontMetricsFH handle, uint ucs4);
C_EXPORT qreal QFontMetricsF_leftBearing(QFontMetricsFH handle, PWideChar AnonParam1);
C_EXPORT qreal QFontMetricsF_rightBearing(QFontMetricsFH handle, PWideChar AnonParam1);
C_EXPORT qreal QFontMetricsF_horizontalAdvance(QFontMetricsH handle, PWideString AnonParam1, int len);
C_EXPORT qreal QFontMetricsF_horizontalAdvance2(QFontMetricsH handle, PWideChar AnonParam1);
C_EXPORT qreal QFontMetricsF_horizontalAdvance(QFontMetricsFH handle, PWideString AnonParam1, int len);
C_EXPORT qreal QFontMetricsF_horizontalAdvance2(QFontMetricsFH handle, PWideChar AnonParam1);
C_EXPORT qreal QFontMetricsF_horizontalAdvance3(QFontMetricsFH handle, const QStringH text, int len);
C_EXPORT void QFontMetricsF_boundingRect(QFontMetricsFH handle, QRectFH retval, PWideString string);
C_EXPORT void QFontMetricsF_boundingRect2(QFontMetricsFH handle, QRectFH retval, PWideChar AnonParam1);
C_EXPORT void QFontMetricsF_boundingRect3(QFontMetricsFH handle, QRectFH retval, const QRectFH r, int flags, PWideString string, int tabstops, int* tabarray);
@ -94,12 +95,11 @@ C_EXPORT void QFontMetricsF_size(QFontMetricsFH handle, QSizeFH retval, int flag
C_EXPORT void QFontMetricsF_tightBoundingRect(QFontMetricsFH handle, QRectFH retval, PWideString text);
C_EXPORT void QFontMetricsF_elidedText(QFontMetricsFH handle, PWideString retval, PWideString text, Qt::TextElideMode mode, qreal width, int flags);
C_EXPORT int QFontMetricsF_horizontalAdvance3(QFontMetricsH handle, const QStringH text, int len);
C_EXPORT void QFontMetricsF_boundingRect5(QFontMetricsH handle, QRectFH retval, const QStringH text);
C_EXPORT void QFontMetricsF_boundingRect6(QFontMetricsH handle, QRectFH retval, QRectFH r, int flags, const QStringH text, int tabstops, int* tabarray);
C_EXPORT void QFontMetricsF_size2(QFontMetricsH handle, QSizeFH retval, int flags, const QStringH str, int tabstops, int* tabarray);
C_EXPORT void QFontMetricsF_tightBoundingRect2(QFontMetricsH handle, QRectFH retval, const QStringH text);
C_EXPORT void QFontMetricsF_elidedText2(QFontMetricsH handle, QStringH retval, const QStringH text, Qt::TextElideMode mode, int width, int flags);
C_EXPORT void QFontMetricsF_boundingRect5(QFontMetricsFH handle, QRectFH retval, const QStringH text);
C_EXPORT void QFontMetricsF_boundingRect6(QFontMetricsFH handle, QRectFH retval, QRectFH r, int flags, const QStringH text, int tabstops, int* tabarray);
C_EXPORT void QFontMetricsF_size2(QFontMetricsFH handle, QSizeFH retval, int flags, const QStringH str, int tabstops, int* tabarray);
C_EXPORT void QFontMetricsF_tightBoundingRect2(QFontMetricsFH handle, QRectFH retval, const QStringH text);
C_EXPORT void QFontMetricsF_elidedText2(QFontMetricsFH handle, QStringH retval, const QStringH text, Qt::TextElideMode mode, int width, int flags);
C_EXPORT qreal QFontMetricsF_underlinePos(QFontMetricsFH handle);
C_EXPORT qreal QFontMetricsF_overlinePos(QFontMetricsFH handle);

9
lcl/interfaces/qt6/cbindings/src/qstyle_c.cpp
View File

@ -1,5 +1,5 @@
//******************************************************************************
// Copyright (c) 2005-2013 by Jan Van hijfte
// Copyright (c) 2005-2024 by Jan Van hijfte, Željan Rikalo
//
// See the included file COPYING.TXT for details about the copyright.
//
@ -198,3 +198,10 @@ const QStyleH QStyle_proxy(QStyleH handle)
return (const QStyleH) ((QStyle *)handle)->proxy();
}
void QStyle_name(QStyleH handle, PWideString retval)
{
QString t_retval;
t_retval = ((QStyle *)handle)->name();
copyQStringToPWideString(t_retval, retval);
}

3
lcl/interfaces/qt6/cbindings/src/qstyle_c.h
View File

@ -1,5 +1,5 @@
//******************************************************************************
// Copyright (c) 2005-2013 by Jan Van hijfte
// Copyright (c) 2005-2024 by Jan Van hijfte, Željan Rikalo
//
// See the included file COPYING.TXT for details about the copyright.
//
@ -46,5 +46,6 @@ C_EXPORT void QStyle_alignedRect(PRect retval, Qt::LayoutDirection direction, un
C_EXPORT int QStyle_layoutSpacing(QStyleH handle, QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOptionH option, const QWidgetH widget);
C_EXPORT int QStyle_combinedLayoutSpacing(QStyleH handle, unsigned int controls1, unsigned int controls2, Qt::Orientation orientation, QStyleOptionH option, QWidgetH widget);
C_EXPORT const QStyleH QStyle_proxy(QStyleH handle);
C_EXPORT void QStyle_name(QStyleH handle, PWideString retval);
#endif