From 34fdf76231e5e0adc6f1a0543f19f7ab8fcb91d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 4 Aug 2003 13:19:44 +0000 Subject: [PATCH] added build options sanity checks into all main libraries git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/appcmn.cpp | 4 ++++ src/common/db.cpp | 4 ++++ src/common/dbgrid.cpp | 4 ++++ src/common/socket.cpp | 4 ++++ src/common/taskbarcmn.cpp | 5 +++++ src/gtk/glcanvas.cpp | 4 ++++ src/gtk1/glcanvas.cpp | 4 ++++ src/html/htmlpars.cpp | 7 ++++++- src/mac/carbon/glcanvas.cpp | 4 ++++ src/mac/glcanvas.cpp | 4 ++++ src/motif/glcanvas.cpp | 4 ++++ src/msw/glcanvas.cpp | 5 +++++ src/x11/glcanvas.cpp | 4 ++++ src/xml/xml.cpp | 4 ++++ 14 files changed, 60 insertions(+), 1 deletion(-) diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 4e2eb164d1..f64e6b6bb6 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -53,6 +53,10 @@ #include "wx/fontmap.h" #endif // wxUSE_FONTMAP +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxCore") + // ============================================================================ // wxAppBase implementation // ============================================================================ diff --git a/src/common/db.cpp b/src/common/db.cpp index 902591109e..ebbc3819fb 100644 --- a/src/common/db.cpp +++ b/src/common/db.cpp @@ -68,6 +68,10 @@ #include "wx/db.h" +// DLL options compatibility check: +#include "wx/app.h" +WX_CHECK_BUILD_OPTIONS("wxODBC") + WXDLLIMPEXP_DATA_ODBC(wxDbList*) PtrBegDbList = 0; diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp index 2a95253af5..4e41ffcd66 100644 --- a/src/common/dbgrid.cpp +++ b/src/common/dbgrid.cpp @@ -33,6 +33,10 @@ #include "wx/generic/gridctrl.h" #include "wx/dbgrid.h" +// DLL options compatibility check: +#include "wx/app.h" +WX_CHECK_BUILD_OPTIONS("wxDbGrid") + wxDbGridCellAttrProvider::wxDbGridCellAttrProvider() { diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 377384849f..60bbc1f48d 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -41,6 +41,10 @@ #include "wx/sckaddr.h" #include "wx/socket.h" +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxNet") + // -------------------------------------------------------------------------- // macros and constants // -------------------------------------------------------------------------- diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp index 97f25d32e5..521ef18359 100644 --- a/src/common/taskbarcmn.cpp +++ b/src/common/taskbarcmn.cpp @@ -20,6 +20,11 @@ #ifdef wxHAS_TASK_BAR_ICON +// DLL options compatibility check: +#include "wx/app.h" +WX_CHECK_BUILD_OPTIONS("wxAdvanced") + + #include "wx/taskbar.h" DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE ) diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp index c55808b96f..d1ace2efe1 100644 --- a/src/gtk/glcanvas.cpp +++ b/src/gtk/glcanvas.cpp @@ -33,6 +33,10 @@ extern "C" #include "wx/gtk/win_gtk.h" +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxGL") + //--------------------------------------------------------------------------- // global data //--------------------------------------------------------------------------- diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp index c55808b96f..d1ace2efe1 100644 --- a/src/gtk1/glcanvas.cpp +++ b/src/gtk1/glcanvas.cpp @@ -33,6 +33,10 @@ extern "C" #include "wx/gtk/win_gtk.h" +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxGL") + //--------------------------------------------------------------------------- // global data //--------------------------------------------------------------------------- diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp index ae2ccef9a7..c9c59ab600 100644 --- a/src/html/htmlpars.cpp +++ b/src/html/htmlpars.cpp @@ -35,6 +35,12 @@ #include "wx/dynarray.h" #include "wx/arrimpl.cpp" + +// DLL options compatibility check: +#include "wx/app.h" +WX_CHECK_BUILD_OPTIONS("wxHTML") +//static wxBuildOptionsChecker gs_optionsChecker; + //----------------------------------------------------------------------------- // wxHtmlParser helpers //----------------------------------------------------------------------------- @@ -915,5 +921,4 @@ wxString wxHtmlParser::ExtractCharsetInformation(const wxString& markup) return charset; } - #endif diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp index e66592a619..44215b6b75 100644 --- a/src/mac/carbon/glcanvas.cpp +++ b/src/mac/carbon/glcanvas.cpp @@ -33,6 +33,10 @@ #include "wx/glcanvas.h" #include "wx/mac/uma.h" +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxGL") + /* * GLContext implementation */ diff --git a/src/mac/glcanvas.cpp b/src/mac/glcanvas.cpp index e66592a619..44215b6b75 100644 --- a/src/mac/glcanvas.cpp +++ b/src/mac/glcanvas.cpp @@ -33,6 +33,10 @@ #include "wx/glcanvas.h" #include "wx/mac/uma.h" +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxGL") + /* * GLContext implementation */ diff --git a/src/motif/glcanvas.cpp b/src/motif/glcanvas.cpp index 8a84a0ec96..bf6347593a 100644 --- a/src/motif/glcanvas.cpp +++ b/src/motif/glcanvas.cpp @@ -32,6 +32,10 @@ #endif #include "wx/motif/private.h" +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxGL") + #ifdef OLD_MESA // workaround for bug in Mesa's glx.c static int bitcount( unsigned long n ) diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp index 5180f0d602..4f84b3c388 100644 --- a/src/msw/glcanvas.cpp +++ b/src/msw/glcanvas.cpp @@ -30,6 +30,10 @@ #include "wx/msw/private.h" +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxGL") + #include "wx/glcanvas.h" /* @@ -54,6 +58,7 @@ # pragma comment( lib, "glu32" ) #endif + static const wxChar *wxGLCanvasClassName = wxT("wxGLCanvasClass"); static const wxChar *wxGLCanvasClassNameNoRedraw = wxT("wxGLCanvasClassNR"); diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp index 6a6869fc0f..fabb565b27 100644 --- a/src/x11/glcanvas.cpp +++ b/src/x11/glcanvas.cpp @@ -32,6 +32,10 @@ #endif #include "wx/x11/private.h" +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxGL") + static inline WXWindow wxGetClientAreaWindow(wxWindow* win) { #ifdef __WXMOTIF__ diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp index ed0b3c0b07..2f95a43118 100644 --- a/src/xml/xml.cpp +++ b/src/xml/xml.cpp @@ -32,6 +32,10 @@ #include "expat.h" // from Expat +// DLL options compatibility check: +#include "wx/app.h" +WX_CHECK_BUILD_OPTIONS("wxXML") + //----------------------------------------------------------------------------- // wxXmlNode //----------------------------------------------------------------------------- -- 2.45.2