corrected wake up code

[wxWidgets.git] / src / mac / carbon / dc.cpp

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index a46cf732404e26297a3ef7d18ef5c639568c30b7..825c9b9816f0a2c46573c03b84beff52966a13fc 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -6,13 +6,9 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

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

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

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

 #include "wx/wxprec.h"
 
 #include "wx/dc.h"
 #include "wx/wxprec.h"
 
 #include "wx/dc.h"


@@ -26,19 +22,22 @@
 #include "wx/image.h"
 #include "wx/log.h"
 
 #include "wx/image.h"
 #include "wx/log.h"
 

-#if __MSL__ >= 0x6000
-namespace std {}
-using namespace std ;
+#ifdef __MSL__
+    #if __MSL__ >= 0x6000
+        namespace std {}
+        using namespace std ;
+    #endif

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

+#ifndef __DARWIN__

 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>
 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)

 #endif
 
 #endif
 

+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
+

 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------


@@ -366,7 +365,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
      PixMapHandle bmappixels ;
      // Set foreground and background colours (for bitmaps depth = 1)
      if(bmp.GetDepth() == 1)
      PixMapHandle bmappixels ;
      // Set foreground and background colours (for bitmaps depth = 1)
      if(bmp.GetDepth() == 1)

-    {
+     {

          RGBColor fore = MAC_WXCOLORREF(m_textForegroundColour.GetPixel());
          RGBColor back = MAC_WXCOLORREF(m_textBackgroundColour.GetPixel());
          RGBForeColor(&fore);
          RGBColor fore = MAC_WXCOLORREF(m_textForegroundColour.GetPixel());
          RGBColor back = MAC_WXCOLORREF(m_textBackgroundColour.GetPixel());
          RGBForeColor(&fore);


@@ -457,11 +456,6 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
 void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;
 void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region  )
 {
     wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;

-    if (region.Empty())
-    {
-        DestroyClippingRegion();
-        return;
-    }

     wxMacFastPortSetter helper(this) ;
     wxCoord x, y, w, h;
     region.GetBox( x, y, w, h );
     wxMacFastPortSetter helper(this) ;
     wxCoord x, y, w, h;
     region.GetBox( x, y, w, h );


@@ -1321,7 +1315,7 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
     UniCharCount chars = str.Length() ;
     UniChar* ubuf = NULL ;
 #if SIZEOF_WCHAR_T == 4
     UniCharCount chars = str.Length() ;
     UniChar* ubuf = NULL ;
 #if SIZEOF_WCHAR_T == 4

-    wxMBConvUTF16BE converter ;
+    wxMBConvUTF16 converter ;

 #if wxUSE_UNICODE
     size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
     ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
 #if wxUSE_UNICODE
     size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
     ubuf = (UniChar*) malloc( unicharlen + 2 ) ;


@@ -1672,9 +1666,9 @@ void wxDC::MacInstallFont() const
         Pattern whiteColor ;
         ::BackPat(GetQDGlobalsWhite(&whiteColor));
     }
         Pattern whiteColor ;
         ::BackPat(GetQDGlobalsWhite(&whiteColor));
     }

-    
+

     wxASSERT( m_font.Ok() ) ;
     wxASSERT( m_font.Ok() ) ;

-    
+

 
     ::TextFont( m_font.MacGetFontNum() ) ;
     ::TextSize( (short)(m_scaleY * m_font.MacGetFontSize()) ) ;
 
     ::TextFont( m_font.MacGetFontNum() ) ;
     ::TextSize( (short)(m_scaleY * m_font.MacGetFontSize()) ) ;


@@ -1751,7 +1745,7 @@ void wxDC::MacInstallFont() const
         atsuTags, atsuSizes, atsuValues);
 
     wxASSERT_MSG( status == noErr , wxT("couldn't Modify ATSU style") ) ;
         atsuTags, atsuSizes, atsuValues);
 
     wxASSERT_MSG( status == noErr , wxT("couldn't Modify ATSU style") ) ;

-    
+

 }
 
 Pattern gPatterns[] =
 }
 
 Pattern gPatterns[] =