removing unreached code (overriden)

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 6c8aa17100c2b688b022fd3ac7f4c520c20b4946..b83bf5ba55a21064b3158c70a02accf438781bf5 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -238,12 +238,12 @@ wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
                                                           : OPAQUE);
 
         // flag which telsl us to undo changes in the dtor
                                                           : OPAQUE);
 
         // flag which telsl us to undo changes in the dtor

-        m_changed = TRUE;
+        m_changed = true;

     }
     else
     {
         // nothing done, nothing to undo
     }
     else
     {
         // nothing done, nothing to undo

-        m_changed = FALSE;
+        m_changed = false;

     }
 }
 
     }
 }
 


@@ -277,7 +277,7 @@ wxDC::wxDC()
     m_oldPalette = 0;
 #endif // wxUSE_PALETTE
 
     m_oldPalette = 0;
 #endif // wxUSE_PALETTE
 

-    m_bOwnsDC = FALSE;
+    m_bOwnsDC = false;

     m_hDC = 0;
 }
 
     m_hDC = 0;
 }
 


@@ -413,7 +413,7 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn)
     }
 #endif // Win16/32
 
     }
 #endif // Win16/32
 

-    m_clipping = TRUE;
+    m_clipping = true;

 
     UpdateClipBox();
 }
 
     UpdateClipBox();
 }


@@ -460,7 +460,7 @@ void wxDC::DestroyClippingRegion()
         ::DeleteObject(rgn);
     }
 
         ::DeleteObject(rgn);
     }
 

-    m_clipping = FALSE;
+    m_clipping = false;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -469,14 +469,14 @@ void wxDC::DestroyClippingRegion()
 
 bool wxDC::CanDrawBitmap() const
 {
 
 bool wxDC::CanDrawBitmap() const
 {

-    return TRUE;
+    return true;

 }
 
 bool wxDC::CanGetTextExtent() const
 {
 #ifdef __WXMICROWIN__
     // TODO Extend MicroWindows' GetDeviceCaps function
 }
 
 bool wxDC::CanGetTextExtent() const
 {
 #ifdef __WXMICROWIN__
     // TODO Extend MicroWindows' GetDeviceCaps function

-    return TRUE;
+    return true;

 #else
     // What sort of display is it?
     int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);
 #else
     // What sort of display is it?
     int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);


@@ -543,10 +543,10 @@ void wxDC::Clear()
 bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
 {
 #ifdef __WXWINCE__
 bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
 {
 #ifdef __WXWINCE__

-    return FALSE;
+    return false;

 #else
 
 #else
 

-    WXMICROWIN_CHECK_HDC_RET(FALSE)
+    WXMICROWIN_CHECK_HDC_RET(false)

 
     bool success = (0 != ::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
                          col.GetPixel(),
 
     bool success = (0 != ::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
                          col.GetPixel(),


@@ -577,16 +577,16 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 {
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 {

-    WXMICROWIN_CHECK_HDC_RET(FALSE)
+    WXMICROWIN_CHECK_HDC_RET(false)

 
 

-    wxCHECK_MSG( col, FALSE, _T("NULL colour parameter in wxDC::GetPixel") );
+    wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel") );

 
     // get the color of the pixel
     COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
 
     wxRGBToColour(*col, pixelcolor);
 
 
     // get the color of the pixel
     COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
 
     wxRGBToColour(*col, pixelcolor);
 

-    return TRUE;
+    return true;

 }
 
 void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 }
 
 void wxDC::DoCrossHair(wxCoord x, wxCoord y)


@@ -1037,7 +1037,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter

-            useMask = FALSE;
+            useMask = false;

         }
     }
     if ( useMask )
         }
     }
     if ( useMask )


@@ -1048,7 +1048,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         // On some systems, MaskBlt succeeds yet is much much slower
         // than the wxWindows fall-back implementation. So we need
         // to be able to switch this on and off at runtime.
         // On some systems, MaskBlt succeeds yet is much much slower
         // than the wxWindows fall-back implementation. So we need
         // to be able to switch this on and off at runtime.

-        bool ok = FALSE;
+        bool ok = false;

 #if wxUSE_SYSTEM_OPTIONS
         if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
 #endif
 #if wxUSE_SYSTEM_OPTIONS
         if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
 #endif


@@ -1281,7 +1281,7 @@ void wxDC::DoSelectPalette(bool realize)
     {
         HPALETTE oldPal = ::SelectPalette(GetHdc(),
                                           GetHpaletteOf(m_palette),
     {
         HPALETTE oldPal = ::SelectPalette(GetHdc(),
                                           GetHpaletteOf(m_palette),

-                                          FALSE);
+                                          false);

         if (!m_oldPalette)
             m_oldPalette = (WXHPALETTE) oldPal;
 
         if (!m_oldPalette)
             m_oldPalette = (WXHPALETTE) oldPal;
 


@@ -1295,7 +1295,7 @@ void wxDC::SetPalette(const wxPalette& palette)
     if ( palette.Ok() )
     {
         m_palette = palette;
     if ( palette.Ok() )
     {
         m_palette = palette;

-        DoSelectPalette(TRUE);
+        DoSelectPalette(true);

     }
 }
 
     }
 }
 


@@ -1320,36 +1320,44 @@ void wxDC::InitializePalette()
 
 #endif // wxUSE_PALETTE
 
 
 #endif // wxUSE_PALETTE
 

-void wxDC::SetFont(const wxFont& the_font)
+// SetFont/Pen/Brush() really ask to be implemented as a single template
+// function... but doing it is not worth breaking OpenWatcom build <sigh>
+
+void wxDC::SetFont(const wxFont& font)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 

-    // Set the old object temporarily, in case the assignment deletes an object
-    // that's not yet selected out.
-    if (m_oldFont)
-    {
-        ::SelectObject(GetHdc(), (HFONT) m_oldFont);
-        m_oldFont = 0;
-    }
-
-    m_font = the_font;
+    if ( font == m_font )
+        return;

 
 

-    if (!the_font.Ok())
+    if ( font.Ok() )

     {
     {

-        if (m_oldFont)
-            ::SelectObject(GetHdc(), (HFONT) m_oldFont);
-        m_oldFont = 0;
-    }
+        HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
+        if ( hfont == HGDI_ERROR )
+        {
+            wxLogLastError(_T("SelectObject(font)"));
+        }
+        else // selected ok
+        {
+            if ( !m_oldFont )
+                m_oldFont = (WXHPEN)hfont;

 
 

-    if (m_font.Ok() && m_font.GetResourceHandle())
+            m_font = font;
+        }
+    }
+    else // invalid font, reset the current font

     {
     {

-        HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
-        if (f == (HFONT) NULL)
+        if ( m_oldFont )

         {
         {

-            wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont."));
+            if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR )
+            {
+                wxLogLastError(_T("SelectObject(old font)"));
+            }
+
+            m_oldFont = 0;

         }
         }

-        if (!m_oldFont)
-            m_oldFont = (WXHFONT) f;
+
+        m_font = wxNullFont;

     }
 }
 
     }
 }
 


@@ -1357,31 +1365,37 @@ void wxDC::SetPen(const wxPen& pen)
 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 

-    // Set the old object temporarily, in case the assignment deletes an object
-    // that's not yet selected out.
-    if (m_oldPen)
-    {
-        ::SelectObject(GetHdc(), (HPEN) m_oldPen);
-        m_oldPen = 0;
-    }
-
-    m_pen = pen;
+    if ( pen == m_pen )
+        return;

 
 

-    if (!m_pen.Ok())
+    if ( pen.Ok() )

     {
     {

-        if (m_oldPen)
-            ::SelectObject(GetHdc(), (HPEN) m_oldPen);
-        m_oldPen = 0;
-    }
+        HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
+        if ( hpen == HGDI_ERROR )
+        {
+            wxLogLastError(_T("SelectObject(pen)"));
+        }
+        else // selected ok
+        {
+            if ( !m_oldPen )
+                m_oldPen = (WXHPEN)hpen;

 
 

-    if (m_pen.Ok())
+            m_pen = pen;
+        }
+    }
+    else // invalid pen, reset the current pen

     {
     {

-        if (m_pen.GetResourceHandle())
+        if ( m_oldPen )

         {
         {

-            HPEN p = (HPEN) ::SelectObject(GetHdc(), (HPEN)m_pen.GetResourceHandle());
-            if (!m_oldPen)
-                m_oldPen = (WXHPEN) p;
+            if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR )
+            {
+                wxLogLastError(_T("SelectObject(old pen)"));
+            }
+
+            m_oldPen = 0;

         }
         }

+
+        m_pen = wxNullPen;

     }
 }
 
     }
 }
 


@@ -1389,48 +1403,55 @@ void wxDC::SetBrush(const wxBrush& brush)
 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 

-    // Set the old object temporarily, in case the assignment deletes an object
-    // that's not yet selected out.
-    if (m_oldBrush)
-    {
-        ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);
-        m_oldBrush = 0;
-    }
-
-    m_brush = brush;
-
-    if (!m_brush.Ok())
-    {
-        if (m_oldBrush)
-            ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);
-        m_oldBrush = 0;
-    }
+    if ( brush == m_brush )
+        return;

 
 

-    if (m_brush.Ok())
+    if ( brush.Ok() )

     {
     {

-        // to make sure the brush is alligned with the logical coordinates
-        wxBitmap *stipple = m_brush.GetStipple();
+        // we must make sure the brush is aligned with the logical coordinates
+        // before selecting it
+        wxBitmap *stipple = brush.GetStipple();

         if ( stipple && stipple->Ok() )
         {
         if ( stipple && stipple->Ok() )
         {

-#ifdef __WIN32__
-            ::SetBrushOrgEx(GetHdc(),
-                            m_deviceOriginX % stipple->GetWidth(),
-                            m_deviceOriginY % stipple->GetHeight(),
-                            NULL);  // don't need previous brush origin
-#else
-            ::SetBrushOrg(GetHdc(),
-                            m_deviceOriginX % stipple->GetWidth(),
-                            m_deviceOriginY % stipple->GetHeight());
-#endif
+            if ( !::SetBrushOrgEx
+                    (
+                        GetHdc(),
+                        m_deviceOriginX % stipple->GetWidth(),
+                        m_deviceOriginY % stipple->GetHeight(),
+                        NULL                    // [out] previous brush origin
+                    ) )
+            {
+                wxLogLastError(_T("SetBrushOrgEx()"));
+            }

         }
 
         }
 

-        if ( m_brush.GetResourceHandle() )
+        HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush));
+        if ( hbrush == HGDI_ERROR )
+        {
+            wxLogLastError(_T("SelectObject(brush)"));
+        }
+        else // selected ok

         {
         {

-            HBRUSH b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle());
-            if (!m_oldBrush)
-                m_oldBrush = (WXHBRUSH) b;
+            if ( !m_oldBrush )
+                m_oldBrush = (WXHPEN)hbrush;
+
+            m_brush = brush;

         }
     }
         }
     }

+    else // invalid brush, reset the current brush
+    {
+        if ( m_oldBrush )
+        {
+            if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR )
+            {
+                wxLogLastError(_T("SelectObject(old brush)"));
+            }
+
+            m_oldBrush = 0;
+        }
+
+        m_brush = wxNullBrush;
+    }

 }
 
 void wxDC::SetBackground(const wxBrush& brush)
 }
 
 void wxDC::SetBackground(const wxBrush& brush)


@@ -1500,8 +1521,8 @@ void wxDC::SetRop(WXHDC dc)
 
 bool wxDC::StartDoc(const wxString& WXUNUSED(message))
 {
 
 bool wxDC::StartDoc(const wxString& WXUNUSED(message))
 {

-    // We might be previewing, so return TRUE to let it continue.
-    return TRUE;
+    // We might be previewing, so return true to let it continue.
+    return true;

 }
 
 void wxDC::EndDoc()
 }
 
 void wxDC::EndDoc()


@@ -1797,16 +1818,16 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                   int rop, bool useMask,
                   wxCoord xsrcMask, wxCoord ysrcMask)
 {
                   int rop, bool useMask,
                   wxCoord xsrcMask, wxCoord ysrcMask)
 {

-    wxCHECK_MSG( source, FALSE, _T("wxDC::Blit(): NULL wxDC pointer") );
+    wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") );

 
 

-    WXMICROWIN_CHECK_HDC_RET(FALSE)
+    WXMICROWIN_CHECK_HDC_RET(false)

 
     const wxBitmap& bmpSrc = source->m_selectedBitmap;
     if ( bmpSrc.Ok() && bmpSrc.HasAlpha() )
     {
         if ( AlphaBlt(GetHdc(), xdest, ydest, width, height,
                       GetHdcOf(*source), bmpSrc) )
 
     const wxBitmap& bmpSrc = source->m_selectedBitmap;
     if ( bmpSrc.Ok() && bmpSrc.HasAlpha() )
     {
         if ( AlphaBlt(GetHdc(), xdest, ydest, width, height,
                       GetHdcOf(*source), bmpSrc) )

-            return TRUE;
+            return true;

     }
 
     wxMask *mask = NULL;
     }
 
     wxMask *mask = NULL;


@@ -1818,7 +1839,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter

-            useMask = FALSE;
+            useMask = false;

         }
     }
 
         }
     }
 


@@ -1859,10 +1880,10 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         case wxNOR:          dwRop = NOTSRCCOPY;       break;
         default:
            wxFAIL_MSG( wxT("unsupported logical function") );
         case wxNOR:          dwRop = NOTSRCCOPY;       break;
         default:
            wxFAIL_MSG( wxT("unsupported logical function") );

-           return FALSE;
+           return false;

     }
 
     }
 

-    bool success = FALSE;
+    bool success = false;

 
     if (useMask)
     {
 
     if (useMask)
     {


@@ -2019,7 +2040,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                 }
                 else
                 {
                 }
                 else
                 {

-                    success = TRUE;
+                    success = true;

                 }
             }
         }
                 }
             }
         }


@@ -2045,7 +2066,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             }
             else
             {
             }
             else
             {

-                success = TRUE;
+                success = true;

             }
         }
 
             }
         }
 


@@ -2065,7 +2086,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             }
             else
             {
             }
             else
             {

-                success = TRUE;
+                success = true;

             }
         }
     }
             }
         }
     }


@@ -2259,7 +2280,7 @@ void wxDC::ClearCache()
 class wxDCModule : public wxModule
 {
 public:
 class wxDCModule : public wxModule
 {
 public:

-    virtual bool OnInit() { return TRUE; }
+    virtual bool OnInit() { return true; }

     virtual void OnExit() { wxDC::ClearCache(); }
 
 private:
     virtual void OnExit() { wxDC::ClearCache(); }
 
 private:


@@ -2291,11 +2312,11 @@ static bool AlphaBlt(HDC hdcDst,
 
     // bitmaps can be drawn only from GUI thread so there is no need to
     // protect this static variable from multiple threads
 
     // bitmaps can be drawn only from GUI thread so there is no need to
     // protect this static variable from multiple threads

-    static bool s_triedToLoad = FALSE;
+    static bool s_triedToLoad = false;

     static AlphaBlend_t pfnAlphaBlend = NULL;
     if ( !s_triedToLoad )
     {
     static AlphaBlend_t pfnAlphaBlend = NULL;
     if ( !s_triedToLoad )
     {

-        s_triedToLoad = TRUE;
+        s_triedToLoad = true;

 
         // don't give errors about the DLL being unavailable, we're
         // prepared to handle this
 
         // don't give errors about the DLL being unavailable, we're
         // prepared to handle this


@@ -2328,7 +2349,7 @@ static bool AlphaBlt(HDC hdcDst,
                            bf) )
         {
             // skip wxAlphaBlend() call below
                            bf) )
         {
             // skip wxAlphaBlend() call below

-            return TRUE;
+            return true;

         }
 
         wxLogLastError(_T("AlphaBlend"));
         }
 
         wxLogLastError(_T("AlphaBlend"));


@@ -2340,11 +2361,11 @@ static bool AlphaBlt(HDC hdcDst,
 #ifdef wxHAVE_RAW_BITMAP
     wxAlphaBlend(hdcDst, x, y, width, height, bmp);
 
 #ifdef wxHAVE_RAW_BITMAP
     wxAlphaBlend(hdcDst, x, y, width, height, bmp);
 

-    return TRUE;
+    return true;

 #else // !wxHAVE_RAW_BITMAP
     // no wxAlphaBlend() neither, fall back to using simple BitBlt() (we lose
     // alpha but at least something will be shown like this)
 #else // !wxHAVE_RAW_BITMAP
     // no wxAlphaBlend() neither, fall back to using simple BitBlt() (we lose
     // alpha but at least something will be shown like this)

-    return FALSE;
+    return false;

 #endif // wxHAVE_RAW_BITMAP
 }
 
 #endif // wxHAVE_RAW_BITMAP
 }