Better sorting example and better default

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

diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp
index 01123359cae60194ed813b04f0093a9640b9e4c5..d09e8080f84fe0915e91499fb1b99ebffeed04cf 100644 (file)
--- a/src/mgl/dcmemory.cpp
+++ b/src/mgl/dcmemory.cpp
@@ -1,17 +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, 
+// Copyright:   (c) 1998 Robert Roebling,

 //                  2001 SciTech Software, Inc. (www.scitechsoft.com)
 //                  2001 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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"
 


@@ -28,21 +24,21 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 

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

 {
 {

-    m_isMemDC = TRUE;
+    m_isMemDC = true;

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

-    m_isMemDC = TRUE;
+    Init();

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

-void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
+void wxMemoryDC::DoSelect(const wxBitmap& bitmap)

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