X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29391f32dd4d0087f6fb1660a688dd3c87e87577..125e7c11c16f23daa4c594f3b8d90194099c2394:/include/wx/html/webkit.h diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h index 6ab9f806db..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); @@ -75,9 +77,9 @@ public: bool CanDecreaseTextSize(); void DecreaseTextSize(); - void Print(bool showPrompt=FALSE); + void Print(bool showPrompt = false); - void MakeEditable(bool enable=TRUE); + void MakeEditable(bool enable = true); bool IsEditable(); wxString RunScript(const wxString& javascript); @@ -85,6 +87,12 @@ public: void SetScrollPos(int pos); int GetScrollPos(); + // don't hide base class virtuals + virtual void SetScrollPos( int orient, int pos, bool refresh = true ) + { return wxControl::SetScrollPos(orient, pos, refresh); } + virtual int GetScrollPos( int orient ) const + { return wxControl::GetScrollPos(orient); } + //we need to resize the webview when the control size changes void OnSize(wxSizeEvent &event); void OnMove(wxMoveEvent &event);