X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89fd8148cec43b2fc8b74e712e8fe53d5b648cda..931483d799fcac4a442b123d32b14282ee17dc8d:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 759d932587..1d1953270f 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -658,18 +658,6 @@ typedef int wxCoord; enum { wxDefaultCoord = -1 }; -/* round-to-nearest (used in scaling) */ -#ifdef __cplusplus -inline wxCoord wxCoordRound(const float& f) -{ - return (f > 0) ? (wxCoord)(f + 0.5) : (f < 0) ? (wxCoord)(f - 0.5) : 0; -} -inline wxCoord wxCoordRound(const double& f) -{ - return (f > 0) ? (wxCoord)(f + 0.5) : (f < 0) ? (wxCoord)(f - 0.5) : 0; -} -#endif - /* ---------------------------------------------------------------------------- */ /* define fixed length types */ /* ---------------------------------------------------------------------------- */ @@ -1565,8 +1553,8 @@ enum wxBorder #define wxTC_LEFT 0x0020 #define wxTC_RIGHT 0x0040 #define wxTC_BOTTOM 0x0080 -#define wxTC_MULTILINE wxNB_MULTILINE -#define wxTC_OWNERDRAW 0x0200 +#define wxTC_MULTILINE 0x0200 /* == wxNB_MULTILINE */ +#define wxTC_OWNERDRAW 0x0400 /* * wxStatusBar95 flags