pass wxIntPtr, not wxUIntPtr, to wxListCtrl::SortItems() callback as it's more compat...

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

diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp
index a943963a68deb78ec336ea467c7f6b7f0b41714f..9c165badcb58fe6796a0af837d26caeb8b0a2729 100644 (file)
--- a/src/osx/carbon/dcclient.cpp
+++ b/src/osx/carbon/dcclient.cpp
@@ -111,9 +111,6 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     HIRect rect;
     CGImageRef image;
     CGContextRef context;
-    void* data;
-
-    size_t bytesPerRow;
 
     HIViewCreateOffscreenImage( handle, 0, &rect, &image);
 
@@ -180,6 +177,7 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
 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 );