cleanup - reformatting; simplified OnPaint

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index ad20e6ec9b681b51dd19f3f0ce604003d03fde39..20bf623044f063dd38cf7a04a63d6d0f53f79063 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.cpp
-// Purpose:     wxDC class
+// Name:        src/msw/dc.cpp
+// Purpose:     wxDC class for MSW port

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dc.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -135,10 +131,13 @@ static bool AlphaBlt(HDC hdcDst,
                      const wxBitmap& bmpSrc);
 
 #ifdef wxHAVE_RAW_BITMAP
                      const wxBitmap& bmpSrc);
 
 #ifdef wxHAVE_RAW_BITMAP

-// our (limited) AlphaBlend() replacement
+
+// our (limited) AlphaBlend() replacement for Windows versions not providing it

 static void
 static void

-wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h, int srcX, int srcY, const wxBitmap& bmp);
-#endif
+wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h,
+             int srcX, int srcY, const wxBitmap& bmp);
+
+#endif // wxHAVE_RAW_BITMAP

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -259,23 +258,6 @@ wxColourChanger::~wxColourChanger()
 // wxDC
 // ---------------------------------------------------------------------------
 
 // wxDC
 // ---------------------------------------------------------------------------
 

-// Default constructor
-wxDC::wxDC()
-{
-    m_canvas = NULL;
-
-    m_oldBitmap = 0;
-    m_oldPen = 0;
-    m_oldBrush = 0;
-    m_oldFont = 0;
-#if wxUSE_PALETTE
-    m_oldPalette = 0;
-#endif // wxUSE_PALETTE
-
-    m_bOwnsDC = false;
-    m_hDC = 0;
-}
-

 wxDC::~wxDC()
 {
     if ( m_hDC != 0 )
 wxDC::~wxDC()
 {
     if ( m_hDC != 0 )


@@ -977,6 +959,105 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
     CalcBoundingBox(x2, y2);
 }
 
     CalcBoundingBox(x2, y2);
 }
 

+#if wxUSE_SPLINES
+void wxDC::DoDrawSpline(wxList *points)
+{
+#ifdef  __WXWINCE__
+    // WinCE does not support ::PolyBezier so use generic version
+    wxDCBase::DoDrawSpline(points);
+#else
+    // quadratic b-spline to cubic bezier spline conversion
+    //
+    // quadratic spline with control points P0,P1,P2
+    // P(s) = P0*(1-s)^2 + P1*2*(1-s)*s + P2*s^2
+    //
+    // bezier spline with control points B0,B1,B2,B3
+    // B(s) = B0*(1-s)^3 + B1*3*(1-s)^2*s + B2*3*(1-s)*s^2 + B3*s^3
+    //
+    // control points of bezier spline calculated from b-spline
+    // B0 = P0
+    // B1 = (2*P1 + P0)/3
+    // B2 = (2*P1 + P2)/3
+    // B3 = P2
+
+    WXMICROWIN_CHECK_HDC
+
+    wxASSERT_MSG( points, wxT("NULL pointer to spline points?") );
+
+    const size_t n_points = points->GetCount();
+    wxASSERT_MSG( n_points > 2 , wxT("incomplete list of spline points?") );
+
+    const size_t n_bezier_points = n_points * 3 + 1;
+    POINT *lppt = (POINT *)malloc(n_bezier_points*sizeof(POINT));
+    size_t bezier_pos = 0;
+    wxCoord x1, y1, x2, y2, cx1, cy1, cx4, cy4;
+
+    wxList::compatibility_iterator node = points->GetFirst();
+    wxPoint *p = (wxPoint *)node->GetData();
+    lppt[ bezier_pos ].x = x1 = p->x;
+    lppt[ bezier_pos ].y = y1 = p->y;
+    bezier_pos++;
+    lppt[ bezier_pos ] = lppt[ bezier_pos-1 ];
+    bezier_pos++;
+
+    node = node->GetNext();
+    p = (wxPoint *)node->GetData();
+
+    x2 = p->x;
+    y2 = p->y;
+    cx1 = ( x1 + x2 ) / 2;
+    cy1 = ( y1 + y2 ) / 2;
+    lppt[ bezier_pos ].x = XLOG2DEV(cx1);
+    lppt[ bezier_pos ].y = YLOG2DEV(cy1);
+    bezier_pos++;
+    lppt[ bezier_pos ] = lppt[ bezier_pos-1 ];
+    bezier_pos++;
+
+#if !wxUSE_STL
+    while ((node = node->GetNext()) != NULL)
+#else
+    while ((node = node->GetNext()))
+#endif // !wxUSE_STL
+    {
+        p = (wxPoint *)node->GetData();
+        x1 = x2;
+        y1 = y2;
+        x2 = p->x;
+        y2 = p->y;
+        cx4 = (x1 + x2) / 2;
+        cy4 = (y1 + y2) / 2;
+        // B0 is B3 of previous segment
+        // B1:
+        lppt[ bezier_pos ].x = XLOG2DEV((x1*2+cx1)/3);
+        lppt[ bezier_pos ].y = YLOG2DEV((y1*2+cy1)/3);
+        bezier_pos++;
+        // B2:
+        lppt[ bezier_pos ].x = XLOG2DEV((x1*2+cx4)/3);
+        lppt[ bezier_pos ].y = YLOG2DEV((y1*2+cy4)/3);
+        bezier_pos++;
+        // B3:
+        lppt[ bezier_pos ].x = XLOG2DEV(cx4);
+        lppt[ bezier_pos ].y = YLOG2DEV(cy4);
+        bezier_pos++;
+        cx1 = cx4;
+        cy1 = cy4;
+    }
+
+    lppt[ bezier_pos ] = lppt[ bezier_pos-1 ];
+    bezier_pos++;
+    lppt[ bezier_pos ].x = XLOG2DEV(x2);
+    lppt[ bezier_pos ].y = YLOG2DEV(y2);
+    bezier_pos++;
+    lppt[ bezier_pos ] = lppt[ bezier_pos-1 ];
+    bezier_pos++;
+
+    ::PolyBezier( GetHdc(), lppt, bezier_pos );
+
+    free(lppt);
+#endif
+}
+#endif
+

 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
 void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {
 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
 void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {


@@ -1662,7 +1743,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     static int maxWidth = -1;
     int fit = 0;
     SIZE sz = {0,0};
     static int maxWidth = -1;
     int fit = 0;
     SIZE sz = {0,0};

-    int stlen = text.Length();
+    int stlen = text.length();

 
     if (maxLenText == -1)
     {
 
     if (maxLenText == -1)
     {


@@ -2187,12 +2268,14 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
     return success;
 }
 
     return success;
 }
 

-void wxDC::DoGetSize(int *w, int *h) const
+void wxDC::GetDeviceSize(int *width, int *height) const

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 

-    if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES);
-    if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES);
+    if ( width )
+        *width = ::GetDeviceCaps(GetHdc(), HORZRES);
+    if ( height )
+        *height = ::GetDeviceCaps(GetHdc(), VERTRES);

 }
 
 void wxDC::DoGetSizeMM(int *w, int *h) const
 }
 
 void wxDC::DoGetSizeMM(int *w, int *h) const


@@ -2444,6 +2527,8 @@ static bool AlphaBlt(HDC hdcDst,
 
         wxLogLastError(_T("AlphaBlend"));
     }
 
         wxLogLastError(_T("AlphaBlend"));
     }

+#else
+    wxUnusedVar(hdcSrc);

 #endif // defined(AC_SRC_OVER)
 
     // AlphaBlend() unavailable of failed: use our own (probably much slower)
 #endif // defined(AC_SRC_OVER)
 
     // AlphaBlend() unavailable of failed: use our own (probably much slower)


@@ -2465,14 +2550,16 @@ static bool AlphaBlt(HDC hdcDst,
 #ifdef wxHAVE_RAW_BITMAP
 
 static void
 #ifdef wxHAVE_RAW_BITMAP
 
 static void

-wxAlphaBlend(HDC hdcDst, int xDst, int yDst, int w, int h, int srcX, int srcY, const wxBitmap& bmpSrc)
+wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
+             int w, int h,
+             int srcX, int srcY, const wxBitmap& bmpSrc)

 {
     // get the destination DC pixels
     wxBitmap bmpDst(w, h, 32 /* force creating RGBA DIB */);
     MemoryHDC hdcMem;
     SelectInHDC select(hdcMem, GetHbitmapOf(bmpDst));
 
 {
     // get the destination DC pixels
     wxBitmap bmpDst(w, h, 32 /* force creating RGBA DIB */);
     MemoryHDC hdcMem;
     SelectInHDC select(hdcMem, GetHbitmapOf(bmpDst));
 

-    if ( !::BitBlt(hdcMem, 0, 0, w, h, hdcDst, 0, 0, SRCCOPY) )
+    if ( !::BitBlt(hdcMem, 0, 0, w, h, hdcDst, xDst, yDst, SRCCOPY) )

     {
         wxLogLastError(_T("BitBlt"));
     }
     {
         wxLogLastError(_T("BitBlt"));
     }