correcting CGImage handling to be always correctly initialized and freed on OSX build...

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

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 166ee6b6a2e72f1c4e9652a5f63360948a6a3bdb..2bf8dcbd71b9d4d6ec1dc3df261954a0218f6fe6 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -6,18 +6,23 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // 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/settings.h"
 #include "wx/utils.h"
 
 
 #include "wx/dcmemory.h"
 #include "wx/settings.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"
 


@@ -29,109 +34,93 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)
 
 wxMemoryDC::wxMemoryDC(void)
 {
 
 wxMemoryDC::wxMemoryDC(void)
 {

-    m_ok = TRUE;
+    m_ok = true;

     m_display = wxGetDisplay();
     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,
+        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,

         &gcvalues);
         &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;
+

     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);

-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));    
-};
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+}

 
 wxMemoryDC::wxMemoryDC( wxDC* dc )
 {
 
 wxMemoryDC::wxMemoryDC( wxDC* dc )
 {

-    m_ok = TRUE;
+    m_ok = true;

     if (dc && dc->IsKindOf(CLASSINFO(wxWindowDC)))
         m_display = ((wxWindowDC*)dc)->GetDisplay();
     else
         m_display = wxGetDisplay();
     if (dc && dc->IsKindOf(CLASSINFO(wxWindowDC)))
         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,
+        GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,

         &gcvalues);
         &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;
+

     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);

-};
+}

 
 wxMemoryDC::~wxMemoryDC(void)
 {
 
 wxMemoryDC::~wxMemoryDC(void)
 {

-};
+}

 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
     m_bitmap = 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_gc)
         XFreeGC((Display*) m_display, (GC) m_gc);
     m_gc = (WXGC) NULL;

-    
+

     if (m_bitmap.Ok() && (bitmap.GetDisplay() == m_display))
     {
     if (m_bitmap.Ok() && (bitmap.GetDisplay() == m_display))
     {

-        m_pixmap = m_bitmap.GetPixmap();
+        m_pixmap = m_bitmap.GetDrawable();

         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;
         gcvalues.line_width = 1;

-        m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
-            GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth,
+        m_gc = (WXGC) XCreateGC (display, (Drawable)m_pixmap/* RootWindow (display, DefaultScreen (display)) */,
+            GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,

             &gcvalues);
             &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;
-        
-        bool oldOpt = GetOptimization();
-        SetOptimization(FALSE);
-        
+        m_ok = true;
+

         SetBrush (* wxWHITE_BRUSH);
         SetPen (* wxBLACK_PEN);
         SetBrush (* wxWHITE_BRUSH);
         SetPen (* wxBLACK_PEN);

-        
-        SetOptimization(oldOpt);
-        
-        m_ok = TRUE;

     }
     else
     {
     }
     else
     {

-        m_ok = FALSE;
+        m_ok = false;

         m_pixmap = (WXPixmap) 0;
     };
         m_pixmap = (WXPixmap) 0;
     };

-};
+}

 
 void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {
 
 void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {


@@ -145,6 +134,6 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (width) (*width) = 0;
         if (height) (*height) = 0;
     };
         if (width) (*width) = 0;
         if (height) (*height) = 0;
     };

-};
+}