wxBestHelpController now used as default on Windows

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

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 672b6c8840782d9687db2e418856e8a94fa4c34c..4b7b2fc79575f6395345681290af0ec59be89821 100755 (executable)
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -16,6 +16,8 @@
 #pragma interface "webkit.h"
 #endif
 
 #pragma interface "webkit.h"
 #endif
 

+#if wxUSE_WEBKIT
+

 #if !defined(__WXMAC__) && !defined(__WXCOCOA__)
 #error "wxWebKitCtrl not implemented for this platform"
 #endif
 #if !defined(__WXMAC__) && !defined(__WXCOCOA__)
 #error "wxWebKitCtrl not implemented for this platform"
 #endif


@@ -53,32 +55,35 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("webkitctrl"));
     virtual ~wxWebKitCtrl();
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxT("webkitctrl"));
     virtual ~wxWebKitCtrl();

-    
+

     void LoadURL(const wxString &url);
     void LoadURL(const wxString &url);

-    
+

     bool CanGoBack();
     bool CanGoForward();
     bool GoBack();
     bool GoForward();
     bool CanGoBack();
     bool CanGoForward();
     bool GoBack();
     bool GoForward();

-    void Reload(); 
+    void Reload();

     void Stop();
     bool CanGetPageSource();
     wxString GetPageSource();
     void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString);
     void Stop();
     bool CanGetPageSource();
     wxString GetPageSource();
     void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString);

-    
+       wxString GetPageURL(){ return m_currentURL; }
+       wxString GetPageTitle(){ return m_pageTitle; }
+

     //we need to resize the webview when the control size changes
     //we need to resize the webview when the control size changes

-    //void OnSize(wxSizeEvent &event);
+    void OnSize(wxSizeEvent &event);

 protected:
     DECLARE_EVENT_TABLE()
 protected:
     DECLARE_EVENT_TABLE()

+    void MacVisibilityChanged();

 
 private:
     wxWindow *m_parent;
     wxWindowID m_windowID;
     wxString m_currentURL;
     wxString m_pageTitle;
 
 private:
     wxWindow *m_parent;
     wxWindowID m_windowID;
     wxString m_currentURL;
     wxString m_pageTitle;

-    void* m_webView;
-    //It should be WebView, but WebView is Cocoa only, so any class which included
-    //this header would have to link to Cocoa, so for now use void* instead.
+    struct objc_object *m_webView;
+    //It should be WebView*, but WebView is an Objective-C class
+    //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.

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


@@ -115,15 +120,17 @@ protected:
 typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&);
 
 BEGIN_DECLARE_EVENT_TYPES()
 typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&);
 
 BEGIN_DECLARE_EVENT_TYPES()

-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_STATE_CHANGED, -1)
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_STATE_CHANGED, wxID_ANY)

 END_DECLARE_EVENT_TYPES()
 
 #define EVT_WEBKIT_STATE_CHANGED(func) \
             DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \
 END_DECLARE_EVENT_TYPES()
 
 #define EVT_WEBKIT_STATE_CHANGED(func) \
             DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \

-                            -1,                       \
-                            -1,                       \
+                            wxID_ANY, \
+                            wxID_ANY, \

                             (wxObjectEventFunction)   \
                             (wxWebKitStateChangedEventFunction) & func, \
                             (wxObject *) NULL ),
 
                             (wxObjectEventFunction)   \
                             (wxWebKitStateChangedEventFunction) & func, \
                             (wxObject *) NULL ),
 

+#endif // wxUSE_WEBKIT
+

 #endif // _WX_WEBKIT_H_
 #endif // _WX_WEBKIT_H_