flags moved to chkconf

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

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index a5f196584eaf365b4a78f4841a78d212ff8f3403..5565670444c6e91eeed472bd8bb43d5faa3ef5f3 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.cpp
+// Name:        src/msw/dcmemory.cpp
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "dcmemory.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,6 +24,8 @@
     #pragma hdrstop
 #endif
 
+#include "wx/dcmemory.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/log.h"
@@ -35,8 +33,6 @@
 
 #include "wx/msw/private.h"
 
-#include "wx/dcmemory.h"
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -51,42 +47,41 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 // wxMemoryDC
 // ----------------------------------------------------------------------------
 
-wxMemoryDC::wxMemoryDC()
+wxMemoryDC::wxMemoryDC(wxDC *dc)
 {
-    m_hDC = (WXHDC) ::CreateCompatibleDC((HDC) NULL);
-    m_ok = (m_hDC != 0);
-    m_bOwnsDC = TRUE;
+    wxCHECK_RET( dc, _T("NULL dc in wxMemoryDC ctor") );
 
-    SetBrush(*wxWHITE_BRUSH);
-    SetPen(*wxBLACK_PEN);
+    CreateCompatible(dc);
 
-    // 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)
+void wxMemoryDC::Init()
 {
-    old_dc->BeginDrawing();
+    if ( m_ok )
+    {
+        SetBrush(*wxWHITE_BRUSH);
+        SetPen(*wxBLACK_PEN);
 
-    m_hDC = (WXHDC) ::CreateCompatibleDC(GetHdcOf(*old_dc));
-    m_ok = (m_hDC != 0);
+        // the background mode is only used for text background and is set in
+        // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
+        ::SetBkMode( GetHdc(), TRANSPARENT );
+    }
+}
 
-    old_dc->EndDrawing();
+bool wxMemoryDC::CreateCompatible(wxDC *dc)
+{
+    m_hDC = (WXHDC)::CreateCompatibleDC(dc ? GetHdcOf(*dc) : NULL);
 
-    SetBrush(*wxWHITE_BRUSH);
-    SetPen(*wxBLACK_PEN);
+    // as we created the DC, we must delete it in the dtor
+    m_bOwnsDC = true;
 
-    // the background mode is only used for text background and is set in
-    // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
-    ::SetBkMode( GetHdc(), TRANSPARENT );
-}
+    m_ok = m_hDC != 0;
 
-wxMemoryDC::~wxMemoryDC()
-{
+    return m_ok;
 }
 
-void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
+void wxMemoryDC::DoSelect( const wxBitmap& bitmap)
 {
     // select old bitmap out of the device context
     if ( m_oldBitmap )
@@ -94,28 +89,31 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
         ::SelectObject(GetHdc(), (HBITMAP) m_oldBitmap);
         if ( m_selectedBitmap.Ok() )
         {
+#ifdef __WXDEBUG__
             m_selectedBitmap.SetSelectedInto(NULL);
+#endif
             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;
 
+#ifdef __WXDEBUG__
     m_selectedBitmap.SetSelectedInto(this);
+#endif
     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"));
     }
@@ -194,4 +192,3 @@ void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord he
         wxDC::DoDrawRectangle(x, y, width, height);
     }
 }
-