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

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 544c9d57a39518869aa5fb841994873d0e247c32..3511f7fd9209268908cffae04a04f6b253a964ab 100644 (file)
--- 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 b577a122e525e55c531f49f57277292d2f47375b..59192ca436e7a63886eeccee6b15374b7bee9842 100644 (file)
--- 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
 // ----------------------------------------------------------------------------