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

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

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 6ab9f806dba1a602d363eee73832f301d69e4ced..87003672b49cb52cda18eed7b6808abf8ae07e47 100644 (file)
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -4,7 +4,6 @@
 // Author:      Jethro Grassie / Kevin Ollivier
 // Modified by:
 // Created:     2004-4-16
 // Author:      Jethro Grassie / Kevin Ollivier
 // Modified by:
 // Created:     2004-4-16

-// RCS-ID:      $Id$

 // Copyright:   (c) Jethro Grassie / Kevin Ollivier
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Jethro Grassie / Kevin Ollivier
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -19,34 +18,37 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

+DECLARE_WXCOCOA_OBJC_CLASS(WebView); 

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

+extern WXDLLIMPEXP_DATA_CORE(const char) wxWebKitCtrlNameStr[];
+

 class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl
 {
 public:
     DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
 
 class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl
 {
 public:
     DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
 

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

     wxWebKitCtrl(wxWindow *parent,
                     wxWindowID winID,
                     const wxString& strURL,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
     wxWebKitCtrl(wxWindow *parent,
                     wxWindowID winID,
                     const wxString& strURL,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,

-                    const wxString& name = wxT("webkitctrl"))
+                    const wxString& name = wxWebKitCtrlNameStr)

     {
         Create(parent, winID, strURL, pos, size, style, validator, name);
     {
         Create(parent, winID, strURL, pos, size, style, validator, name);

-    };
+    }

     bool Create(wxWindow *parent,
                 wxWindowID winID,
                 const wxString& strURL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
     bool Create(wxWindow *parent,
                 wxWindowID winID,
                 const wxString& strURL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = wxT("webkitctrl"));
+                const wxString& name = wxWebKitCtrlNameStr);

     virtual ~wxWebKitCtrl();
 
     void LoadURL(const wxString &url);
     virtual ~wxWebKitCtrl();
 
     void LoadURL(const wxString &url);


@@ -75,9 +77,9 @@ public:
     bool CanDecreaseTextSize();
     void DecreaseTextSize();
 
     bool CanDecreaseTextSize();
     void DecreaseTextSize();
 

-    void Print(bool showPrompt=FALSE);
+    void Print(bool showPrompt = false);

 
 

-    void MakeEditable(bool enable=TRUE);
+    void MakeEditable(bool enable = true);

     bool IsEditable();
 
     wxString RunScript(const wxString& javascript);
     bool IsEditable();
 
     wxString RunScript(const wxString& javascript);


@@ -85,6 +87,12 @@ public:
     void SetScrollPos(int pos);
     int GetScrollPos();
 
     void SetScrollPos(int pos);
     int GetScrollPos();
 

+    // don't hide base class virtuals
+    virtual void SetScrollPos( int orient, int pos, bool refresh = true )
+        { return wxControl::SetScrollPos(orient, pos, refresh); }
+    virtual int GetScrollPos( int orient ) const
+        { return wxControl::GetScrollPos(orient); }
+

     //we need to resize the webview when the control size changes
     void OnSize(wxSizeEvent &event);
     void OnMove(wxMoveEvent &event);
     //we need to resize the webview when the control size changes
     void OnSize(wxSizeEvent &event);
     void OnMove(wxMoveEvent &event);


@@ -99,13 +107,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.

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


@@ -175,7 +181,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; }


@@ -208,24 +214,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