aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-09-29 02:23:46 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2012-09-29 02:23:46 -0700
commit018ec85ff7ab422846f1d8b0bfb27a8d6c70eada (patch)
tree4b09a3a31ae1a654ecbf0cc86f66f978371e17f2
parentf72fd0e79262a23de9a5b4679f3b6677990773e3 (diff)
parentfee10d800e2599962f2960ddf27963c2f3768bd0 (diff)
downloadbitcoin-018ec85ff7ab422846f1d8b0bfb27a8d6c70eada.tar.xz
Merge pull request #1875 from hsoft/master
Fix compilation with clang under OS X
-rw-r--r--src/qt/macdockiconhandler.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qt/macdockiconhandler.h b/src/qt/macdockiconhandler.h
index d02c148f91..2092fb26b3 100644
--- a/src/qt/macdockiconhandler.h
+++ b/src/qt/macdockiconhandler.h
@@ -6,7 +6,12 @@
class QMenu;
class QIcon;
class QWidget;
-class objc_object;
+
+#ifdef __OBJC__
+@class DockIconClickEventHandler;
+#else
+class DockIconClickEventHandler;
+#endif
/** Macintosh-specific dock icon handler.
*/
@@ -31,7 +36,7 @@ public slots:
private:
MacDockIconHandler();
- objc_object *m_dockIconClickEventHandler;
+ DockIconClickEventHandler *m_dockIconClickEventHandler;
QWidget *m_dummyWidget;
QMenu *m_dockMenu;
};