cleaning up problems after string changes

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

diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h
index a58afe00fc74d783baa06d90c11a33dc38009406..2111414a63e63ba96c0502bd72d93565b6645ddb 100644 (file)
--- a/include/wx/msw/gdiimage.h
+++ b/include/wx/msw/gdiimage.h
@@ -16,10 +16,6 @@
 #ifndef _WX_MSW_GDIIMAGE_H_
 #define _WX_MSW_GDIIMAGE_H_
 
 #ifndef _WX_MSW_GDIIMAGE_H_
 #define _WX_MSW_GDIIMAGE_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "gdiimage.h"
-#endif
-

 #include "wx/gdiobj.h"          // base class
 #include "wx/gdicmn.h"          // wxBITMAP_TYPE_INVALID
 #include "wx/list.h"
 #include "wx/gdiobj.h"          // base class
 #include "wx/gdicmn.h"          // wxBITMAP_TYPE_INVALID
 #include "wx/list.h"


@@ -108,7 +104,7 @@ public:
 
     // real handler operations: to implement in derived classes
     virtual bool Create(wxGDIImage *image,
 
     // real handler operations: to implement in derived classes
     virtual bool Create(wxGDIImage *image,

-                        void *data,
+                        const void* data,

                         long flags,
                         int width, int height, int depth = 1) = 0;
     virtual bool Load(wxGDIImage *image,
                         long flags,
                         int width, int height, int depth = 1) = 0;
     virtual bool Load(wxGDIImage *image,


@@ -158,7 +154,8 @@ public:
     void SetHandle(WXHANDLE handle)
         { AllocExclusive(); GetGDIImageData()->m_handle = handle; }
 
     void SetHandle(WXHANDLE handle)
         { AllocExclusive(); GetGDIImageData()->m_handle = handle; }
 

-    bool Ok() const { return GetHandle() != 0; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return GetHandle() != 0; }

 
     int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_width; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; }
 
     int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_width; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; }