No real changes, just add wxSizerItem::AddBorderToSize() helper.

[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 14c7651be8adea903213c467dda160e323243875..d130b827e362ae3932b62d0791eeb9722f9be72d 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -12,17 +12,18 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

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

 
 

-#include "webkit/webkit.h"

 #include "wx/sharedptr.h"
 #include "wx/webview.h"
 
 #include "wx/sharedptr.h"
 #include "wx/webview.h"
 

+typedef struct _WebKitWebView WebKitWebView;
+

 //-----------------------------------------------------------------------------
 // wxWebViewWebKit
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxWebViewWebKit
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_WEB wxWebViewWebKit : public wxWebView
+class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView

 {
 public:
     wxWebViewWebKit() { Init(); }
 {
 public:
     wxWebViewWebKit() { Init(); }


@@ -46,6 +47,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


@@ -54,80 +57,64 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

-    // helper to allow access to protected member from GTK callback
-    void MoveWindow(int x, int y, int width, int height)
-    {
-        DoMoveWindow(x, y, width, height);
-    }
-
-    void ZoomIn();
-    void ZoomOut();
-    void SetWebkitZoom(float level);
-    float GetWebkitZoom();
-

     virtual void Stop();
     virtual void Stop();

-    virtual void LoadUrl(const wxString& url);
+    virtual void LoadURL(const wxString& url);

     virtual void GoBack();
     virtual void GoForward();
     virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);
     virtual void GoBack();
     virtual void GoForward();
     virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT);

-    virtual bool CanGoBack();
-    virtual bool CanGoForward();
+    virtual bool CanGoBack() const;
+    virtual bool CanGoForward() const;

     virtual void ClearHistory();
     virtual void EnableHistory(bool enable = true);
     virtual void ClearHistory();
     virtual void EnableHistory(bool enable = true);

-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory();
-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory();
-    virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item);
-    virtual wxString GetCurrentURL();
-    virtual wxString GetCurrentTitle();
-    virtual wxString GetPageSource();
-    virtual wxString GetPageText();
-    //We do not want to hide the other overloads
-    using wxWebView::SetPage;
-    virtual void SetPage(const wxString& html, const wxString& baseUrl);
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
+    virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
+    virtual wxString GetCurrentURL() const;
+    virtual wxString GetCurrentTitle() const;
+    virtual wxString GetPageSource() const;
+    virtual wxString GetPageText() const;

     virtual void Print();
     virtual void Print();

-    virtual bool IsBusy();
+    virtual bool IsBusy() const;

 
     void SetZoomType(wxWebViewZoomType);
     wxWebViewZoomType GetZoomType() const;
     bool CanSetZoomType(wxWebViewZoomType) const;
 
     void SetZoomType(wxWebViewZoomType);
     wxWebViewZoomType GetZoomType() const;
     bool CanSetZoomType(wxWebViewZoomType) const;

-    virtual wxWebViewZoom GetZoom();
+    virtual wxWebViewZoom GetZoom() const;

     virtual void SetZoom(wxWebViewZoom);
 
     //Clipboard functions
     virtual void SetZoom(wxWebViewZoom);
 
     //Clipboard functions

-    virtual bool CanCut();
-    virtual bool CanCopy();
-    virtual bool CanPaste();
+    virtual bool CanCut() const;
+    virtual bool CanCopy() const;
+    virtual bool CanPaste() const;

     virtual void Cut();
     virtual void Copy();
     virtual void Paste();
 
     //Undo / redo functionality
     virtual void Cut();
     virtual void Copy();
     virtual void Paste();
 
     //Undo / redo functionality

-    virtual bool CanUndo();
-    virtual bool CanRedo();
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;

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

-    virtual bool IsEditable();
+    virtual bool IsEditable() const;

 
     //Selection
     virtual void DeleteSelection();
 
     //Selection
     virtual void DeleteSelection();

-    virtual bool HasSelection();
+    virtual bool HasSelection() const;

     virtual void SelectAll();
     virtual void SelectAll();

-    virtual wxString GetSelectedText();
-    virtual wxString GetSelectedSource();
+    virtual wxString GetSelectedText() const;
+    virtual wxString GetSelectedSource() const;

     virtual void ClearSelection();
 
     virtual void RunScript(const wxString& javascript);
     virtual void ClearSelection();
 
     virtual void RunScript(const wxString& javascript);

-    
-    //Virtual Filesystem Support
-    virtual void RegisterHandler(wxWebHandler* handler);
-    virtual wxVector<wxWebHandler*> GetHandlers() { return m_handlerList; }

 
 

-    /** FIXME: hack to work around signals being received too early */
-    bool m_ready;
+    //Virtual Filesystem Support
+    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
 
     /** TODO: check if this can be made private
      * The native control has a getter to check for busy state, but except in


@@ -137,27 +124,35 @@ public:
      */
     bool m_busy;
 
      */
     bool m_busy;
 

+    wxString m_vfsurl;
+

     //We use this flag to stop recursion when we load a page from the navigation
     //callback, mainly when loading a VFS page
     bool m_guard;
 
 protected:
     //We use this flag to stop recursion when we load a page from the navigation
     //callback, mainly when loading a VFS page
     bool m_guard;
 
 protected:

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

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

+    void ZoomIn();
+    void ZoomOut();
+    void SetWebkitZoom(float level);
+    float GetWebkitZoom() const;
+

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

-    GtkWidget *web_view;
-    gint m_historyLimit;
+    WebKitWebView *m_web_view;
+    int m_historyLimit;

 
 

-    wxVector<wxWebHandler*> m_handlerList;
+    wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;

 
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
 };
 
 
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
 };
 

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

 
 #endif
 
 #endif