diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-04-12 21:17:59 -0400 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2013-04-15 14:51:12 +0200 |
| commit | ba55c6c541b15813ee1c6621cec4a7f1276a2ecf (patch) | |
| tree | c97d713ad7fa15055bf022b8cdae102dd54763e3 | |
| parent | b879a02d6d2abad0052535d364a5ead3d87b8b0d (diff) | |
Add a method that provides access to the native NSToolbar object.
Change-Id: I45b60c2dec8ad73c5a6fff5f86275b2720e213f6
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| -rw-r--r-- | src/macextras/qmacunifiedtoolbar.h | 8 | ||||
| -rw-r--r-- | src/macextras/qmacunifiedtoolbar.mm | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/macextras/qmacunifiedtoolbar.h b/src/macextras/qmacunifiedtoolbar.h index c084d5e..143e1ed 100644 --- a/src/macextras/qmacunifiedtoolbar.h +++ b/src/macextras/qmacunifiedtoolbar.h @@ -64,6 +64,12 @@ Q_MACEXTRAS_EXPORT QMacUnifiedToolBar* setNativeToolBar(QToolBar *toolbar, const class QAction; class QWindow; +#ifdef __OBJC__ +@class NSToolbar; +#else +typedef struct objc_object NSToolbar; +#endif + class QMacUnifiedToolBarPrivate; class Q_MACEXTRAS_EXPORT QMacUnifiedToolBar : public QObject { @@ -77,6 +83,8 @@ public: QMacUnifiedToolBar(const QString &identifier, QObject *parent = 0); ~QMacUnifiedToolBar(); + NSToolbar* nativeToolbar() const; + static QMacUnifiedToolBar* fromQToolBar(const QToolBar *toolBar, const QString &identifier = QString()); QString identifier() const; diff --git a/src/macextras/qmacunifiedtoolbar.mm b/src/macextras/qmacunifiedtoolbar.mm index 9765a09..05e955c 100644 --- a/src/macextras/qmacunifiedtoolbar.mm +++ b/src/macextras/qmacunifiedtoolbar.mm @@ -261,6 +261,11 @@ QMacUnifiedToolBar::~QMacUnifiedToolBar() delete d; } +NSToolbar *QMacUnifiedToolBar::nativeToolbar() const +{ + return d->toolbar; +} + QMacUnifiedToolBar *QMacUnifiedToolBar::fromQToolBar(const QToolBar *toolBar, const QString &identifier) { // TODO: add the QToolBar's QWidgets to the Mac toolbar once it supports this |