replace use of deprecated GtkPixmap

[wxWidgets.git] / src / mac / classic / dcclient.cpp

diff --git a/src/mac/classic/dcclient.cpp b/src/mac/classic/dcclient.cpp
index f28c6dc576053bc35bf00b85a33f93c7432c2662..9d7133b6e8597c5760c8569654951e24e6472d75 100644 (file)
--- a/src/mac/classic/dcclient.cpp
+++ b/src/mac/classic/dcclient.cpp
@@ -1,24 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcclient.cpp
+// Name:        src/mac/classic/dcclient.cpp
 // Purpose:     wxClientDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dcclient.h"
-#endif
+#include "wx/wxprec.h"
 
 #include "wx/dcclient.h"
-#include "wx/dcmemory.h"
-#include "wx/region.h"
-#include "wx/window.h"
-#include "wx/toplevel.h"
-#include <math.h>
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/dcmemory.h"
+    #include "wx/toplevel.h"
+    #include "wx/math.h"
+    #include "wx/region.h"
+#endif
+
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
@@ -31,11 +33,9 @@
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
-#endif
 
 /*
  * wxWindowDC
@@ -43,17 +43,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 
 #include "wx/mac/uma.h"
 
-wxWindowDC::wxWindowDC() 
+wxWindowDC::wxWindowDC()
 {
     m_window = NULL ;
 }
 
-wxWindowDC::wxWindowDC(wxWindow *window) 
+wxWindowDC::wxWindowDC(wxWindow *window)
 {
     m_window = window ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
-    
+
     int x , y ;
     x = y = 0 ;
     window->MacWindowToRootWindow( &x , &y ) ;
@@ -63,7 +63,7 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
-    m_ok = TRUE ;
+    m_ok = true ;
     SetBackground(window->MacGetBackgroundBrush());
 }
 
@@ -109,7 +109,7 @@ wxClientDC::wxClientDC(wxWindow *window)
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
 
-    m_ok = TRUE ;
+    m_ok = true ;
     SetBackground(window->MacGetBackgroundBrush());
     SetFont( window->GetFont() ) ;
 }
@@ -156,7 +156,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
 
-    m_ok = TRUE ;
+    m_ok = true ;
     SetBackground(window->MacGetBackgroundBrush());
     SetFont( window->GetFont() ) ;
 }
@@ -171,5 +171,3 @@ void wxPaintDC::DoGetSize(int *width, int *height) const
 
     m_window->GetClientSize( width, height );
 }
-
-