wxUniversal compilation fix.

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

diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h
index 3bf601dda4c06f0cb507e5ea7048b9e8b3f7cfb7..5598ed02383e89ce05313c7a0faeadf5996cb57b 100644 (file)
--- a/include/wx/msw/gdiimage.h
+++ b/include/wx/msw/gdiimage.h
@@ -7,7 +7,7 @@
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // NB: this is a private header, it is not intended to be directly included by
@@ -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
 
@@ -28,6 +28,8 @@ class WXDLLEXPORT wxGDIImageRefData;
 class WXDLLEXPORT wxGDIImageHandler;
 class WXDLLEXPORT wxGDIImage;
 
+WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
+
 // ----------------------------------------------------------------------------
 // wxGDIImageRefData: common data fields for all derived classes
 // ----------------------------------------------------------------------------
@@ -40,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
@@ -70,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
 };
 
 // ----------------------------------------------------------------------------
@@ -135,7 +125,7 @@ class WXDLLEXPORT wxGDIImage : public wxGDIObject
 {
 public:
     // handlers list interface
-    static wxList& GetHandlers() { return ms_handlers; }
+    static wxGDIImageHandlerList& GetHandlers() { return ms_handlers; }
 
     static void AddHandler(wxGDIImageHandler *handler);
     static void InsertHandler(wxGDIImageHandler *handler);
@@ -186,7 +176,7 @@ protected:
     // create the data for the derived class here
     virtual wxGDIImageRefData *CreateData() const = 0;
 
-    static wxList ms_handlers;
+    static wxGDIImageHandlerList ms_handlers;
 };
 
 #endif // _WX_MSW_GDIIMAGE_H_