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

Fix compilation under dll builds. Wrap source files in wxUSE_WEB checks to allow minimal builds.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-05-05 20:30:51 +00:00
parent 3544f421d8
commit 9c805dec6c
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/dlimpexp.h
View File

@@ -266,10 +266,13 @@
#ifdef WXMAKINGDLL_WEB #ifdef WXMAKINGDLL_WEB
# define WXDLLIMPEXP_WEB WXEXPORT # define WXDLLIMPEXP_WEB WXEXPORT
# define WXDLLIMPEXP_DATA_WEB(type) WXEXPORT type
#elif defined(WXUSINGDLL) #elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_WEB WXIMPORT # define WXDLLIMPEXP_WEB WXIMPORT
# define WXDLLIMPEXP_DATA_WEB(type) WXIMPORT type
#else /* not making nor using DLL */ #else /* not making nor using DLL */
# define WXDLLIMPEXP_WEB # define WXDLLIMPEXP_WEB
# define WXDLLIMPEXP_DATA_WEB(type) type
#endif #endif
/* /*

16
include/wx/webview.h
View File

@@ -10,6 +10,10 @@
#ifndef _WX_WEB_VIEW_H_ #ifndef _WX_WEB_VIEW_H_
#define _WX_WEB_VIEW_H_ #define _WX_WEB_VIEW_H_
#include "wx/defs.h"
#if wxUSE_WEB
#include <wx/control.h> #include <wx/control.h>
#include <wx/event.h> #include <wx/event.h>
#include <wx/sstream.h> #include <wx/sstream.h>
@@ -401,10 +405,10 @@ private:
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebNavigationEvent); wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebNavigationEvent);
}; };
wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent );
wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent );
wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebNavigationEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebNavigationEvent );
wxDECLARE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebNavigationEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebNavigationEvent );
typedef void (wxEvtHandler::*wxWebNavigationEventFunction) typedef void (wxEvtHandler::*wxWebNavigationEventFunction)
(wxWebNavigationEvent&); (wxWebNavigationEvent&);
@@ -428,4 +432,6 @@ typedef void (wxEvtHandler::*wxWebNavigationEventFunction)
wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_ERROR, id, \ wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_ERROR, id, \
wxHtmlNavigatingEventHandler(fn)) wxHtmlNavigatingEventHandler(fn))
#endif #endif // wxUSE_WEB
#endif // _WX_WEB_VIEW_H_

8
src/common/webview.cpp
View File

@@ -10,6 +10,8 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#if wxUSE_WEB
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
#pragma hdrstop #pragma hdrstop
#endif #endif
@@ -24,8 +26,8 @@
#include "wx/app.h" #include "wx/app.h"
WX_CHECK_BUILD_OPTIONS("wxWEB") WX_CHECK_BUILD_OPTIONS("wxWEB")
extern WXDLLEXPORT_DATA(const char) wxWebViewNameStr[] = "wxWebView"; extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView";
extern WXDLLEXPORT_DATA(const char) wxWebViewDefaultURLStr[] = "about:blank"; extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank";
IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent)
@@ -122,3 +124,5 @@ wxWebView* wxWebView::New(wxWindow* parent,
return NULL; return NULL;
} }
} }
#endif // wxUSE_WEB