wxMessageBox off the main thread lost result code.

[wxWidgets.git] / src / msw / dib.cpp

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 14a44e23394582065a967058d9af90c1659f6083..5b0bd487d6175febb0891b93823cd6e68506397a 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -45,9 +44,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

-#if !defined(__MWERKS__)
-    #include <memory.h>
-#endif
+#include <memory.h>

 
 #include "wx/msw/dib.h"
 
 
 #include "wx/msw/dib.h"
 


@@ -577,7 +574,7 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
 wxPalette *wxDIB::CreatePalette() const
 {
     // GetDIBColorTable not available in eVC3
 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") );
     return NULL;
 #else
     wxCHECK_MSG( m_handle, NULL, wxT("wxDIB::CreatePalette(): invalid object") );


@@ -660,7 +657,7 @@ wxPalette *wxDIB::CreatePalette() const
 
 bool wxDIB::Create(const wxImage& image, PixelFormat pf)
 {
 
 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();
 
     const int h = image.GetHeight();
     const int w = image.GetWidth();


@@ -753,7 +750,7 @@ wxImage wxDIB::ConvertToImage() const
     const int w = GetWidth();
     const int h = GetHeight();
     wxImage image(w, h, false /* don't bother clearing memory */);
     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;
     {
         wxFAIL_MSG( wxT("could not allocate data for image") );
         return wxNullImage;