Add missing wxRTTI macros and fix incorrect ones.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index 6d8de612771b3b80476ae46975b966dcf410b3de..8f1e5f9e41674f1d9156cabc46049703802de93f 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -148,10 +148,9 @@ private:
     GtkWidget *web_view;
     gint m_historyLimit;
 
-    // FIXME: try to get DECLARE_DYNAMIC_CLASS macros & stuff right
-    //DECLARE_DYNAMIC_CLASS(wxWebViewWebKit)
+    wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
 };
 
-#endif // if wxHAVE_WEB_BACKEND_GTK_WEBKIT
+#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
 #endif

diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index 67f33050498bb4ab922d881f96eec2d7774614bb..f327502df4f0b6b944f4d3db5989b8c24236306b 100644 (file)
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -157,6 +157,7 @@ private:
     void ExecCommand(wxString command);
     IHTMLDocument2* GetDocument();
 
+    wxDECLARE_DYNAMIC_CLASS(wxWebViewIE);
 };
 
 class VirtualProtocol : public IInternetProtocol, public IInternetProtocolInfo

diff --git a/include/wx/webview.h b/include/wx/webview.h
index 5ece8ec25788161fdc25c84fec33ff597b04b99a..0bc9f8547e4992ac60ecf873c4ab0a784ba062c3 100644 (file)
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -341,6 +341,8 @@ public:
 
     //Virtual Filesystem Support
     virtual void RegisterHandler(wxWebHandler* handler) = 0;
+
+    wxDECLARE_ABSTRACT_CLASS(wxWebView);
 };
 
 class WXDLLIMPEXP_WEB wxWebNavigationEvent : public wxCommandEvent

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 8abac2300c14be95ee099d99e1f98908384cdd0e..4ceb94c320cf35b4b55a186130739f8bdcc3bc36 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -29,7 +29,8 @@ WX_CHECK_BUILD_OPTIONS("wxWEB")
 extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView";
 extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank";
 
-IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl);
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent);
 
 wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent );
 wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent );

diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index 5c7819ee3a25f14dca1bc738ea59d3f9f117793c..944c9cf5409f3c9eeb093834691272089326a7a9 100644 (file)
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -287,7 +287,7 @@ wxgtk_webview_webkit_title_changed(WebKitWebView*,
 // wxWebViewWebKit
 //-----------------------------------------------------------------------------
 
-//IMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);
 
 bool wxWebViewWebKit::Create(wxWindow *parent,
                       wxWindowID id,

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index 9f0c1168b406385aca22cc79d204b6fe30287aaa..276e35296482534da63660b96b7912540f76353b 100644 (file)
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -27,6 +27,8 @@
 #include "wx/msw/missing.h"
 #include "wx/filesys.h"
 
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
+
 //We link to urlmon as it is required for CoInternetGetSession
 #pragma comment(lib, "urlmon")