Back to previous call with -1 replacement.

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

diff --git a/src/mac/classic/dcscreen.cpp b/src/mac/classic/dcscreen.cpp
index 03d769a05b41ddf5987b5ac71122aac8a4e4da83..65f4ef442df1bf866a50da061365f98655990c9e 100644 (file)
--- a/src/mac/classic/dcscreen.cpp
+++ b/src/mac/classic/dcscreen.cpp
@@ -1,24 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.cpp
+// Name:        src/mac/classic/dcscreen.cpp

 // Purpose:     wxScreenDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxScreenDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dcscreen.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/dcscreen.h"
 
 #include "wx/dcscreen.h"

+

 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)

-#endif

 
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()
 
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()


@@ -29,7 +26,7 @@ wxScreenDC::wxScreenDC()
     GetPort( &port ) ;
     SetPort( (GrafPtr) m_macPort ) ;
     Point pt = { 0,0 } ;
     GetPort( &port ) ;
     SetPort( (GrafPtr) m_macPort ) ;
     Point pt = { 0,0 } ;

-    LocalToGlobal( &pt ) ;     
+    LocalToGlobal( &pt ) ;

     SetPort( port ) ;
     m_macLocalOrigin.x = -pt.h ;
     m_macLocalOrigin.y = -pt.v ;
     SetPort( port ) ;
     m_macLocalOrigin.x = -pt.h ;
     m_macLocalOrigin.y = -pt.v ;


@@ -38,17 +35,17 @@ wxScreenDC::wxScreenDC()
     m_macLocalOrigin.x = 0 ;
     m_macLocalOrigin.y = 0 ;
 #endif
     m_macLocalOrigin.x = 0 ;
     m_macLocalOrigin.y = 0 ;
 #endif

-     m_ok = TRUE ;
+    m_ok = true ;

     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );

-     m_minX = screenBits.bounds.left ;
- #if TARGET_CARBON
-     SInt16 height ;
-     GetThemeMenuBarHeight( &height ) ;
-     m_minY = screenBits.bounds.top + height ;
- #else
-     m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
- #endif
+    m_minX = screenBits.bounds.left ;
+#if TARGET_CARBON
+    SInt16 height ;
+    GetThemeMenuBarHeight( &height ) ;
+    m_minY = screenBits.bounds.top + height ;
+#else
+    m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
+#endif

     m_maxX = screenBits.bounds.right  ;
     m_maxY = screenBits.bounds.bottom ;
     MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ;
     m_maxX = screenBits.bounds.right  ;
     m_maxY = screenBits.bounds.bottom ;
     MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ;


@@ -60,4 +57,3 @@ wxScreenDC::~wxScreenDC()
 {
     // TODO
 }
 {
     // TODO
 }

-