Applied patch [ 1701723 ] wxAUI: Added event for doubleclicks on the tabbar bg

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 0ec10532b7d8ce554a856cda72862eee8115ed91..a27cce10412dd96bc01d375566dac33c85e500ca 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/gtk1/dcmemory.cpp

 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -7,10 +7,6 @@
 // Licence:     wxWindows 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"
 


@@ -25,40 +21,27 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 

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

 {
 {

-    m_ok = FALSE;
+    m_ok = false;

 
     m_cmap = gtk_widget_get_default_colormap();
 
     m_cmap = gtk_widget_get_default_colormap();

-    
-#ifdef __WXGTK20__
-    m_context = gdk_pango_context_get();
-    m_layout = pango_layout_new( m_context );
-    m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
-#endif

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

-  : wxWindowDC()
+          : wxWindowDC()

 {
 {

-    m_ok = FALSE;
-
-    m_cmap = gtk_widget_get_default_colormap();
-    
-#ifdef __WXGTK20__
-    m_context = gdk_pango_context_get();
-    m_layout = pango_layout_new( m_context );
-    m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
-#endif
+    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())
     {


@@ -71,13 +54,13 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             m_window = m_selected.GetBitmap();
         }
 
             m_window = m_selected.GetBitmap();
         }
 

-        m_isMemDC = TRUE;
+        m_isMemDC = true;

 
         SetUpDC();
     }
     else
     {
 
         SetUpDC();
     }
     else
     {

-        m_ok = FALSE;
+        m_ok = false;

         m_window = (GdkWindow *) NULL;
     }
 }
         m_window = (GdkWindow *) NULL;
     }
 }


@@ -108,7 +91,7 @@ void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
     wxWindowDC::SetBrush( brush );
 }
 
     wxWindowDC::SetBrush( brush );
 }
 

-void wxMemoryDC::SetBackground( const wxBrush& brushOrig ) 
+void wxMemoryDC::SetBackground( const wxBrush& brushOrig )

 {
     wxBrush brush(brushOrig);
 
 {
     wxBrush brush(brushOrig);
 


@@ -159,5 +142,3 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (height) (*height) = 0;
     }
 }
         if (height) (*height) = 0;
     }
 }

-
-