The code in wxMac's listbox was too ambitious in filtering

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

diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp
index 169f0d557acb5b622fb9b5e60c0755b8a8a3ee89..c1a5949c9dc547c46d4dcaf4ede0ee00b716212d 100644 (file)
--- a/src/mac/bmpbuttn.cpp
+++ b/src/mac/bmpbuttn.cpp
@@ -13,12 +13,16 @@
 #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"
+#include "wx/bitmap.h"
+

 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,92 @@ 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 ;
+    m_buttonBitmap = bitmap;
+       wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
+       
+       MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
+
+       m_macControl = ::NewControl( 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 ;
+       

 
 

-    return FALSE;
+       if ( m_buttonBitmap.Ok() )
+       {
+               if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
+           info.contentType = kControlContentPictHandle ;
+                       info.u.picture = bmap->m_hPict ;
+               }
+               else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
+               {
+                       if ( m_buttonBitmap.GetMask() )
+                       {
+                   info.contentType = kControlContentCIconHandle ;
+                               info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ,
+                                   8 , 16 ) ;
+                       }
+                       else
+                       {
+                   info.contentType = kControlContentCIconHandle ;
+                               info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL ,
+                                   8 , 16 ) ;
+                       }
+               }
+               else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
+               {
+               info.contentType = kControlContentCIconHandle ;
+               info.u.cIconHandle = bmap->m_hIcon ;
+               }
+       }
+       
+       ::SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+
+       MacPostControlCreate() ;
+
+    return TRUE;

 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {

+       ControlButtonContentInfo info ;

     m_buttonBitmap = bitmap;
     m_buttonBitmap = 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 )
+               {
+                       if ( m_buttonBitmap.GetMask() )
+                       {
+                   info.contentType = kControlContentCIconHandle ;
+                               info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ,
+                                   8 , 16 ) ;
+                       }
+                       else
+                       {
+                   info.contentType = kControlContentCIconHandle ;
+                               info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL ,
+                                   8 , 16 ) ;
+                       }
+               }
+               else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
+               {
+               info.contentType = kControlContentCIconHandle ;
+               info.u.cIconHandle = bmap->m_hIcon ;
+               }
+
+               
+           ::SetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+    }

 }
 
 }