From cddf4541fa485c1889ff9017e53a430709da1fa6 Mon Sep 17 00:00:00 2001
From: Steve Lamerton <steve.lamerton@gmail.com>
Date: Mon, 1 Aug 2011 15:49:05 +0000
Subject: [PATCH] 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
---
 include/wx/gtk/webview_webkit.h | 5 ++---
 include/wx/msw/webview_ie.h     | 1 +
 include/wx/webview.h            | 2 ++
 src/common/webview.cpp          | 3 ++-
 src/gtk/webview_webkit.cpp      | 2 +-
 src/msw/webview_ie.cpp          | 2 ++
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index 6d8de61277..8f1e5f9e41 100644
--- 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 67f3305049..f327502df4 100644
--- 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 5ece8ec257..0bc9f8547e 100644
--- 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 8abac2300c..4ceb94c320 100644
--- 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 5c7819ee3a..944c9cf540 100644
--- 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 9f0c1168b4..276e352964 100644
--- 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")
 
-- 
2.45.2