fixing warning and compile error against 10.4

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

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
old mode 100755 (executable)
new mode 100644 (file)
index 3611b8f..d927a8b
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        webkit.h
+// Name:        wx/html/webkit.h

 // Purpose:     wxWebKitCtrl - embeddable web kit control
 // Author:      Jethro Grassie / Kevin Ollivier
 // Modified by:
 // Purpose:     wxWebKitCtrl - embeddable web kit control
 // Author:      Jethro Grassie / Kevin Ollivier
 // Modified by:


@@ -18,16 +18,15 @@
 #error "wxWebKitCtrl not implemented for this platform"
 #endif
 
 #error "wxWebKitCtrl not implemented for this platform"
 #endif
 

-#ifdef __WXCOCOA
-#include <WebKit/WebKit.h>
-#endif

 #include "wx/control.h"
 
 // ----------------------------------------------------------------------------
 // Web Kit Control
 // ----------------------------------------------------------------------------
 
 #include "wx/control.h"
 
 // ----------------------------------------------------------------------------
 // Web Kit Control
 // ----------------------------------------------------------------------------
 

-class wxWebKitCtrl : public wxControl
+extern WXDLLIMPEXP_DATA_CORE(const char) wxWebKitCtrlNameStr[];
+
+class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl

 {
 public:
     DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
 {
 public:
     DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)


@@ -39,7 +38,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
                     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);
     };


@@ -49,7 +48,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 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);


@@ -62,12 +61,42 @@ public:
     void Stop();
     bool CanGetPageSource();
     wxString GetPageSource();
     void Stop();
     bool CanGetPageSource();
     wxString GetPageSource();

-    void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString);
-       wxString GetPageURL(){ return m_currentURL; }
-       wxString GetPageTitle(){ return m_pageTitle; }
+    void SetPageSource(const wxString& source, const wxString& baseUrl = wxEmptyString);
+    wxString GetPageURL(){ return m_currentURL; }
+    void SetPageTitle(const wxString& title) { m_pageTitle = title; }
+    wxString GetPageTitle(){ return m_pageTitle; }
+
+    // since these worked in 2.6, add wrappers
+    void SetTitle(const wxString& title) { SetPageTitle(title); }
+    wxString GetTitle() { return GetPageTitle(); }
+
+    wxString GetSelection();
+
+    bool CanIncreaseTextSize();
+    void IncreaseTextSize();
+    bool CanDecreaseTextSize();
+    void DecreaseTextSize();
+
+    void Print(bool showPrompt = false);
+
+    void MakeEditable(bool enable = true);
+    bool IsEditable();
+
+    wxString RunScript(const wxString& javascript);
+
+    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);
 
     //we need to resize the webview when the control size changes
     void OnSize(wxSizeEvent &event);

+    void OnMove(wxMoveEvent &event);
+    void OnMouseEvents(wxMouseEvent &event);

 protected:
     DECLARE_EVENT_TABLE()
     void MacVisibilityChanged();
 protected:
     DECLARE_EVENT_TABLE()
     void MacVisibilityChanged();


@@ -77,7 +106,12 @@ private:
     wxWindowID m_windowID;
     wxString m_currentURL;
     wxString m_pageTitle;
     wxWindowID m_windowID;
     wxString m_currentURL;
     wxString m_pageTitle;

+

     struct objc_object *m_webView;
     struct objc_object *m_webView;

+
+    // 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.
 };
     //It should be WebView*, but WebView is an Objective-C class
     //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };


@@ -95,7 +129,40 @@ enum {
         wxWEBKIT_STATE_FAILED = 32
 };
 
         wxWEBKIT_STATE_FAILED = 32
 };
 

-class wxWebKitStateChangedEvent : public wxCommandEvent
+enum {
+    wxWEBKIT_NAV_LINK_CLICKED = 1,
+    wxWEBKIT_NAV_BACK_NEXT = 2,
+    wxWEBKIT_NAV_FORM_SUBMITTED = 4,
+    wxWEBKIT_NAV_RELOAD = 8,
+    wxWEBKIT_NAV_FORM_RESUBMITTED = 16,
+    wxWEBKIT_NAV_OTHER = 32
+
+};
+
+
+
+class WXDLLIMPEXP_CORE wxWebKitBeforeLoadEvent : public wxCommandEvent
+{
+    DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent )
+
+public:
+    bool IsCancelled() { return m_cancelled; }
+    void Cancel(bool cancel = true) { m_cancelled = cancel; }
+    wxString GetURL() { return m_url; }
+    void SetURL(const wxString& url) { m_url = url; }
+    void SetNavigationType(int navType) { m_navType = navType; }
+    int GetNavigationType() { return m_navType; }
+
+    wxWebKitBeforeLoadEvent( wxWindow* win = NULL );
+    wxEvent *Clone(void) const { return new wxWebKitBeforeLoadEvent(*this); }
+
+protected:
+    bool m_cancelled;
+    wxString m_url;
+    int m_navType;
+};
+
+class WXDLLIMPEXP_CORE wxWebKitStateChangedEvent : public wxCommandEvent

 {
     DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent )
 
 {
     DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent )
 


@@ -105,7 +172,7 @@ public:
     wxString GetURL() { return m_url; }
     void SetURL(const wxString& url) { m_url = url; }
 
     wxString GetURL() { return m_url; }
     void SetURL(const wxString& url) { m_url = url; }
 

-    wxWebKitStateChangedEvent( wxWindow* win = (wxWindow*) NULL );
+    wxWebKitStateChangedEvent( wxWindow* win = NULL );

     wxEvent *Clone(void) const { return new wxWebKitStateChangedEvent(*this); }
 
 protected:
     wxEvent *Clone(void) const { return new wxWebKitStateChangedEvent(*this); }
 
 protected:


@@ -113,20 +180,62 @@ protected:
     wxString m_url;
 };
 
     wxString m_url;
 };
 

+
+class WXDLLIMPEXP_CORE wxWebKitNewWindowEvent : public wxCommandEvent
+{
+    DECLARE_DYNAMIC_CLASS( wxWebViewNewWindowEvent )
+public:
+    wxString GetURL() const { return m_url; }
+    void SetURL(const wxString& url) { m_url = url; }
+    wxString GetTargetName() const { return m_targetName; }
+    void SetTargetName(const wxString& name) { m_targetName = name; }
+
+    wxWebKitNewWindowEvent( wxWindow* win = (wxWindow*)(NULL));
+    wxEvent *Clone(void) const { return new wxWebKitNewWindowEvent(*this); }
+
+private:
+    wxString m_url;
+    wxString m_targetName;
+};
+

 typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&);
 typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&);

+typedef void (wxEvtHandler::*wxWebKitBeforeLoadEventFunction)(wxWebKitBeforeLoadEvent&);
+typedef void (wxEvtHandler::*wxWebKitNewWindowEventFunction)(wxWebKitNewWindowEvent&);
+
+#define wxWebKitStateChangedEventHandler( func ) \
+    wxEVENT_HANDLER_CAST( wxWebKitStateChangedEventFunction, func )
+
+#define wxWebKitBeforeLoadEventHandler( func ) \
+    wxEVENT_HANDLER_CAST( wxWebKitBeforeLoadEventFunction, func )
+
+#define wxWebKitNewWindowEventHandler( func ) \
+    wxEVENT_HANDLER_CAST( wxWebKitNewWindowEventFunction, func )

 
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_STATE_CHANGED, wxID_ANY)
-END_DECLARE_EVENT_TYPES()
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_STATE_CHANGED, wxWebKitStateChangedEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_BEFORE_LOAD, wxWebKitBeforeLoadEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_NEW_WINDOW, wxWebKitNewWindowEvent );

 
 #define EVT_WEBKIT_STATE_CHANGED(func) \
 
 #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, \
                             wxID_ANY, \
                             wxID_ANY, \

-                            (wxObjectEventFunction)   \
-                            (wxWebKitStateChangedEventFunction) & func, \
-                            (wxObject *) NULL ),
+                            wxWebKitStateChangedEventHandler( func ), \
+                            NULL ),

 
 

+#define EVT_WEBKIT_BEFORE_LOAD(func) \
+            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \
+                            wxID_ANY, \
+                            wxID_ANY, \
+                            wxWebKitBeforeLoadEventHandler( func ), \
+                            NULL ),
+
+#define EVT_WEBKIT_NEW_WINDOW(func)                              \
+            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_NEW_WINDOW, \
+                            wxID_ANY, \
+                            wxID_ANY, \
+                            wxWebKitNewWindowEventFunction( func ), \
+                            NULL ),

 #endif // wxUSE_WEBKIT
 
 #endif // wxUSE_WEBKIT
 

-#endif // _WX_WEBKIT_H_
+#endif
+    // _WX_WEBKIT_H_