fixing 10.5 only compiles

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

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 546dc4417c09e98fac6c0afd9038833f0c31abcd..81f4da0b3e879c654f38105cd474fb246e4079d8 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:


@@ -9,16 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcmemory.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"

-#include "wx/settings.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -36,7 +35,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)
 

-wxMemoryDC::wxMemoryDC(void)
+void wxMemoryDC::Init()

 {
     m_ok = true;
     m_display = wxGetDisplay();
 {
     m_ok = true;
     m_display = wxGetDisplay();


@@ -53,12 +52,12 @@ wxMemoryDC::wxMemoryDC(void)
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
 
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
 

-    m_backgroundPixel = (int) gcvalues.background;
+    m_backgroundPixel = gcvalues.background;

 
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

-};
+}

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


@@ -80,17 +79,17 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
 
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
 

-    m_backgroundPixel = (int) gcvalues.background;
+    m_backgroundPixel = gcvalues.background;

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

-};
+}

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

-};
+}

 
 

-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDC::DoSelect( const wxBitmap& bitmap )

 {
     m_bitmap = bitmap;
 
 {
     m_bitmap = bitmap;
 


@@ -113,7 +112,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
             &gcvalues);
 
             GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
             &gcvalues);
 

-        m_backgroundPixel = (int) gcvalues.background;
+        m_backgroundPixel = gcvalues.background;

         m_ok = true;
 
         SetBrush (* wxWHITE_BRUSH);
         m_ok = true;
 
         SetBrush (* wxWHITE_BRUSH);


@@ -124,7 +123,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         m_ok = false;
         m_pixmap = (WXPixmap) 0;
     };
         m_ok = false;
         m_pixmap = (WXPixmap) 0;
     };

-};
+}

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


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

-};
-
-
+}