cleanups after SciTech commit :-(

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

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index c27c9a22e45a27db71763d9f5e156061bab86886..8694f0b6eccd70854984e0fecd501adf0f9e4702 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -14,9 +14,16 @@
 #endif
 
 #include "wx/dcmemory.h"
 #endif
 
 #include "wx/dcmemory.h"

+#include "wx/settings.h"

 #include "wx/utils.h"
 
 #include "wx/utils.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 


@@ -30,26 +37,28 @@ wxMemoryDC::wxMemoryDC(void)
 {
     m_ok = TRUE;
     m_display = wxGetDisplay();
 {
     m_ok = TRUE;
     m_display = wxGetDisplay();

-
+    

     Display* display = (Display*) m_display;
     Display* display = (Display*) m_display;

-
+    

     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     gcvalues.graphics_exposures = False;
     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, RootWindow (display, DefaultScreen (display)),
     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;
     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;
     // 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);
+    SetBrush (* wxWHITE_BRUSH);
+    SetPen (* wxBLACK_PEN);
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));    

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


@@ -59,26 +68,27 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
         m_display = ((wxWindowDC*)dc)->GetDisplay();
     else
         m_display = wxGetDisplay();
         m_display = ((wxWindowDC*)dc)->GetDisplay();
     else
         m_display = wxGetDisplay();

-
+    

     Display* display = (Display*) m_display;
     Display* display = (Display*) m_display;

-
+    

     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     gcvalues.graphics_exposures = False;
     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, RootWindow (display, DefaultScreen (display)),
     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;
     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;
     // 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);
+    SetBrush (* wxWHITE_BRUSH);
+    SetPen (* wxBLACK_PEN);

 };
 
 wxMemoryDC::~wxMemoryDC(void)
 };
 
 wxMemoryDC::~wxMemoryDC(void)


@@ -87,62 +97,63 @@ wxMemoryDC::~wxMemoryDC(void)
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
 
 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);
+    m_bitmap = bitmap;

     
     

-    SetBrush (wxWHITE_BRUSH);
-    SetPen (wxBLACK_PEN);
-
-    SetOptimization(oldOpt);
-
-    m_ok = TRUE;
-  }
-  else
-  {
-    m_ok = FALSE;
-    m_pixmap = (WXPixmap) 0;
-  };
+    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.subwindow_mode = IncludeInferiors;
+        gcvalues.line_width = 1;
+        m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
+            GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
+            &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;
+    };

 };
 
 };
 

-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;
+    };

 };
 
 
 };