X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b11752c4f9e1fd4b11ba3d184246267facb3ad3..7da33e042c4e373e2e97e428f5c174f324c69c93:/include/wx/html/webkit.h diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h index f7be957461..2a1fea8f58 100644 --- a/include/wx/html/webkit.h +++ b/include/wx/html/webkit.h @@ -24,7 +24,7 @@ // Web Kit Control // ---------------------------------------------------------------------------- -class wxWebKitCtrl : public wxControl +class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl { public: DECLARE_DYNAMIC_CLASS(wxWebKitCtrl) @@ -85,6 +85,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); @@ -133,7 +139,7 @@ enum { -class wxWebKitBeforeLoadEvent : public wxCommandEvent +class WXDLLIMPEXP_CORE wxWebKitBeforeLoadEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent ) @@ -154,7 +160,7 @@ protected: int m_navType; }; -class wxWebKitStateChangedEvent : public wxCommandEvent +class WXDLLIMPEXP_CORE wxWebKitStateChangedEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent ) @@ -173,7 +179,7 @@ protected: }; -class wxWebKitNewWindowEvent : public wxCommandEvent +class WXDLLIMPEXP_CORE wxWebKitNewWindowEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxWebViewNewWindowEvent ) public: