X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..fb8a56b77ce195d0bd9ac6984e3e5cbb7136faca:/include/wx/msw/gdiimage.h diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h index 895212538e..5598ed0238 100644 --- a/include/wx/msw/gdiimage.h +++ b/include/wx/msw/gdiimage.h @@ -16,7 +16,7 @@ #ifndef _WX_MSW_GDIIMAGE_H_ #define _WX_MSW_GDIIMAGE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "gdiimage.h" #endif @@ -42,10 +42,6 @@ public: m_width = m_height = m_depth = 0; m_handle = 0; - -#if WXWIN_COMPATIBILITY_2 - m_ok = FALSE; -#endif // WXWIN_COMPATIBILITY_2 } // accessors @@ -72,14 +68,6 @@ public: WXHICON m_hIcon; WXHCURSOR m_hCursor; }; - - // this filed is redundant and using it is error prone but keep it for - // backwards compatibility -#if WXWIN_COMPATIBILITY_2 - void SetOk() { m_ok = m_handle != 0; } - - bool m_ok; -#endif // WXWIN_COMPATIBILITY_2 }; // ----------------------------------------------------------------------------