moved smart phone test to chkconf.h from features.h

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

diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h
index 68d36488eb1b20eef33425bbd87def4eeee2a144..895212538eaa240a3c9b5f8dacc738738274c6ce 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>
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 // NB: this is a private header, it is not intended to be directly included by


@@ -21,11 +21,15 @@
 #endif
 
 #include "wx/gdiobj.h"          // base class
 #endif
 
 #include "wx/gdiobj.h"          // base class

+#include "wx/gdicmn.h"          // wxBITMAP_TYPE_INVALID
+#include "wx/list.h"

 
 class WXDLLEXPORT wxGDIImageRefData;
 class WXDLLEXPORT wxGDIImageHandler;
 class WXDLLEXPORT wxGDIImage;
 
 
 class WXDLLEXPORT wxGDIImageRefData;
 class WXDLLEXPORT wxGDIImageHandler;
 class WXDLLEXPORT wxGDIImage;
 

+WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
+

 // ----------------------------------------------------------------------------
 // wxGDIImageRefData: common data fields for all derived classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGDIImageRefData: common data fields for all derived classes
 // ----------------------------------------------------------------------------


@@ -133,7 +137,7 @@ class WXDLLEXPORT wxGDIImage : public wxGDIObject
 {
 public:
     // handlers list interface
 {
 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);
 
     static void AddHandler(wxGDIImageHandler *handler);
     static void InsertHandler(wxGDIImageHandler *handler);


@@ -178,13 +182,13 @@ public:
 
     // forward some of base class virtuals to wxGDIImageRefData
     bool FreeResource(bool force = FALSE);
 
     // forward some of base class virtuals to wxGDIImageRefData
     bool FreeResource(bool force = FALSE);

-    virtual WXHANDLE GetResourceHandle();
+    virtual WXHANDLE GetResourceHandle() const;

 
 protected:
     // create the data for the derived class here
     virtual wxGDIImageRefData *CreateData() const = 0;
 
 
 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_
 };
 
 #endif // _WX_MSW_GDIIMAGE_H_