detect EOF properly in wxFileInputStream

[wxWidgets.git] / src / motif / bitmap.cpp

diff --git a/src/motif/bitmap.cpp b/src/motif/bitmap.cpp
index dc6bb3bb82f27278cd23362a1ec684f503ce6310..e5b3c2c3086a44c67ae933dea32a1d8604f08fa2 100644 (file)
--- a/src/motif/bitmap.cpp
+++ b/src/motif/bitmap.cpp
@@ -167,6 +167,12 @@ bool wxBitmap::CreateFromXpm(const char **bits)
     return Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+    *this = icon;
+    return TRUE;
+}
+
 bool wxBitmap::Create(int w, int h, int d)
 {
     UnRef();
@@ -223,7 +229,7 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
     wxBitmapHandler *handler = FindHandler(type);
 
     if ( handler == NULL ) {
-        wxLogWarning("no data bitmap handler for type %d defined.", type);
+        wxLogWarning("no data bitmap handler for type %ld defined.", type);
 
         return FALSE;
     }