X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20ca5632798e70467bb90624cc66ef1f06ebcd28..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/msw/dib.cpp?ds=sidebyside

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 14a44e2339..b12baf0f83 100644
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -45,9 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if !defined(__MWERKS__)
-    #include <memory.h>
-#endif
+#include <memory.h>
 
 #include "wx/msw/dib.h"
 
@@ -577,7 +575,7 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
 wxPalette *wxDIB::CreatePalette() const
 {
     // GetDIBColorTable not available in eVC3
-#if defined(_WIN32_WCE) && _WIN32_WCE < 400
+#if !defined(__WXMSW__) || defined(_WIN32_WCE) && _WIN32_WCE < 400
     return NULL;
 #else
     wxCHECK_MSG( m_handle, NULL, wxT("wxDIB::CreatePalette(): invalid object") );
@@ -660,7 +658,7 @@ wxPalette *wxDIB::CreatePalette() const
 
 bool wxDIB::Create(const wxImage& image, PixelFormat pf)
 {
-    wxCHECK_MSG( image.Ok(), false, wxT("invalid wxImage in wxDIB ctor") );
+    wxCHECK_MSG( image.IsOk(), false, wxT("invalid wxImage in wxDIB ctor") );
 
     const int h = image.GetHeight();
     const int w = image.GetWidth();
@@ -753,7 +751,7 @@ wxImage wxDIB::ConvertToImage() const
     const int w = GetWidth();
     const int h = GetHeight();
     wxImage image(w, h, false /* don't bother clearing memory */);
-    if ( !image.Ok() )
+    if ( !image.IsOk() )
     {
         wxFAIL_MSG( wxT("could not allocate data for image") );
         return wxNullImage;