fixed casting for X

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

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index c1431386093f796c0bc2c4762f35cf13b889bd0c..5d03c4f8d34bc53d997b21427baf97ba5f2a5495 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -13,15 +13,15 @@
 #pragma implementation "bmpbuttn.h"
 #endif
 
 #pragma implementation "bmpbuttn.h"
 #endif
 

+#include "wx/window.h"

 #include "wx/bmpbuttn.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 #endif
 
 #include "wx/bmpbuttn.h"
 
 #if !USE_SHARED_LIBRARY
 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,
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,


@@ -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,39 +52,23 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
        Rect bounds ;
        Str255 title ;
 
        Rect bounds ;
        Str255 title ;

+        m_bmpNormal = bitmap;
+       wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
+       

        MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
        MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 
-               kControlBehaviorOffsetContents + kControlContentPictHandle , 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 ) ;
                (( 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" ) ;

        
        

-    m_buttonBitmap = bitmap;
-                       PicHandle       icon = NULL ;
-       if ( m_buttonBitmap.Ok() )
-       {
-               wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
-               if ( bmap->m_bitmapType == kMacBitmapTypePict )
-                       icon = bmap->m_hPict ;
-               else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
-               {
-                       if ( m_buttonBitmap.GetMask() )
-                       {
-                               icon = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
-                       }
-                       else
-                       {
-                               icon = MakePict( bmap->m_hBitmap , NULL ) ;
-                       }
-               }
-       }

        ControlButtonContentInfo info ;
        ControlButtonContentInfo info ;

-       
-       info.contentType = kControlContentPictHandle ;
-       info.u.picture = icon ;
-       
-       UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
-
+       wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+       if ( info.contentType != kControlNoContent )
+       {
+           ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }

        MacPostControlCreate() ;
 
     return TRUE;
        MacPostControlCreate() ;
 
     return TRUE;


@@ -92,30 +76,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;
-                       PicHandle       icon = NULL ;
-       if ( m_buttonBitmap.Ok() )
-       {
-               wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
-               if ( bmap->m_bitmapType == kMacBitmapTypePict )
-                       icon = bmap->m_hPict ;
-               else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
-               {
-                       if ( m_buttonBitmap.GetMask() )
-                       {
-                               icon = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
-                       }
-                       else
-                       {
-                               icon = MakePict( bmap->m_hBitmap , NULL ) ;
-                       }
-               }
-       }
-       ControlButtonContentInfo info ;
-       
-       info.contentType = kControlContentPictHandle ;
-       info.u.picture = icon ;
-       
-       UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    m_bmpNormal = bitmap;
+
+    ControlButtonContentInfo info ;
+    wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+    if ( info.contentType != kControlNoContent )
+    {
+        ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }

 }
 
 }