Small changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/dbtable.cpp

@@ -31,8 +31,8 @@
 // Use this line for wxWindows v1.x
 //#include "wx_ver.h"
 // Use this line for wxWindows v2.x
-#include "wx/version.h"
 #include  "wx/wxprec.h"
+#include "wx/version.h"
 
 #if wxMAJOR_VERSION == 2
 #   ifdef __GNUG__

src/common/imagjpeg.cpp

@@ -29,6 +29,9 @@
 #include "wx/app.h"
 extern "C"
 {
+#ifdef __WATCOMC__
+    #define HAVE_BOOLEAN
+#endif
     #include "jpeglib.h"
 }
 #include "wx/filefn.h"

src/common/variant.cpp

@@ -1509,7 +1509,7 @@ bool wxVariant::operator== (void* value) const
 
 bool wxVariant::operator!= (void* value) const
 {
-    return (!((*this) == value));
+    return (!((*this) == (void*) value));
 }
 
 void wxVariant::operator= (void* value)