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

@@ -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
 // ============================================================================

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;
 
 

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()
 {

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
 // --------------------------------------------------------------------------

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 )

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
 //---------------------------------------------------------------------------

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
 //---------------------------------------------------------------------------

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

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
 */

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
 */

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 )

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");
 

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__

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
 //-----------------------------------------------------------------------------