fix for dmc compilation of projects with more than one obj

[wxWidgets.git] / samples / image / image.cpp

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 734eadf90e1ff4d76b90788b367c9bd51115d83f..61fb9a85d4d6333a75fc02edcd213995a45540df 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -34,8 +34,11 @@
 #if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
     #include "smile.xpm"
 #endif
-#include "wx/rawbmp.h"
+#ifndef __VMS
+# include "wx/rawbmp.h"
 
+#define wxHAVE_RAW_BITMAP
+#endif
 
 // derived classes
 
@@ -284,7 +287,8 @@ public:
                 p.Red() = r;
                 p.Green() = g;
                 p.Blue() = b;
-                p.Alpha() = (x*255.)/REAL_SIZE;
+                p.Alpha() =
+                    (wxAlphaPixelFormat::ChannelType)((x*255.)/REAL_SIZE);
 
                 ++p; // same as p.OffsetX(1)
             }