Mercurial > hg > bitcoin

changeset 3567:5d002dc16627 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #1875 from hsoft/master Fix compilation with clang under OS X
author Wladimir J. van der Laan <laanwj@gmail.com>
date Sat, 29 Sep 2012 02:23:46 -0700
parents 5bc833852ee1 (current diff) 5a38aa74f791 (diff)
children f4deb10126f7 b0df8166fcac 2b2caafbbf33
files
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
 private:
     MacDockIconHandler();
 
-    objc_object *m_dockIconClickEventHandler;
+    DockIconClickEventHandler *m_dockIconClickEventHandler;
     QWidget *m_dummyWidget;
     QMenu *m_dockMenu;
 };