Corrected font calculation (use screen resolution now); and check for mask in m_image.cpp

[wxWidgets.git] / src / gtk1 / dcclient.cpp

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index be232b8848014208e82aaed9e6776bfa3db57697..5b39956468b3cb5d1fb802fc324188f63e574cb1 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -500,7 +500,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
 
     wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
 
-    bool is_mono = (bitmap.GetBitmap());
+    bool is_mono = (bitmap.GetBitmap() != NULL);
 
     /* scale/translate size and position */