Use struct qualifier with objc_object (it is and always will be a struct)

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

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 85291b7c620a0d225f3410768022166d65b75ec0..ce07b8fdd806c74da7a9ae2d4da0b99da8478b8c 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -9,14 +9,24 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dcmemory.h"
 #endif
 
 #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"
 
 #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 +47,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 +61,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 +78,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;


@@ -95,19 +108,21 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     
     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;
         
         XGCValues gcvalues;
         gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
         gcvalues.background = WhitePixel (display, DefaultScreen (display));
         gcvalues.graphics_exposures = False;
         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;
         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);
         
         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 +137,6 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         
         SetOptimization(oldOpt);
         
         
         SetOptimization(oldOpt);
         

-        m_ok = TRUE;

     }
     else
     {
     }
     else
     {


@@ -131,7 +145,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     };
 };
 
     };
 };
 

-void wxMemoryDC::GetSize( int *width, int *height ) const
+void wxMemoryDC::DoGetSize( int *width, int *height ) const

 {
     if (m_bitmap.Ok())
     {
 {
     if (m_bitmap.Ok())
     {