X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/497dbbd37b8ea0c3b747860e6ec7c18c815cfcf1..ee4ead93f4d16da50408441842b4ad2d520fc000:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index c5b2045c53..537a7f5ad9 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -428,7 +428,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&); #endif // Printf-like attribute definitions to obtain warnings with GNU C/C++ -#if defined(__GNUC__) +#if defined(__GNUC__) && !wxUSE_UNICODE # ifndef ATTRIBUTE_PRINTF # define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n))) # define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2) @@ -1646,7 +1646,7 @@ enum wxMM_ISOTROPIC, wxMM_ANISOTROPIC, wxMM_POINTS, - wxMM_METRIC, + wxMM_METRIC }; /* Shortcut for easier dialog-unit-to-pixel conversion */