Minor header cleaning.

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

diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index eb74c0e2527c771e454515d610ebd1315e1a9085..f5a4bddb6455fe576db0706f6c38d0f6ad1677ce 100644 (file)
--- a/src/x11/dcmemory.cpp
+++ b/src/x11/dcmemory.cpp
@@ -1,158 +1,94 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/x11/dcmemory.cpp

 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // 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/dcmemory.h"

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

 
 

-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#ifdef __VMS__
-#pragma message enable nosimpint
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/settings.h"

 #endif
 
 #include "wx/x11/private.h"
 
 #endif
 
 #include "wx/x11/private.h"
 

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

 
 

-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+    : wxWindowDC()

 {
 {

-    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* dc )
+    m_ok = false;
+
+    m_display = (WXDisplay *) wxGlobalDisplay();
+
+    int screen = DefaultScreen( wxGlobalDisplay() );
+    m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
+}
+
+wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
+  : wxWindowDC()

 {
 {

-    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)
+    m_ok = false;
+
+    m_display = (WXDisplay *) wxGlobalDisplay();
+
+    int screen = DefaultScreen( wxGlobalDisplay() );
+    m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
+}
+
+wxMemoryDC::~wxMemoryDC()

 {
 {

-};
+}

 
 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))
+    Destroy();
+
+    m_selected = bitmap;
+    if (m_selected.Ok())

     {
     {

-        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;
+        if (m_selected.GetPixmap())
+        {
+            m_window = (WXWindow) m_selected.GetPixmap();
+        }
+        else
+        {
+            m_window = m_selected.GetBitmap();
+        }
+
+        m_isMemDC = true;
+
+        SetUpDC();

     }
     else
     {
     }
     else
     {

-        m_ok = FALSE;
-        m_pixmap = (WXPixmap) 0;
-    };
-};
+        m_ok = false;
+        m_window = NULL;
+    }
+}

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

-    if (m_bitmap.Ok())
+    if (m_selected.Ok())

     {
     {

-        if (width) (*width) = m_bitmap.GetWidth();
-        if (height) (*height) = m_bitmap.GetHeight();
+        if (width) (*width) = m_selected.GetWidth();
+        if (height) (*height) = m_selected.GetHeight();

     }
     else
     {
         if (width) (*width) = 0;
         if (height) (*height) = 0;
     }
     else
     {
         if (width) (*width) = 0;
         if (height) (*height) = 0;

-    };
-};
-
-
+    }
+}