Added wxMSW wxChoice::GetClassDefaultAttributes(), initially used in wxComboCtrl

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

diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp
index c6c4233795bc6b9d01d99c59c9e57a04160e389d..d09e8080f84fe0915e91499fb1b99ebffeed04cf 100644 (file)
--- a/src/mgl/dcmemory.cpp
+++ b/src/mgl/dcmemory.cpp
@@ -24,21 +24,21 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 

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

 {
     m_isMemDC = true;
 }
 
 wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc)) : wxDC()
 {
 {
     m_isMemDC = true;
 }
 
 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() )
     {