X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf44735628cecb0326b953c4872260f223fc8769..0acb94947f39951a1688bbaa57d3a4bf5be40dbb:/include/wx/utils.h diff --git a/include/wx/utils.h b/include/wx/utils.h index 902863ce49..a8603a3fc8 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -182,7 +182,7 @@ class WXDLLEXPORT wxDebugStreamBuf: public streambuf int sync(void); }; -#if DEBUG && USE_GLOBAL_MEMORY_OPERATORS +#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS #define new WXDEBUG_NEW #endif @@ -266,7 +266,7 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y ); // MSW only: get user-defined resource from the .res file. // Returns NULL or newly-allocated memory, so use delete[] to clean up. -#ifdef __WINDOWS__ +#ifdef __WXMSW__ extern const char* WXDLLEXPORT wxUserResourceStr; char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr); #endif