Corrected disabling of controls in cell editor.

[wxWidgets.git] / include / wx / osx / webviewhistoryitem_webkit.h

diff --git a/include/wx/osx/webviewhistoryitem_webkit.h b/include/wx/osx/webviewhistoryitem_webkit.h
index 9ae2577496268f3cde7d93ff7edbe7f0ca19ae50..f1c2d5f65509edb58dd4e36fd0bd3da1895ee876 100644 (file)
--- a/include/wx/osx/webviewhistoryitem_webkit.h
+++ b/include/wx/osx/webviewhistoryitem_webkit.h
@@ -2,7 +2,6 @@
 // Name:        include/wx/osx/webviewhistoryitem.h
 // Purpose:     wxWebViewHistoryItem header for OSX
 // Author:      Steven Lamerton
-// Id:          $Id$
 // Copyright:   (c) 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,8 +11,10 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
-                         ||  defined(__WXOSX_CARBON__))
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
+                                          ||  defined(__WXOSX_CARBON__))
+
+#include "wx/osx/core/objcid.h"
 
 class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
 {
@@ -27,9 +28,9 @@ public:
 
 private:
     wxString m_url, m_title;
-    struct objc_object *m_histItem;
+    wxObjCID m_histItem;
 };
 
-#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
 
 #endif // _WX_OSX_WEBVIEWHISTORYITEM_H_