X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e6efd1fd2f6cedda23140aff17f56b26ef7c2d2..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/html/webkit.h?ds=inline diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h index 544c9d57a3..4f7a3dc8ec 100644 --- a/include/wx/html/webkit.h +++ b/include/wx/html/webkit.h @@ -19,11 +19,14 @@ #endif #include "wx/control.h" +DECLARE_WXCOCOA_OBJC_CLASS(WebView); // ---------------------------------------------------------------------------- // Web Kit Control // ---------------------------------------------------------------------------- +extern WXDLLIMPEXP_DATA_CORE(const char) wxWebKitCtrlNameStr[]; + class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl { public: @@ -36,7 +39,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxT("webkitctrl")) + const wxString& name = wxWebKitCtrlNameStr) { Create(parent, winID, strURL, pos, size, style, validator, name); }; @@ -46,7 +49,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxT("webkitctrl")); + const wxString& name = wxWebKitCtrlNameStr); virtual ~wxWebKitCtrl(); void LoadURL(const wxString &url); @@ -105,13 +108,11 @@ private: wxString m_currentURL; wxString m_pageTitle; - struct objc_object *m_webView; + WX_WebView m_webView; // we may use this later to setup our own mouse events, // so leave it in for now. void* m_webKitCtrlEventHandler; - //It should be WebView*, but WebView is an Objective-C class - //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this. }; // ---------------------------------------------------------------------------- @@ -181,7 +182,7 @@ protected: class WXDLLIMPEXP_CORE wxWebKitNewWindowEvent : public wxCommandEvent { - DECLARE_DYNAMIC_CLASS( wxWebViewNewWindowEvent ) + DECLARE_DYNAMIC_CLASS( wxWebKitNewWindowEvent ) public: wxString GetURL() const { return m_url; } void SetURL(const wxString& url) { m_url = url; } @@ -214,21 +215,21 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_BEFORE_LOAD, wxWebKitBe wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_NEW_WINDOW, wxWebKitNewWindowEvent ); #define EVT_WEBKIT_STATE_CHANGED(func) \ - DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \ + wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \ wxID_ANY, \ wxID_ANY, \ wxWebKitStateChangedEventHandler( func ), \ NULL ), #define EVT_WEBKIT_BEFORE_LOAD(func) \ - DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \ + wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \ wxID_ANY, \ wxID_ANY, \ wxWebKitBeforeLoadEventHandler( func ), \ NULL ), #define EVT_WEBKIT_NEW_WINDOW(func) \ - DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_NEW_WINDOW, \ + wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_NEW_WINDOW, \ wxID_ANY, \ wxID_ANY, \ wxWebKitNewWindowEventFunction( func ), \