Got rid of some wierd VisualAge debug nonsense that had appeared in this after the...

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

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 169f0d557acb5b622fb9b5e60c0755b8a8a3ee89..c1431386093f796c0bc2c4762f35cf13b889bd0c 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -19,6 +19,10 @@
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 #endif
 

+#include <wx/mac/uma.h>
+
+PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ;
+

 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,
            const wxSize& size, long style,
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,
            const wxSize& size, long style,


@@ -26,13 +30,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
            const wxString& name)
 {
     m_buttonBitmap = bitmap;
            const wxString& name)
 {
     m_buttonBitmap = bitmap;

-    SetName(name);
-    SetValidator(validator);
-    parent->AddChild(this);
-
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
-    m_windowStyle = style;
+ 

     m_marginX = 0;
     m_marginY = 0;
 
     m_marginX = 0;
     m_marginY = 0;
 


@@ -52,14 +50,72 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     if ( height == -1 && bitmap.Ok())
        height = bitmap.GetHeight() + 2*m_marginY;
 
     if ( height == -1 && bitmap.Ok())
        height = bitmap.GetHeight() + 2*m_marginY;
 

-    /* TODO: create bitmap button
-     */
+       Rect bounds ;
+       Str255 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, 
+               (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
+       wxASSERT_MSG( 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 ;
+       
+       info.contentType = kControlContentPictHandle ;
+       info.u.picture = icon ;
+       
+       UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+
+       MacPostControlCreate() ;

 
 

-    return FALSE;
+    return TRUE;

 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
     m_buttonBitmap = 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 ) ;

 }
 
 }