SN: Disable some features not supported by EMX (#ifndef __EMX__)

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 3cffc336ee304d28f0f62fe309e970d53cc4d60f..83eff19eff0e6c5e15fd04329d5f93713c776ea5 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -599,63 +599,63 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
 {
     if (!bmp.Ok())
         return;
-
-       bool needsPixelCopy = false ;
-       bool isPrinter = false ;
+    
+    bool needsPixelCopy = FALSE ;
+    bool isPrinter = FALSE ;
     if (IsKindOf(CLASSINFO(wxPrinterDC)) )
     {
-       isPrinter = true ;
-       if ( ::GetDeviceCaps((HDC) m_hDC, RASTERCAPS) & RC_STRETCHDIB )
+        isPrinter = TRUE ;
+        if ( ::GetDeviceCaps((HDC) m_hDC, RASTERCAPS) & RC_STRETCHDIB )
                {
-       }
+        }
                else
                {
-                       needsPixelCopy = true ;
+            needsPixelCopy = TRUE ;
                }
-       }
+    }
     // If we're not drawing transparently, and not drawing to a printer,
     // optimize this function to use Windows functions.
     if (!useMask && !needsPixelCopy)
     {
-       if ( isPrinter )
-       {
-               BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) ) ;
-               int iBitsSize = ((bmp.GetWidth() + 3 ) & ~3 ) * bmp.GetHeight() ;
-               
-               void* bits = malloc( iBitsSize ) ;
-               
-               memset( info , 0 , sizeof( BITMAPINFOHEADER ) ) ;
-               
-               info->bmiHeader.biSize = sizeof( BITMAPINFOHEADER ) ;
-               info->bmiHeader.biWidth = bmp.GetWidth() ;
-               info->bmiHeader.biHeight = bmp.GetHeight() ;
-               info->bmiHeader.biPlanes = 1 ;
-               info->bmiHeader.biBitCount = 8 ;
-               info->bmiHeader.biCompression = BI_RGB ;
-               
-               HDC display = GetDC( NULL ) ;
-                       if ( GetDIBits( display , (HBITMAP) bmp.GetHBITMAP( ) , 0 , bmp.GetHeight() , bits , info , DIB_RGB_COLORS ) )
-                       {
-                               StretchDIBits( (HDC) m_hDC, 
-                                       x, y, bmp.GetWidth(), bmp.GetHeight() , 
-                                       0 , 0 ,bmp.GetWidth(), bmp.GetHeight() , 
-                                       bits , info , DIB_RGB_COLORS , SRCCOPY ) ;
-                       }
-                       ReleaseDC( NULL , display ) ;
-                       free ( bits ) ;
-                       free( info ) ;
-       }
-       else
-       {
-               HDC cdc = GetHdc();
-               HDC memdc = ::CreateCompatibleDC( cdc );
-               HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );
-
-               wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
-
-               ::SelectObject( memdc, hbitmap );
-               ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);
-               ::DeleteDC( memdc );
+        if ( isPrinter )
+        {
+            BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) ) ;
+            int iBitsSize = ((bmp.GetWidth() + 3 ) & ~3 ) * bmp.GetHeight() ;
+            
+            void* bits = malloc( iBitsSize ) ;
+            
+            memset( info , 0 , sizeof( BITMAPINFOHEADER ) ) ;
+            
+            info->bmiHeader.biSize = sizeof( BITMAPINFOHEADER ) ;
+            info->bmiHeader.biWidth = bmp.GetWidth() ;
+            info->bmiHeader.biHeight = bmp.GetHeight() ;
+            info->bmiHeader.biPlanes = 1 ;
+            info->bmiHeader.biBitCount = 8 ;
+            info->bmiHeader.biCompression = BI_RGB ;
+            
+            HDC display = GetDC( NULL ) ;
+            if ( GetDIBits( display , (HBITMAP) bmp.GetHBITMAP( ) , 0 , bmp.GetHeight() , bits , info , DIB_RGB_COLORS ) )
+            {
+                StretchDIBits( (HDC) m_hDC, 
+                    x, y, bmp.GetWidth(), bmp.GetHeight() , 
+                    0 , 0 ,bmp.GetWidth(), bmp.GetHeight() , 
+                    bits , info , DIB_RGB_COLORS , SRCCOPY ) ;
+            }
+            ReleaseDC( NULL , display ) ;
+            free ( bits ) ;
+            free( info ) ;
+        }
+        else
+        {
+            HDC cdc = GetHdc();
+            HDC memdc = ::CreateCompatibleDC( cdc );
+            HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );
+            
+            wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
+            
+            ::SelectObject( memdc, hbitmap );
+            ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);
+            ::DeleteDC( memdc );
         }
     }
     else
@@ -663,7 +663,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level
         wxMemoryDC memDC;
         memDC.SelectObject(bmp);
-
+        
         /* Not sure if we need this. The mask should leave the
         * masked areas as per the original background of this DC.
         */
@@ -673,9 +673,9 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         memDC.SetBackground(* GetBackground());
         memDC.Clear();
         */
-
+        
         Blit(x, y, bmp.GetWidth(), bmp.GetHeight(), & memDC, 0, 0, wxCOPY, useMask);
-
+        
         memDC.SelectObject(wxNullBitmap);
     }
 }