MSVC 5 fix.

[wxWidgets.git] / include / wx / msw / gdiimage.h

diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h
index 895212538eaa240a3c9b5f8dacc738738274c6ce..5598ed02383e89ce05313c7a0faeadf5996cb57b 100644 (file)
--- 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_
 
 #ifndef _WX_MSW_GDIIMAGE_H_
 #define _WX_MSW_GDIIMAGE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "gdiimage.h"
 #endif
 
     #pragma interface "gdiimage.h"
 #endif
 


@@ -42,10 +42,6 @@ public:
         m_width = m_height = m_depth = 0;
 
         m_handle = 0;
         m_width = m_height = m_depth = 0;
 
         m_handle = 0;

-
-#if WXWIN_COMPATIBILITY_2
-        m_ok = FALSE;
-#endif // WXWIN_COMPATIBILITY_2

     }
 
     // accessors
     }
 
     // accessors


@@ -72,14 +68,6 @@ public:
         WXHICON   m_hIcon;
         WXHCURSOR m_hCursor;
     };
         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

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------