X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4294b7832a5aed3c1cccc06aecd227d43da8830..9bb50fd0b04c824fc7ba14c0dc4ba4a2a9a1e6ad:/src/motif/dcmemory.cpp

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index c27c9a22e4..98cd0efd3e 100644
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -6,17 +6,27 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcmemory.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/dcmemory.h"
+#include "wx/settings.h"
 #include "wx/utils.h"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #include "wx/motif/private.h"
 
@@ -28,7 +38,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)
 
 wxMemoryDC::wxMemoryDC(void)
 {
-    m_ok = TRUE;
+    m_ok = true;
     m_display = wxGetDisplay();
 
     Display* display = (Display*) m_display;
@@ -37,10 +47,11 @@ wxMemoryDC::wxMemoryDC(void)
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     gcvalues.graphics_exposures = False;
+    gcvalues.subwindow_mode = IncludeInferiors;
     gcvalues.line_width = 1;
     m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
-        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth,
-          &gcvalues);
+        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
+        &gcvalues);
 
     m_backgroundPixel = (int) gcvalues.background;
 
@@ -48,13 +59,14 @@ wxMemoryDC::wxMemoryDC(void)
     XGCValues valReturn;
     XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
     m_oldFont = (WXFont) valReturn.font;
-    SetBrush (wxWHITE_BRUSH);
-    SetPen (wxBLACK_PEN);
+    SetBrush (* wxWHITE_BRUSH);
+    SetPen (* wxBLACK_PEN);
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 };
 
 wxMemoryDC::wxMemoryDC( wxDC* dc )
 {
-    m_ok = TRUE;
+    m_ok = true;
     if (dc && dc->IsKindOf(CLASSINFO(wxWindowDC)))
         m_display = ((wxWindowDC*)dc)->GetDisplay();
     else
@@ -66,10 +78,11 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     gcvalues.graphics_exposures = False;
+    gcvalues.subwindow_mode = IncludeInferiors;
     gcvalues.line_width = 1;
     m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
-        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth,
-          &gcvalues);
+        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
+        &gcvalues);
 
     m_backgroundPixel = (int) gcvalues.background;
 
@@ -77,8 +90,8 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
     XGCValues valReturn;
     XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
     m_oldFont = (WXFont) valReturn.font;
-    SetBrush (wxWHITE_BRUSH);
-    SetPen (wxBLACK_PEN);
+    SetBrush (* wxWHITE_BRUSH);
+    SetPen (* wxBLACK_PEN);
 };
 
 wxMemoryDC::~wxMemoryDC(void)
@@ -87,62 +100,57 @@ wxMemoryDC::~wxMemoryDC(void)
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
-  m_bitmap = bitmap;
-
-  if (m_gc)
-    XFreeGC((Display*) m_display, (GC) m_gc);
-  m_gc = (WXGC) NULL;
-
-  if (m_bitmap.Ok() && (bitmap.GetDisplay() == m_display))
-  {
-    m_pixmap = m_bitmap.GetPixmap();
-    Display* display = (Display*) m_display;
-
-    XGCValues gcvalues;
-    gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
-    gcvalues.background = WhitePixel (display, DefaultScreen (display));
-    gcvalues.graphics_exposures = False;
-    gcvalues.line_width = 1;
-    m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
-        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth,
-          &gcvalues);
-
-    m_backgroundPixel = (int) gcvalues.background;
-
-    // Get the current Font so we can set it back later
-    XGCValues valReturn;
-    XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
-    m_oldFont = (WXFont) valReturn.font;
-
-    bool oldOpt = GetOptimization();
-    SetOptimization(FALSE);
-    
-    SetBrush (wxWHITE_BRUSH);
-    SetPen (wxBLACK_PEN);
-
-    SetOptimization(oldOpt);
-
-    m_ok = TRUE;
-  }
-  else
-  {
-    m_ok = FALSE;
-    m_pixmap = (WXPixmap) 0;
-  };
+    m_bitmap = bitmap;
+
+    if (m_gc)
+        XFreeGC((Display*) m_display, (GC) m_gc);
+    m_gc = (WXGC) NULL;
+
+    if (m_bitmap.Ok() && (bitmap.GetDisplay() == m_display))
+    {
+        m_pixmap = m_bitmap.GetDrawable();
+        Display* display = (Display*) m_display;
+
+        XGCValues gcvalues;
+        gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
+        gcvalues.background = WhitePixel (display, DefaultScreen (display));
+        gcvalues.graphics_exposures = False;
+        gcvalues.subwindow_mode = IncludeInferiors;
+        gcvalues.line_width = 1;
+        m_gc = (WXGC) XCreateGC (display, (Drawable)m_pixmap/* RootWindow (display, DefaultScreen (display)) */,
+            GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
+            &gcvalues);
+
+        m_backgroundPixel = (int) gcvalues.background;
+        m_ok = true;
+
+        // Get the current Font so we can set it back later
+        XGCValues valReturn;
+        XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
+        m_oldFont = (WXFont) valReturn.font;
+
+        SetBrush (* wxWHITE_BRUSH);
+        SetPen (* wxBLACK_PEN);
+    }
+    else
+    {
+        m_ok = false;
+        m_pixmap = (WXPixmap) 0;
+    };
 };
 
-void wxMemoryDC::GetSize( int *width, int *height ) const
+void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {
-  if (m_bitmap.Ok())
-  {
-    if (width) (*width) = m_bitmap.GetWidth();
-    if (height) (*height) = m_bitmap.GetHeight();
-  }
-  else
-  {
-    if (width) (*width) = 0;
-    if (height) (*height) = 0;
-  };
+    if (m_bitmap.Ok())
+    {
+        if (width) (*width) = m_bitmap.GetWidth();
+        if (height) (*height) = m_bitmap.GetHeight();
+    }
+    else
+    {
+        if (width) (*width) = 0;
+        if (height) (*height) = 0;
+    };
 };