Make wxr resources work in Unicode mode.

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

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 3b4a0a5d85a72c92aea3ebba3eb10dd11e1b6a97..7f89c97abdcfd85451187c82f21d9f897c21ed26 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -20,9 +20,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 #endif
 
-#include <wx/mac/uma.h>
-
-PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ;
+#include "wx/mac/uma.h"
+#include "wx/bitmap.h"
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,
@@ -30,13 +29,13 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
            const wxValidator& validator,
            const wxString& name)
 {
-    m_buttonBitmap = bitmap;
+    m_bmpNormal = bitmap;
  
     m_marginX = 0;
     m_marginY = 0;
 
-    int x = pos.x;
-    int y = pos.y;
+    // int x = pos.x;
+    // int y = pos.y;
     int width = size.x;
     int height = size.y;
 
@@ -53,47 +52,27 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
        Rect bounds ;
        Str255 title ;
-    m_buttonBitmap = bitmap;
-       wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
+    m_bmpNormal = bitmap;
+       wxBitmapRefData * bmap = NULL ;
+       
+       if ( m_bmpNormal.Ok() )
+               bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
        
        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, 
+                   ( bmap && 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 ;
-       
-
-       if ( m_buttonBitmap.Ok() )
+       wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+       if ( info.contentType != kControlNoContent )
        {
-               if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
-               info.contentType = kControlContentPictHandle ;
-               info.u.picture = 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() ) ;
-                       }
-                       else
-                       {
-                               info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
-                       }
-               }
-               else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
-               {
-               info.contentType = kControlContentCIconHandle ;
-               info.u.cIconHandle = bmap->m_hIcon ;
-               }
-       }
-       
-       UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
-
+           ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }
        MacPostControlCreate() ;
 
     return TRUE;
@@ -101,36 +80,13 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
-       ControlButtonContentInfo info ;
-    m_buttonBitmap = bitmap;
+    m_bmpNormal = 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 ;
-               }
-               else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
-               {
-               info.contentType = kControlContentPictHandle ;
-                       if ( m_buttonBitmap.GetMask() )
-                       {
-                               info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
-                       }
-                       else
-                       {
-                               info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
-                       }
-               }
-               else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
-               {
-               info.contentType = kControlContentCIconHandle ;
-               info.u.cIconHandle = bmap->m_hIcon ;
-               }
-               
-           UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    ControlButtonContentInfo info ;
+    wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+    if ( info.contentType != kControlNoContent )
+    {
+        ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
     }
 }