From eebb8902d970787df1e70b83e011ce051ebead21 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Wed, 11 Nov 2009 02:12:56 +0000 Subject: [PATCH] Use wxWebKitCtrlNameStr to adhere to the convention used by other wx classes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/html/webkit.h | 6 ++++-- src/html/htmlctrl/webkit/webkit.mm | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h index 544c9d57a3..3511f7fd92 100644 --- a/include/wx/html/webkit.h +++ b/include/wx/html/webkit.h @@ -24,6 +24,8 @@ // Web Kit Control // ---------------------------------------------------------------------------- +extern WXDLLIMPEXP_DATA_CORE(const char) wxWebKitCtrlNameStr[]; + class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl { public: @@ -36,7 +38,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 +48,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); diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm index b577a122e5..59192ca436 100644 --- a/src/html/htmlctrl/webkit/webkit.mm +++ b/src/html/htmlctrl/webkit/webkit.mm @@ -37,6 +37,8 @@ #define DEBUG_WEBKIT_SIZING 0 +extern WXDLLEXPORT_DATA(const char) wxWebKitCtrlNameStr[] = "webkitctrl"; + // ---------------------------------------------------------------------------- // macros // ----------------------------------------------------------------------------