No changes, just refactor wxGrid::DrawAllGridLines().

[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 f1aaead3a3cddf3c7a2c9d09eea1df107c5225bd..c7340f0dd1069cb0f697fa8f10a53579ac3ef501 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -14,10 +14,11 @@
 
 #if wxUSE_WEBVIEW && 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
 //-----------------------------------------------------------------------------


@@ -109,15 +110,11 @@ public:
     virtual void ClearSelection();
 
     virtual void RunScript(const wxString& javascript);
     virtual void ClearSelection();
 
     virtual void RunScript(const wxString& javascript);

-    
+

     //Virtual Filesystem Support
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
     virtual wxVector<wxSharedPtr<wxWebViewHandler> > GetHandlers() { return m_handlerList; }
 
     //Virtual Filesystem Support
     virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
     virtual wxVector<wxSharedPtr<wxWebViewHandler> > GetHandlers() { return m_handlerList; }
 

-    /** FIXME: hack to work around signals being received too early */
-    bool m_ready;
-
-

     /** 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


@@ -146,8 +143,8 @@ private:
     // 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<wxSharedPtr<wxWebViewHandler> > m_handlerList;
 
 
     wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;