Fixed DDE memory leaks.

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

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index d63ddcb227878ed6ea5e989331c9ce2f312ad8b2..4f067315139fa05c96fb3363b2f78ed597a8aad3 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        bmpbuttn.cpp
 // Purpose:     wxBitmapButton
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -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,
@@ -30,107 +29,71 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
            const wxValidator& validator,
            const wxString& name)
 {
-    m_buttonBitmap = bitmap;
+    // since bitmapbuttonbase is subclass of button calling wxBitmapButtonBase::Create
+    // essentially creates an additional button
+    if ( !wxControl::Create(parent, id, pos, size,
+                                     style, validator, name) )
+        return false;
+
+    m_bmpNormal = bitmap;
  
-    m_marginX = 0;
-    m_marginY = 0;
+    if (style & wxBU_AUTODRAW)
+    {
+        m_marginX = wxDEFAULT_BUTTON_MARGIN;
+        m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    }
+    else
+    {
+        m_marginX = 0;
+        m_marginY = 0;
+    }
 
-    int x = pos.x;
-    int y = pos.y;
     int width = size.x;
     int height = size.y;
 
-    if (id == -1)
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
-
     if ( width == -1 && bitmap.Ok())
-       width = bitmap.GetWidth() + 2*m_marginX;
+        width = bitmap.GetWidth() + 2*m_marginX;
 
     if ( height == -1 && bitmap.Ok())
-       height = bitmap.GetHeight() + 2*m_marginY;
-
-       Rect bounds ;
-       Str255 title ;
-    m_buttonBitmap = bitmap;
-       wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &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" ) ;
-       
-       ControlButtonContentInfo info ;
-       
-
-       if ( m_buttonBitmap.Ok() )
-       {
-               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 ) ;
-
-       MacPostControlCreate() ;
+        height = bitmap.GetHeight() + 2*m_marginY;
+
+    Rect bounds ;
+    Str255 title ;
+    m_bmpNormal = bitmap;
+    wxBitmapRefData * bmap = NULL ;
+    
+    if ( m_bmpNormal.Ok() )
+        bmap = (wxBitmapRefData*) ( m_bmpNormal.GetRefData()) ;
+    
+    MacPreControlCreate( parent , id ,  wxEmptyString , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
+
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 
+        kControlBehaviorOffsetContents + 
+            ( bmap && bmap->m_bitmapType == kMacBitmapTypeIcon ? 
+            kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
+          (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
+    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
+    
+    ControlButtonContentInfo info ;
+    wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+    if ( info.contentType != kControlNoContent )
+    {
+        ::SetControlData( (ControlHandle) m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }
+    MacPostControlCreate() ;
 
     return TRUE;
 }
 
 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 ) ;
     }
 }