fixing return values and handling of invalid files

[wxWidgets.git] / src / osx / carbon / dcclient.cpp

diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp
index 9264e8b2d830fd25f595a329bc699b39341fca1e..9c165badcb58fe6796a0af837d26caeb8b0a2729 100644 (file)
--- a/src/osx/carbon/dcclient.cpp
+++ b/src/osx/carbon/dcclient.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/dcclient.cpp
+// Name:        src/osx/carbon/dcclient.cpp

 // Purpose:     wxClientDCImpl class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxClientDCImpl class
 // Author:      Stefan Csomor
 // Modified by:


@@ -111,9 +111,6 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     HIRect rect;
     CGImageRef image;
     CGContextRef context;
     HIRect rect;
     CGImageRef image;
     CGContextRef context;

-    void* data;
-
-    size_t bytesPerRow;

 
     HIViewCreateOffscreenImage( handle, 0, &rect, &image);
 
 
     HIViewCreateOffscreenImage( handle, 0, &rect, &image);
 


@@ -135,7 +132,6 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     CGContextDrawImage( context, rect, image );
 
     CGContextRestoreGState(context);
     CGContextDrawImage( context, rect, image );
 
     CGContextRestoreGState(context);

-

     return bmp;
 }
 #endif
     return bmp;
 }
 #endif


@@ -181,6 +177,7 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
 wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) :
     wxWindowDCImpl( owner, window )
 {
 wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) :
     wxWindowDCImpl( owner, window )
 {

+    wxASSERT_MSG( window->MacGetCGContextRef() != NULL, _T("using wxPaintDC without being in a native paint event") );

     wxPoint origin = window->GetClientAreaOrigin() ;
     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );
     wxPoint origin = window->GetClientAreaOrigin() ;
     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );