cleanup

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 2fbb7dd2f6c30c232e838a474678dd4073d01fb9..9915e71354486f4a09a7202913d5d50373dcc334 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -216,6 +216,7 @@ PicHandle wxMacCreatePicHandle( const wxBitmap &bmp )
         GWorldPtr monoworld ;
         clipRgn = NewRgn() ;
         OSStatus err = NewGWorld( &monoworld , 1 , &rect , NULL , NULL , 0 ) ;
         GWorldPtr monoworld ;
         clipRgn = NewRgn() ;
         OSStatus err = NewGWorld( &monoworld , 1 , &rect , NULL , NULL , 0 ) ;

+        verify_noerr(err) ;

         LockPixels( GetGWorldPixMap( monoworld ) ) ;
         LockPixels( GetGWorldPixMap( mask ) ) ;
         SetGWorld( monoworld , NULL ) ;
         LockPixels( GetGWorldPixMap( monoworld ) ) ;
         LockPixels( GetGWorldPixMap( mask ) ) ;
         SetGWorld( monoworld , NULL ) ;

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index a739a49c579da4eceb03655fd84a763c2c80850a..685b8e1a68d8837baea68a687221eb9270ec7786 100644 (file)
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -135,8 +135,6 @@ wxRendererMac::DrawHeaderButton(wxWindow *win,
                                 const wxRect& rect,
                                 int flags)
 {
                                 const wxRect& rect,
                                 int flags)
 {

-    const int CORNER = 1;
-

     const wxCoord x = rect.x-1,
                   y = rect.y-1,
                   w = rect.width,
     const wxCoord x = rect.x-1,
                   y = rect.y-1,
                   w = rect.width,