X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c1d5d5ae212f255662264677d21c7139f4c939d..d181e877b04950068cb809b0d3d1a911bea3de74:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 46498e465b..38bba222a7 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -103,7 +103,7 @@
 #   endif
 
     /*
-       VC6 insists on complaining about 
+       VC6 insists on complaining about
 
         return type for 'wxVector<T>::reverse_iterator::operator ->' is 'T **'
         (ie; not a UDT or reference to a UDT.  Will produce errors if applied
@@ -268,6 +268,8 @@ typedef short int WXTYPE;
         #pragma warning(disable: 1682)
         /* conversion from "X" to "T" may lose significant bits */
         #pragma warning(disable: 810)
+        /* non-pointer conversion from "foo" to "bar" may lose significant bits */
+        #pragma warning(disable: 2259)
 
         return x;
 
@@ -506,7 +508,7 @@ typedef short int WXTYPE;
 #else
     #define  wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x)
 #endif
-    
+
 /*
    Macro which marks the function as being deprecated but also defines it
    inline.
@@ -1222,7 +1224,7 @@ typedef double wxDouble;
 
 #if wxUSE_WCHAR_T && (!defined(SIZEOF_WCHAR_T) || (SIZEOF_WCHAR_T == 2))
     #define wxWCHAR_T_IS_WXCHAR16
-    typedef wchar_t wxChar16; 
+    typedef wchar_t wxChar16;
 #else
     typedef wxUint16 wxChar16;
 #endif
@@ -2087,6 +2089,14 @@ enum wxHitTest
 /*  GDI descriptions */
 /*  ---------------------------------------------------------------------------- */
 
+/*
+    WARNING: the following styles are deprecated; use the
+             wxFontFamily, wxFontStyle, wxFontWeight, wxBrushStyle,
+             wxPenStyle, wxPenCap, wxPenJoin enum values instead!
+*/
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+
 /* don't use any elements of this enum in the new code */
 enum wxDeprecatedGUIConstants
 {
@@ -2110,13 +2120,6 @@ enum wxDeprecatedGUIConstants
     wxITALIC,
     wxSLANT,
 
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    /*
-        WARNING: the following styles are deprecated; use the wxBrushStyle,
-                 wxPenStyle, wxPenCap, wxPenJoin enum values instead!
-    */
-
     /*  Pen styles */
     wxSOLID      =   100,
     wxDOT,
@@ -2142,8 +2145,8 @@ enum wxDeprecatedGUIConstants
     wxVERTICAL_HATCH,
     wxFIRST_HATCH = wxBDIAGONAL_HATCH,
     wxLAST_HATCH = wxVERTICAL_HATCH
-#endif
 };
+#endif
 
 /*  Logical ops */
 typedef enum