Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxWebKitCtrlNameStr to adhere to the convention used by other wx classes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-11-11 02:12:56 +00:00
parent db22fdd17d
commit eebb8902d9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/html/webkit.h
View File

@@ -24,6 +24,8 @@
// Web Kit Control // Web Kit Control
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
extern WXDLLIMPEXP_DATA_CORE(const char) wxWebKitCtrlNameStr[];
class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl
{ {
public: public:
@@ -36,7 +38,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxT("webkitctrl")) const wxString& name = wxWebKitCtrlNameStr)
{ {
Create(parent, winID, strURL, pos, size, style, validator, name); Create(parent, winID, strURL, pos, size, style, validator, name);
}; };
@@ -46,7 +48,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxT("webkitctrl")); const wxString& name = wxWebKitCtrlNameStr);
virtual ~wxWebKitCtrl(); virtual ~wxWebKitCtrl();
void LoadURL(const wxString &url); void LoadURL(const wxString &url);

2
src/html/htmlctrl/webkit/webkit.mm
View File

@@ -37,6 +37,8 @@
#define DEBUG_WEBKIT_SIZING 0 #define DEBUG_WEBKIT_SIZING 0
extern WXDLLEXPORT_DATA(const char) wxWebKitCtrlNameStr[] = "webkitctrl";
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// macros // macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------