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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 4e2eb164d16b155cc51e2adda06b06e0ae867d4c..f64e6b6bb673651d73c9ab87d051f9b685c98134 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -53,6 +53,10 @@
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxCore")
+

 // ============================================================================
 // wxAppBase implementation
 // ============================================================================
 // ============================================================================
 // wxAppBase implementation
 // ============================================================================

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 902591109ecc8e91176b598dfe24e16b3aea412e..ebbc3819fb5019bd734b06049ab265f3aaf46c4a 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -68,6 +68,10 @@
 
 #include "wx/db.h"
 
 
 #include "wx/db.h"
 

+// DLL options compatibility check:
+#include "wx/app.h"
+WX_CHECK_BUILD_OPTIONS("wxODBC")
+

 WXDLLIMPEXP_DATA_ODBC(wxDbList*) PtrBegDbList = 0;
 
 
 WXDLLIMPEXP_DATA_ODBC(wxDbList*) PtrBegDbList = 0;
 
 

diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp
index 2a95253af54f8c655131f03bbd1b9f99b656b48c..4e41ffcd665919cda4d66ecd83bd74fad7600b5c 100644 (file)
--- a/src/common/dbgrid.cpp
+++ b/src/common/dbgrid.cpp
@@ -33,6 +33,10 @@
 #include "wx/generic/gridctrl.h"
 #include "wx/dbgrid.h"
 
 #include "wx/generic/gridctrl.h"
 #include "wx/dbgrid.h"
 

+// DLL options compatibility check:
+#include "wx/app.h"
+WX_CHECK_BUILD_OPTIONS("wxDbGrid")
+

 
 wxDbGridCellAttrProvider::wxDbGridCellAttrProvider()
 {
 
 wxDbGridCellAttrProvider::wxDbGridCellAttrProvider()
 {

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 377384849f1f9e5eaf25a72280f6d2aeeb3e1cec..60bbc1f48d8abd9b4354b7ee695d9b52d6207700 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -41,6 +41,10 @@
 #include "wx/sckaddr.h"
 #include "wx/socket.h"
 
 #include "wx/sckaddr.h"
 #include "wx/socket.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxNet")
+

 // --------------------------------------------------------------------------
 // macros and constants
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // macros and constants
 // --------------------------------------------------------------------------

diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp
index 97f25d32e5ecc966e11ed212160a461c7455d70a..521ef18359786319b40b1aeae88cb23025d0b281 100644 (file)
--- a/src/common/taskbarcmn.cpp
+++ b/src/common/taskbarcmn.cpp
@@ -20,6 +20,11 @@
 
 #ifdef wxHAS_TASK_BAR_ICON
 
 
 #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 )
 #include "wx/taskbar.h"
 
 DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE )

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index c55808b96f7fe0ba02586ae3dbe276857d082663..d1ace2efe170cdbddb70e0d0e2502c3c5fd5fad2 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -33,6 +33,10 @@ extern "C"
 
 #include "wx/gtk/win_gtk.h"
 
 
 #include "wx/gtk/win_gtk.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+

 //---------------------------------------------------------------------------
 // global data
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // global data
 //---------------------------------------------------------------------------

diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp
index c55808b96f7fe0ba02586ae3dbe276857d082663..d1ace2efe170cdbddb70e0d0e2502c3c5fd5fad2 100644 (file)
--- a/src/gtk1/glcanvas.cpp
+++ b/src/gtk1/glcanvas.cpp
@@ -33,6 +33,10 @@ extern "C"
 
 #include "wx/gtk/win_gtk.h"
 
 
 #include "wx/gtk/win_gtk.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+

 //---------------------------------------------------------------------------
 // global data
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // global data
 //---------------------------------------------------------------------------

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index ae2ccef9a74461299a3e005cc213ffdc0424e95c..c9c59ab6008f55aa4fdf4dde917a2d7d096f4f8b 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -35,6 +35,12 @@
 #include "wx/dynarray.h"
 #include "wx/arrimpl.cpp"
 
 #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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxHtmlParser helpers
 //-----------------------------------------------------------------------------


@@ -915,5 +921,4 @@ wxString wxHtmlParser::ExtractCharsetInformation(const wxString& markup)
     return charset;
 }
 
     return charset;
 }
 

-

 #endif
 #endif

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index e66592a619c80771f26a3d5f4da536ea31f33b9f..44215b6b75824b9678a9a68717f3131d14498dea 100644 (file)
--- 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"
 
 #include "wx/glcanvas.h"
 #include "wx/mac/uma.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+

 /*
 * GLContext implementation
 */
 /*
 * GLContext implementation
 */

diff --git a/src/mac/glcanvas.cpp b/src/mac/glcanvas.cpp
index e66592a619c80771f26a3d5f4da536ea31f33b9f..44215b6b75824b9678a9a68717f3131d14498dea 100644 (file)
--- a/src/mac/glcanvas.cpp
+++ b/src/mac/glcanvas.cpp
@@ -33,6 +33,10 @@
 #include "wx/glcanvas.h"
 #include "wx/mac/uma.h"
 
 #include "wx/glcanvas.h"
 #include "wx/mac/uma.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+

 /*
 * GLContext implementation
 */
 /*
 * GLContext implementation
 */

diff --git a/src/motif/glcanvas.cpp b/src/motif/glcanvas.cpp
index 8a84a0ec965eaac36801db2922950c993fa8768e..bf6347593a8943a614b149aeef36354493df9044 100644 (file)
--- a/src/motif/glcanvas.cpp
+++ b/src/motif/glcanvas.cpp
@@ -32,6 +32,10 @@
 #endif
 #include "wx/motif/private.h"
 
 #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 )
 #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 5180f0d6027a6ba621baa8cc40604dab45777318..4f84b3c3884f7e828c8dfb5103b3425fa01d5161 100644 (file)
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -30,6 +30,10 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+

 #include "wx/glcanvas.h"
 
 /*
 #include "wx/glcanvas.h"
 
 /*


@@ -54,6 +58,7 @@
 #  pragma comment( lib, "glu32" )
 #endif
 
 #  pragma comment( lib, "glu32" )
 #endif
 

+

 static const wxChar *wxGLCanvasClassName = wxT("wxGLCanvasClass");
 static const wxChar *wxGLCanvasClassNameNoRedraw = wxT("wxGLCanvasClassNR");
 
 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 6a6869fc0f4848b279a9d44bd5e1afeb8e8ce102..fabb565b272dc3de511a5d828701ccee5f708039 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -32,6 +32,10 @@
 #endif
 #include "wx/x11/private.h"
 
 #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__
 static inline WXWindow wxGetClientAreaWindow(wxWindow* win)
 {
 #ifdef __WXMOTIF__

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index ed0b3c0b0731ca1710c044755461b52c5b76d434..2f95a431186dc970a985d0d2efc9e29a81ed3033 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -32,6 +32,10 @@
 
 #include "expat.h" // from Expat
 
 
 #include "expat.h" // from Expat
 

+// DLL options compatibility check:
+#include "wx/app.h"
+WX_CHECK_BUILD_OPTIONS("wxXML")
+

 //-----------------------------------------------------------------------------
 //  wxXmlNode
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  wxXmlNode
 //-----------------------------------------------------------------------------