non-pch build fix for wxUSE_DISPLAY==0

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

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 41eeaccfff279923184f7b0e4b500994ea893741..81f4da0b3e879c654f38105cd474fb246e4079d8 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -16,10 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
@@ -36,7 +35,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)
 
-wxMemoryDC::wxMemoryDC(void)
+void wxMemoryDC::Init()
 {
     m_ok = true;
     m_display = wxGetDisplay();
@@ -53,7 +52,7 @@ wxMemoryDC::wxMemoryDC(void)
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
 
-    m_backgroundPixel = (int) gcvalues.background;
+    m_backgroundPixel = gcvalues.background;
 
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
@@ -80,7 +79,7 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
 
-    m_backgroundPixel = (int) gcvalues.background;
+    m_backgroundPixel = gcvalues.background;
 
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
@@ -90,7 +89,7 @@ wxMemoryDC::~wxMemoryDC(void)
 {
 }
 
-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDC::DoSelect( const wxBitmap& bitmap )
 {
     m_bitmap = bitmap;
 
@@ -113,7 +112,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
             &gcvalues);
 
-        m_backgroundPixel = (int) gcvalues.background;
+        m_backgroundPixel = gcvalues.background;
         m_ok = true;
 
         SetBrush (* wxWHITE_BRUSH);
@@ -139,5 +138,3 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (height) (*height) = 0;
     };
 }
-
-