Old API deprecated. Source cleaning.

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

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index f79d33b26eb8bc25392064b5aa6c78fd639c8b82..f93d3b796274ddc7f16563a60463f135b5fdb1d6 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dcmemory.h"
 #endif
 
     #pragma implementation "dcmemory.h"
 #endif
 


@@ -41,7 +41,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-    IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
+IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -53,37 +53,47 @@
 
 wxMemoryDC::wxMemoryDC()
 {
 
 wxMemoryDC::wxMemoryDC()
 {

-    m_hDC = (WXHDC) ::CreateCompatibleDC((HDC) NULL);
-    m_ok = (m_hDC != 0);
-    m_bOwnsDC = TRUE;
+    CreateCompatible(NULL);

 
 

-    SetBrush(*wxWHITE_BRUSH);
-    SetPen(*wxBLACK_PEN);
-
-    // the background mode is only used for text background and is set in
-    // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
-    ::SetBkMode( GetHdc(), TRANSPARENT );
+    Init();

 }
 
 }
 

-wxMemoryDC::wxMemoryDC(wxDC *old_dc)
+wxMemoryDC::wxMemoryDC(wxDC *dc)

 {
 {

-    old_dc->BeginDrawing();
+    wxCHECK_RET( dc, _T("NULL dc in wxMemoryDC ctor") );

 
 

-    m_hDC = (WXHDC) ::CreateCompatibleDC(GetHdcOf(*old_dc));
-    m_ok = (m_hDC != 0);
+    dc->BeginDrawing();

 
 

-    old_dc->EndDrawing();
+    CreateCompatible(dc);

 
 

-    SetBrush(*wxWHITE_BRUSH);
-    SetPen(*wxBLACK_PEN);
+    dc->EndDrawing();

 
 

-    // the background mode is only used for text background and is set in
-    // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
-    ::SetBkMode( GetHdc(), TRANSPARENT );
+    Init();

 }
 
 }
 

-wxMemoryDC::~wxMemoryDC()
+void wxMemoryDC::Init()

 {
 {

+    if ( m_ok )
+    {
+        SetBrush(*wxWHITE_BRUSH);
+        SetPen(*wxBLACK_PEN);
+
+        // the background mode is only used for text background and is set in
+        // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
+        ::SetBkMode( GetHdc(), TRANSPARENT );
+    }
+}
+
+bool wxMemoryDC::CreateCompatible(wxDC *dc)
+{
+    m_hDC = (WXHDC)::CreateCompatibleDC(dc ? GetHdcOf(*dc) : NULL);
+
+    // as we created the DC, we must delete it in the dtor
+    m_bOwnsDC = true;
+
+    m_ok = m_hDC != 0;
+
+    return m_ok;

 }
 
 void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 }
 
 void wxMemoryDC::SelectObject(const wxBitmap& bitmap)


@@ -94,28 +104,31 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
         ::SelectObject(GetHdc(), (HBITMAP) m_oldBitmap);
         if ( m_selectedBitmap.Ok() )
         {
         ::SelectObject(GetHdc(), (HBITMAP) m_oldBitmap);
         if ( m_selectedBitmap.Ok() )
         {

+#ifdef __WXDEBUG__

             m_selectedBitmap.SetSelectedInto(NULL);
             m_selectedBitmap.SetSelectedInto(NULL);

+#endif

             m_selectedBitmap = wxNullBitmap;
         }
     }
 
     // check for whether the bitmap is already selected into a device context
             m_selectedBitmap = wxNullBitmap;
         }
     }
 
     // check for whether the bitmap is already selected into a device context

-    wxCHECK_RET( !bitmap.GetSelectedInto() ||
-                 (bitmap.GetSelectedInto() == this),
-                 wxT("Bitmap is selected in another wxMemoryDC, delete the "
-                     "first wxMemoryDC or use SelectObject(NULL)") );
+    wxASSERT_MSG( !bitmap.GetSelectedInto() ||
+                  (bitmap.GetSelectedInto() == this),
+                  wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );

 
     m_selectedBitmap = bitmap;
     WXHBITMAP hBmp = m_selectedBitmap.GetHBITMAP();
     if ( !hBmp )
         return;
 
 
     m_selectedBitmap = bitmap;
     WXHBITMAP hBmp = m_selectedBitmap.GetHBITMAP();
     if ( !hBmp )
         return;
 

+#ifdef __WXDEBUG__

     m_selectedBitmap.SetSelectedInto(this);
     m_selectedBitmap.SetSelectedInto(this);

+#endif

     hBmp = (WXHBITMAP)::SelectObject(GetHdc(), (HBITMAP)hBmp);
 
     if ( !hBmp )
     {
     hBmp = (WXHBITMAP)::SelectObject(GetHdc(), (HBITMAP)hBmp);
 
     if ( !hBmp )
     {

-        wxLogLastError("SelectObject(memDC, bitmap)");
+        wxLogLastError(wxT("SelectObject(memDC, bitmap)"));

 
         wxFAIL_MSG(wxT("Couldn't select a bitmap into wxMemoryDC"));
     }
 
         wxFAIL_MSG(wxT("Couldn't select a bitmap into wxMemoryDC"));
     }


@@ -139,6 +152,13 @@ void wxMemoryDC::DoGetSize(int *width, int *height) const
     }
 }
 
     }
 }
 

+// the rest of this file deals with drawing rectangles workaround, disabled by
+// default
+
+#define wxUSE_MEMORY_DC_DRAW_RECTANGLE 0
+
+#if wxUSE_MEMORY_DC_DRAW_RECTANGLE
+

 // For some reason, drawing a rectangle on a memory DC has problems.
 // Use this substitute if we can.
 static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 // For some reason, drawing a rectangle on a memory DC has problems.
 // Use this substitute if we can.
 static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoord height)


@@ -167,11 +187,13 @@ static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoo
     }
 }
 
     }
 }
 

+#endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE
+

 void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     // Set this to 1 to work around an apparent video driver bug
     // (visible with e.g. 70x70 rectangle on a memory DC; see Drawing sample)
 void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     // Set this to 1 to work around an apparent video driver bug
     // (visible with e.g. 70x70 rectangle on a memory DC; see Drawing sample)

-#if 0
+#if wxUSE_MEMORY_DC_DRAW_RECTANGLE

     if (m_brush.Ok() && m_pen.Ok() &&
         (m_brush.GetStyle() == wxSOLID || m_brush.GetStyle() == wxTRANSPARENT) &&
         (m_pen.GetStyle() == wxSOLID || m_pen.GetStyle() == wxTRANSPARENT) &&
     if (m_brush.Ok() && m_pen.Ok() &&
         (m_brush.GetStyle() == wxSOLID || m_brush.GetStyle() == wxTRANSPARENT) &&
         (m_pen.GetStyle() == wxSOLID || m_pen.GetStyle() == wxTRANSPARENT) &&


@@ -180,11 +202,9 @@ void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord he
         wxDrawRectangle(* this, x, y, width, height);
     }
     else
         wxDrawRectangle(* this, x, y, width, height);
     }
     else

+#endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE

     {
         wxDC::DoDrawRectangle(x, y, width, height);
     }
     {
         wxDC::DoDrawRectangle(x, y, width, height);
     }

-#else
-    wxDC::DoDrawRectangle(x, y, width, height);
-#endif

 }
 
 }