Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / gtk / webview_webkit.h

diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index c42f0ad5646c60440ecf3de2e76d1aba4dbf7246..24d30c89d96a20d579fa20e8e5b37cf3c6dd9e16 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -59,7 +59,7 @@ public:
     virtual void LoadURL(const wxString& url);
     virtual void GoBack();
     virtual void GoForward();
     virtual void LoadURL(const wxString& url);
     virtual void GoBack();
     virtual void GoForward();

-    virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
+    virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT);

     virtual bool CanGoBack() const;
     virtual bool CanGoForward() const;
     virtual void ClearHistory();
     virtual bool CanGoBack() const;
     virtual bool CanGoForward() const;
     virtual void ClearHistory();


@@ -96,7 +96,7 @@ public:
     virtual void Redo();
 
     //Find function
     virtual void Redo();
 
     //Find function

-    virtual long Find(const wxString& text, int flags = wxWEB_VIEW_FIND_DEFAULT);
+    virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT);

 
     //Editing functions
     virtual void SetEditable(bool enable = true);
 
     //Editing functions
     virtual void SetEditable(bool enable = true);


@@ -164,6 +164,21 @@ private:
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
 };
 
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
 };
 

+class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory
+{
+public:
+    virtual wxWebView* Create() { return new wxWebViewWebKit; }
+    virtual wxWebView* Create(wxWindow* parent,
+                              wxWindowID id,
+                              const wxString& url = wxWebViewDefaultURLStr,
+                              const wxPoint& pos = wxDefaultPosition,
+                              const wxSize& size = wxDefaultSize,
+                              long style = 0,
+                              const wxString& name = wxWebViewNameStr)
+    { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); }
+};
+
+

 #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
 #endif
 #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
 #endif