activating DrawRectangle optimization

[wxWidgets.git] / include / wx / html / webkit.h

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 3511f7fd9209268908cffae04a04f6b253a964ab..2fd45ff5dfa7e099bc6db53777a97492950e93b5 100644 (file)
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -19,6 +19,7 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

+DECLARE_WXCOCOA_OBJC_CLASS(WebView); 

 
 // ----------------------------------------------------------------------------
 // Web Kit Control
 
 // ----------------------------------------------------------------------------
 // Web Kit Control


@@ -31,7 +32,7 @@ class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl
 public:
     DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
 

-    wxWebKitCtrl() {};
+    wxWebKitCtrl() {}

     wxWebKitCtrl(wxWindow *parent,
                     wxWindowID winID,
                     const wxString& strURL,
     wxWebKitCtrl(wxWindow *parent,
                     wxWindowID winID,
                     const wxString& strURL,


@@ -41,7 +42,7 @@ public:
                     const wxString& name = wxWebKitCtrlNameStr)
     {
         Create(parent, winID, strURL, pos, size, style, validator, name);
                     const wxString& name = wxWebKitCtrlNameStr)
     {
         Create(parent, winID, strURL, pos, size, style, validator, name);

-    };
+    }

     bool Create(wxWindow *parent,
                 wxWindowID winID,
                 const wxString& strURL,
     bool Create(wxWindow *parent,
                 wxWindowID winID,
                 const wxString& strURL,


@@ -107,13 +108,11 @@ private:
     wxString m_currentURL;
     wxString m_pageTitle;
 
     wxString m_currentURL;
     wxString m_pageTitle;
 

-    struct objc_object *m_webView;
+    WX_WebView m_webView;

 
     // we may use this later to setup our own mouse events,
     // so leave it in for now.
     void* m_webKitCtrlEventHandler;
 
     // we may use this later to setup our own mouse events,
     // so leave it in for now.
     void* m_webKitCtrlEventHandler;

-    //It should be WebView*, but WebView is an Objective-C class
-    //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -183,7 +182,7 @@ protected:
 
 class WXDLLIMPEXP_CORE wxWebKitNewWindowEvent : public wxCommandEvent
 {
 
 class WXDLLIMPEXP_CORE wxWebKitNewWindowEvent : public wxCommandEvent
 {

-    DECLARE_DYNAMIC_CLASS( wxWebViewNewWindowEvent )
+    DECLARE_DYNAMIC_CLASS( wxWebKitNewWindowEvent )

 public:
     wxString GetURL() const { return m_url; }
     void SetURL(const wxString& url) { m_url = url; }
 public:
     wxString GetURL() const { return m_url; }
     void SetURL(const wxString& url) { m_url = url; }


@@ -216,24 +215,24 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_BEFORE_LOAD, wxWebKitBe
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_NEW_WINDOW, wxWebKitNewWindowEvent );
 
 #define EVT_WEBKIT_STATE_CHANGED(func) \
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_NEW_WINDOW, wxWebKitNewWindowEvent );
 
 #define EVT_WEBKIT_STATE_CHANGED(func) \

-            DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \
+            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \

                             wxID_ANY, \
                             wxID_ANY, \
                             wxWebKitStateChangedEventHandler( func ), \
                             NULL ),
 
 #define EVT_WEBKIT_BEFORE_LOAD(func) \
                             wxID_ANY, \
                             wxID_ANY, \
                             wxWebKitStateChangedEventHandler( func ), \
                             NULL ),
 
 #define EVT_WEBKIT_BEFORE_LOAD(func) \

-            DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \
+            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \

                             wxID_ANY, \
                             wxID_ANY, \
                             wxWebKitBeforeLoadEventHandler( func ), \
                             NULL ),
 
 #define EVT_WEBKIT_NEW_WINDOW(func)                              \
                             wxID_ANY, \
                             wxID_ANY, \
                             wxWebKitBeforeLoadEventHandler( func ), \
                             NULL ),
 
 #define EVT_WEBKIT_NEW_WINDOW(func)                              \

-            DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_NEW_WINDOW, \
+            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_NEW_WINDOW, \

                             wxID_ANY, \
                             wxID_ANY, \
                             wxID_ANY, \
                             wxID_ANY, \

-                            wxWebKitNewWindowEventFunction( func ), \
+                            wxWebKitNewWindowEventHandler( func ), \

                             NULL ),
 #endif // wxUSE_WEBKIT
 
                             NULL ),
 #endif // wxUSE_WEBKIT