fix a crash when dismissing the popup window because of a key press

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

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index d63ddcb227878ed6ea5e989331c9ce2f312ad8b2..ed8ee2a469fb9c614ef239f3509c364a2583bb66 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -21,8 +21,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 #endif
 
 #include "wx/mac/uma.h"
-
-PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ;
+#include "wx/bitmap.h"
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,
@@ -58,11 +57,11 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
        
        MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 
                kControlBehaviorOffsetContents + 
                    ( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
                (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
-       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+       wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
        
        ControlButtonContentInfo info ;
        
@@ -70,29 +69,32 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
        if ( m_buttonBitmap.Ok() )
        {
                if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
-               info.contentType = kControlContentPictHandle ;
-               info.u.picture = bmap->m_hPict ;
+           info.contentType = kControlContentPictHandle ;
+                       info.u.picture = MAC_WXHMETAFILE( bmap->m_hPict ) ;
                }
                else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
                {
-               info.contentType = kControlContentPictHandle ;
                        if ( m_buttonBitmap.GetMask() )
                        {
-                               info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
+                   info.contentType = kControlContentCIconHandle ;
+                               info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP( bmap->m_hBitmap ) , MAC_WXHBITMAP(m_buttonBitmap.GetMask()->GetMaskBitmap()) ,
+                                   8 , 16 ) ;
                        }
                        else
                        {
-                               info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
+                   info.contentType = kControlContentCIconHandle ;
+                               info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP( bmap->m_hBitmap ) , NULL ,
+                                   8 , 16 ) ;
                        }
                }
                else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
                {
                info.contentType = kControlContentCIconHandle ;
-               info.u.cIconHandle = bmap->m_hIcon ;
+               info.u.cIconHandle = MAC_WXHICON(bmap->m_hIcon) ;
                }
        }
        
-       UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+       ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
 
        MacPostControlCreate() ;
 
@@ -107,30 +109,33 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
        if ( m_buttonBitmap.Ok() )
        {
                wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
-               if ( bmap->m_bitmapType == kMacBitmapTypePict )
-               {
-               info.contentType = kControlContentPictHandle ;
-               info.u.picture = bmap->m_hPict ;
+               if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
+           info.contentType = kControlContentPictHandle ;
+                       info.u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
                }
                else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
                {
-               info.contentType = kControlContentPictHandle ;
                        if ( m_buttonBitmap.GetMask() )
                        {
-                               info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
+                   info.contentType = kControlContentCIconHandle ;
+                               info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(m_buttonBitmap.GetMask()->GetMaskBitmap()) ,
+                                   8 , 16 ) ;
                        }
                        else
                        {
-                               info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
+                   info.contentType = kControlContentCIconHandle ;
+                               info.u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
+                                   8 , 16 ) ;
                        }
                }
                else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
                {
                info.contentType = kControlContentCIconHandle ;
-               info.u.cIconHandle = bmap->m_hIcon ;
+               info.u.cIconHandle = MAC_WXHICON( bmap->m_hIcon ) ;
                }
+
                
-           UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+           ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
     }
 }