fix getting tooltip colors for GTK 2.11

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index add3cc54f5daaa05e60b344f38806f3e52952c35..a27cce10412dd96bc01d375566dac33c85e500ca 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -21,33 +21,27 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 

-wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
-    : wxWindowDC()
+void wxMemoryDC::Init()

 {
     m_ok = false;
 
     m_cmap = gtk_widget_get_default_colormap();
 {
     m_ok = false;
 
     m_cmap = gtk_widget_get_default_colormap();

-
-    if ( bitmap.IsOk() )
-        SelectObject(bitmap);

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

-    m_ok = false;
-
-    m_cmap = gtk_widget_get_default_colormap();
-
+    Init();

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

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

 {
     Destroy();
 {
     Destroy();

+

     m_selected = bitmap;
     if (m_selected.Ok())
     {
     m_selected = bitmap;
     if (m_selected.Ok())
     {