i18n files are installed as part of wxBase (and should be ideally part of separate...

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

diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp
index 8ed99b6022eec3f593b4e57d76f89ca0882848ec..c6c4233795bc6b9d01d99c59c9e57a04160e389d 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$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dcmemory.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"
 


@@ -29,12 +26,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 wxMemoryDC::wxMemoryDC() : wxDC()
 {
 
 wxMemoryDC::wxMemoryDC() : wxDC()
 {

-    m_isMemDC = TRUE;
+    m_isMemDC = true;

 }
 
 wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc)) : wxDC()
 {
 }
 
 wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc)) : wxDC()
 {

-    m_isMemDC = TRUE;
+    m_isMemDC = true;

 }
 
 wxMemoryDC::~wxMemoryDC()
 }
 
 wxMemoryDC::~wxMemoryDC()


@@ -43,11 +40,11 @@ wxMemoryDC::~wxMemoryDC()
 
 void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 {
 
 void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 {

-    SetMGLDC(NULL, TRUE);
-    m_selected = bitmap;
-

     if ( bitmap.Ok() )
     if ( bitmap.Ok() )

+    {
+        m_selected = bitmap;

         SetMGLDC(m_selected.CreateTmpDC(), TRUE);
         SetMGLDC(m_selected.CreateTmpDC(), TRUE);

+    }

 }
 
 void wxMemoryDC::SetPen(const wxPen &pen)
 }
 
 void wxMemoryDC::SetPen(const wxPen &pen)