use unsgined int instead of int for 1 bit bitfields (SGI CC warning fix)

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

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 9a80e5f5495c552ef9f7a15bb759c9b436d074c1..98cd0efd3e5c15c20f3f29e991574ee3231ce105 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -6,29 +6,92 @@
 // 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__
+#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"
+
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
+#include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+
+#include "wx/motif/private.h"

 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
+IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)

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

-  m_ok = FALSE;
+    m_ok = true;
+    m_display = wxGetDisplay();
+
+    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;
+    SetBrush (* wxWHITE_BRUSH);
+    SetPen (* wxBLACK_PEN);
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 };
 
 };
 

-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
+wxMemoryDC::wxMemoryDC( wxDC* dc )

 {
 {

-  m_ok = FALSE;
+    m_ok = true;
+    if (dc && dc->IsKindOf(CLASSINFO(wxWindowDC)))
+        m_display = ((wxWindowDC*)dc)->GetDisplay();
+    else
+        m_display = wxGetDisplay();
+
+    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;
+    SetBrush (* wxWHITE_BRUSH);
+    SetPen (* wxBLACK_PEN);

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


@@ -37,28 +100,57 @@ wxMemoryDC::~wxMemoryDC(void)
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {

-  m_selected = bitmap;
-  if (m_selected.Ok())
-  {
-  }
-  else
-  {
-    m_ok = FALSE;
-  };
+    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_selected.Ok())
-  {
-    if (width) (*width) = m_selected.GetWidth();
-    if (height) (*height) = m_selected.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;
+    };

 };
 
 
 };