deprecation fixes, plus some code size reduction and cleanup

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

diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp
index 8ed99b6022eec3f593b4e57d76f89ca0882848ec..6017861c05c98fb6e2e121ad9c22b0af5533d278 100644 (file)
--- a/src/mgl/dcmemory.cpp
+++ b/src/mgl/dcmemory.cpp
@@ -1,16 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.cpp
+// Name:        src/mgl/dcmemory.cpp
 // Purpose:
 // Author:      Robert Roebling, Vaclav Slavik
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, 2001 Vaclav Slavik
+// Copyright:   (c) 1998 Robert Roebling,
+//                  2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dcmemory.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -27,14 +24,18 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
-wxMemoryDC::wxMemoryDC() : wxDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+    : wxDC()
 {
-    m_isMemDC = TRUE;
+    m_isMemDC = true;
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc)) : wxDC()
 {
-    m_isMemDC = TRUE;
+    m_isMemDC = true;
 }
 
 wxMemoryDC::~wxMemoryDC()
@@ -43,11 +44,11 @@ wxMemoryDC::~wxMemoryDC()
 
 void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 {
-    SetMGLDC(NULL, TRUE);
-    m_selected = bitmap;
-
     if ( bitmap.Ok() )
+    {
+        m_selected = bitmap;
         SetMGLDC(m_selected.CreateTmpDC(), TRUE);
+    }
 }
 
 void wxMemoryDC::SetPen(const wxPen &pen)