Don't define __STRICT_ANSI__, we should build both with and without it.

[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 c7340f0dd1069cb0f697fa8f10a53579ac3ef501..6e8bb8be7a74de22c3144fff947c19f30e709189 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -2,7 +2,6 @@
 // Name:        include/gtk/wx/webview.h
 // Purpose:     GTK webkit backend for web view component
 // Author:      Robert Roebling, Marianne Gagnon
 // Name:        include/gtk/wx/webview.h
 // Purpose:     GTK webkit backend for web view component
 // Author:      Robert Roebling, Marianne Gagnon

-// Id:          $Id$

 // Copyright:   (c) 2010 Marianne Gagnon, 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2010 Marianne Gagnon, 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -10,7 +9,7 @@
 #ifndef _WX_GTK_WEBKITCTRL_H_
 #define _WX_GTK_WEBKITCTRL_H_
 
 #ifndef _WX_GTK_WEBKITCTRL_H_
 #define _WX_GTK_WEBKITCTRL_H_
 

-#include "wx/setup.h"
+#include "wx/defs.h"

 
 #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
 
 #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 


@@ -26,7 +25,7 @@ typedef struct _WebKitWebView WebKitWebView;
 class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:
 class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:

-    wxWebViewWebKit() { Init(); }
+    wxWebViewWebKit();

 
     wxWebViewWebKit(wxWindow *parent,
            wxWindowID id = wxID_ANY,
 
     wxWebViewWebKit(wxWindow *parent,
            wxWindowID id = wxID_ANY,


@@ -35,8 +34,6 @@ public:
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr)
     {
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr)
     {

-        Init();
-

         Create(parent, id, url, pos, size, style, name);
     }
 
         Create(parent, id, url, pos, size, style, name);
     }
 


@@ -47,6 +44,8 @@ public:
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr);
 
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxString& name = wxWebViewNameStr);
 

+    virtual ~wxWebViewWebKit();
+

     virtual bool Enable( bool enable = true );
 
     // implementation
     virtual bool Enable( bool enable = true );
 
     // implementation


@@ -59,10 +58,11 @@ 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();

+    virtual void EnableContextMenu(bool enable = true);

     virtual void EnableHistory(bool enable = true);
     virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
     virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
     virtual void EnableHistory(bool enable = true);
     virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
     virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();


@@ -71,9 +71,6 @@ public:
     virtual wxString GetCurrentTitle() const;
     virtual wxString GetPageSource() const;
     virtual wxString GetPageText() const;
     virtual wxString GetCurrentTitle() const;
     virtual wxString GetPageSource() const;
     virtual wxString GetPageText() const;

-    //We do not want to hide the other overloads
-    using wxWebView::SetPage;
-    virtual void SetPage(const wxString& html, const wxString& baseUrl);

     virtual void Print();
     virtual bool IsBusy() const;
 
     virtual void Print();
     virtual bool IsBusy() const;
 


@@ -97,6 +94,9 @@ public:
     virtual void Undo();
     virtual void Redo();
 
     virtual void Undo();
     virtual void Redo();
 

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

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


@@ -115,6 +115,8 @@ public:
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
     virtual wxVector<wxSharedPtr<wxWebViewHandler> > GetHandlers() { return m_handlerList; }
 
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
     virtual wxVector<wxSharedPtr<wxWebViewHandler> > GetHandlers() { return m_handlerList; }
 

+    virtual void* GetNativeBackend() const { return m_web_view; }
+

     /** TODO: check if this can be made private
      * The native control has a getter to check for busy state, but except in
      * very recent versions of webkit this getter doesn't say everything we need
     /** TODO: check if this can be made private
      * The native control has a getter to check for busy state, but except in
      * very recent versions of webkit this getter doesn't say everything we need


@@ -130,6 +132,7 @@ public:
     bool m_guard;
 
 protected:
     bool m_guard;
 
 protected:

+    virtual void DoSetPage(const wxString& html, const wxString& baseUrl);

 
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 


@@ -140,6 +143,9 @@ private:
     void SetWebkitZoom(float level);
     float GetWebkitZoom() const;
 
     void SetWebkitZoom(float level);
     float GetWebkitZoom() const;
 

+    //Find helper function
+    void FindClear();
+

     // focus event handler: calls GTKUpdateBitmap()
     void GTKOnFocus(wxFocusEvent& event);
 
     // focus event handler: calls GTKUpdateBitmap()
     void GTKOnFocus(wxFocusEvent& event);
 


@@ -148,9 +154,30 @@ private:
 
     wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;
 
 
     wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;
 

+    //variables used for Find()
+    int m_findFlags;
+    wxString m_findText;
+    int m_findPosition;
+    int m_findCount;
+

     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