fix to not show ampersands in the static box title (needed after the previous change)

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

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 9a6c4271c87cd066fb5bf6d3e84e6a6861eae691..bdbd68f7276480c5dfb3086495819b04d181bf01 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"
 


@@ -37,9 +44,10 @@ wxMemoryDC::wxMemoryDC(void)
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     gcvalues.graphics_exposures = False;
     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,
+        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,

         &gcvalues);
     
     m_backgroundPixel = (int) gcvalues.background;
         &gcvalues);
     
     m_backgroundPixel = (int) gcvalues.background;


@@ -50,6 +58,7 @@ wxMemoryDC::wxMemoryDC(void)
     m_oldFont = (WXFont) valReturn.font;
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     m_oldFont = (WXFont) valReturn.font;
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);

+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));    

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


@@ -66,9 +75,10 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     gcvalues.graphics_exposures = False;
     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,
+        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,

         &gcvalues);
     
     m_backgroundPixel = (int) gcvalues.background;
         &gcvalues);
     
     m_backgroundPixel = (int) gcvalues.background;


@@ -102,12 +112,14 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
         gcvalues.background = WhitePixel (display, DefaultScreen (display));
         gcvalues.graphics_exposures = False;
         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,
+            GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,

             &gcvalues);
         
         m_backgroundPixel = (int) gcvalues.background;
             &gcvalues);
         
         m_backgroundPixel = (int) gcvalues.background;

+        m_ok = TRUE;

         
         // Get the current Font so we can set it back later
         XGCValues valReturn;
         
         // Get the current Font so we can set it back later
         XGCValues valReturn;


@@ -122,7 +134,6 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         
         SetOptimization(oldOpt);
         
         
         SetOptimization(oldOpt);
         

-        m_ok = TRUE;

     }
     else
     {
     }
     else
     {