X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/810f173e8d7f580c612f202aab2a01003c3fb834..a6c7a0f826d5e156c177b4755365c3eb33e9b933:/src/msw/tbarmsw.cpp diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp index 2db4053acf..f558a94b80 100644 --- a/src/msw/tbarmsw.cpp +++ b/src/msw/tbarmsw.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "tbarmsw.h" #endif @@ -1103,7 +1103,7 @@ WXHBITMAP wxToolBar::CreateMappedBitmap(WXHINSTANCE hInstance, WXHBITMAP hBitmap if ( !hDIB ) return 0; - WXHBITMAP newBitmap = CreateMappedBitmap(hInstance, GlobalHandle(hDIB)); + WXHBITMAP newBitmap = CreateMappedBitmap(hInstance, GlobalPtr(hDIB)); GlobalFree(hDIB);