Applied OpenWatcom fixes from ABX.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index f51297399ea19fc3ba60c3560c1970ba6fc6b88b..b5b394ba3e6da17b119892d76669ef19c621aab7 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -36,8 +36,9 @@
 #endif
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
 #endif
 
 #if defined(__WXMSW__) || defined(__WXMAC__)

+    #ifdef wxHAVE_RAW_BITMAP

     #include "wx/rawbmp.h"
     #include "wx/rawbmp.h"

-    #define wxHAVE_RAW_BITMAP
+    #endif

 #endif
 
 // derived classes
 #endif
 
 // derived classes


@@ -896,7 +897,7 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
 
 #ifdef wxHAVE_RAW_BITMAP
 
 
 #ifdef wxHAVE_RAW_BITMAP
 

-void MyFrame::OnTestRawBitmap( wxCommandEvent &event )
+void MyFrame::OnTestRawBitmap( wxCommandEvent &WXUNUSED(event) )

 {
     (new MyRawBitmapFrame(this))->Show();
 }
 {
     (new MyRawBitmapFrame(this))->Show();
 }