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

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

diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index 34cc5f075387fb6c1c479593b569b7dbec16a64a..f2019230e0a27500246a3cff8b1b84a13e745753 100644 (file)
--- a/src/x11/dcmemory.cpp
+++ b/src/x11/dcmemory.cpp
@@ -1,30 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// 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"

 
 #include "wx/dcmemory.h"
 
 #include "wx/dcmemory.h"

-#include "wx/settings.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+#endif

 
 #include "wx/x11/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 
 #include "wx/x11/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 

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

 {
 {

-    m_ok = FALSE;
-    
+    m_ok = false;
+

     m_display = (WXDisplay *) wxGlobalDisplay();
 
     int screen = DefaultScreen( wxGlobalDisplay() );
     m_display = (WXDisplay *) wxGlobalDisplay();
 
     int screen = DefaultScreen( wxGlobalDisplay() );


@@ -34,22 +36,17 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC()
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
   : wxWindowDC()
 {
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
   : wxWindowDC()
 {

-    m_ok = FALSE;
-
-    m_display = (WXDisplay *) wxGlobalDisplay();
-    
-    int screen = DefaultScreen( wxGlobalDisplay() );
-    m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
+    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())
     {


@@ -59,16 +56,16 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         }
         else
         {
         }
         else
         {

-//            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 = NULL;
     }
 }
         m_window = NULL;
     }
 }