Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing wxRTTI macros and fix incorrect ones.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-01 15:49:05 +00:00
parent 75b0b0bcae
commit cddf4541fa
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk/webview_webkit.h
View File

@@ -148,10 +148,9 @@ private:
GtkWidget *web_view; GtkWidget *web_view;
gint m_historyLimit; gint m_historyLimit;
// FIXME: try to get DECLARE_DYNAMIC_CLASS macros & stuff right wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
//DECLARE_DYNAMIC_CLASS(wxWebViewWebKit)
}; };
#endif // if wxHAVE_WEB_BACKEND_GTK_WEBKIT #endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
#endif #endif

1
include/wx/msw/webview_ie.h
View File

@@ -157,6 +157,7 @@ private:
void ExecCommand(wxString command); void ExecCommand(wxString command);
IHTMLDocument2* GetDocument(); IHTMLDocument2* GetDocument();
wxDECLARE_DYNAMIC_CLASS(wxWebViewIE);
}; };
class VirtualProtocol : public IInternetProtocol, public IInternetProtocolInfo class VirtualProtocol : public IInternetProtocol, public IInternetProtocolInfo

2
include/wx/webview.h
View File

@@ -341,6 +341,8 @@ public:
//Virtual Filesystem Support //Virtual Filesystem Support
virtual void RegisterHandler(wxWebHandler* handler) = 0; virtual void RegisterHandler(wxWebHandler* handler) = 0;
wxDECLARE_ABSTRACT_CLASS(wxWebView);
}; };
class WXDLLIMPEXP_WEB wxWebNavigationEvent : public wxCommandEvent class WXDLLIMPEXP_WEB wxWebNavigationEvent : public wxCommandEvent

3
src/common/webview.cpp
View File

@@ -29,7 +29,8 @@ WX_CHECK_BUILD_OPTIONS("wxWEB")
extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView"; extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView";
extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank"; 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_NAVIGATING, wxWebNavigationEvent );
wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent ); wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent );

2
src/gtk/webview_webkit.cpp
View File

@@ -287,7 +287,7 @@ wxgtk_webview_webkit_title_changed(WebKitWebView*,
// wxWebViewWebKit // wxWebViewWebKit
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//IMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxControl) wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);
bool wxWebViewWebKit::Create(wxWindow *parent, bool wxWebViewWebKit::Create(wxWindow *parent,
wxWindowID id, wxWindowID id,

2
src/msw/webview_ie.cpp
View File

@@ -27,6 +27,8 @@
#include "wx/msw/missing.h" #include "wx/msw/missing.h"
#include "wx/filesys.h" #include "wx/filesys.h"
wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
//We link to urlmon as it is required for CoInternetGetSession //We link to urlmon as it is required for CoInternetGetSession
#pragma comment(lib, "urlmon") #pragma comment(lib, "urlmon")