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 de59d6db47c371de0b459354bfebc2829194d65a..7f89c97abdcfd85451187c82f21d9f897c21ed26 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -29,13 +29,13 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-    m_buttonBitmap = bitmap;
+    m_bmpNormal = bitmap;

  
     m_marginX = 0;
     m_marginY = 0;
 
  
     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;
 
     int width = size.x;
     int height = size.y;
 


@@ -52,19 +52,23 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
        Rect bounds ;
        Str255 title ;
 
        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 = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 
                kControlBehaviorOffsetContents + 
        
        MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
        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( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
        
        ControlButtonContentInfo info ;
                (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
        wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
        
        ControlButtonContentInfo info ;

-       wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
+       wxMacCreateBitmapButton( &info , m_bmpNormal ) ;

        if ( info.contentType != kControlNoContent )
        {
            ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
        if ( info.contentType != kControlNoContent )
        {
            ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;


@@ -76,13 +80,13 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {

-    m_buttonBitmap = bitmap;
+    m_bmpNormal = bitmap;

 
 

-       ControlButtonContentInfo info ;
-       wxMacCreateBitmapButton( &info , m_buttonBitmap ) ;
-       if ( info.contentType != kControlNoContent )
-       {
-           ::SetControlData( (ControlHandle) 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 ) ;

     }
 }
 
     }
 }