ignore WinCE projects and build directories

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

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 0d9e2d3956bcf714b5231df4db13afcb34390a86..aae979a8620fbad6519987b5c51791098e932f82 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -118,16 +118,15 @@ bool wxBitmapButton::Create( wxWindow *parent,
         m_bmpNormal = bitmap;
 
 
         m_bmpNormal = bitmap;
 
 

-#ifdef __WXMAC_OSX__

     if ( HasFlag( wxBORDER_NONE ) )
     {
     if ( HasFlag( wxBORDER_NONE ) )
     {

+               // contrary to the docs this control only works with iconrefs

         wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
         err = CreateIconControl(
                 MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
                 &bounds, &info, false, m_peer->GetControlRefAddr() );
     }
     else
         wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
         err = CreateIconControl(
                 MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
                 &bounds, &info, false, m_peer->GetControlRefAddr() );
     }
     else

-#endif

     {
         wxMacCreateBitmapButton( &info, m_bmpNormal );
         err = CreateBevelButtonControl(
     {
         wxMacCreateBitmapButton( &info, m_bmpNormal );
         err = CreateBevelButtonControl(


@@ -157,7 +156,6 @@ void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
 
     ControlButtonContentInfo info;
 
 
     ControlButtonContentInfo info;
 

-#ifdef __WXMAC_OSX__

     if ( HasFlag( wxBORDER_NONE ) )
     {        
         wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
     if ( HasFlag( wxBORDER_NONE ) )
     {        
         wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );


@@ -165,7 +163,6 @@ void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
             m_peer->SetData( kControlIconPart, kControlIconContentTag, info );
     }
     else
             m_peer->SetData( kControlIconPart, kControlIconContentTag, info );
     }
     else

-#endif

     {
         wxMacCreateBitmapButton( &info, m_bmpNormal );
         if ( info.contentType != kControlNoContent )
     {
         wxMacCreateBitmapButton( &info, m_bmpNormal );
         if ( info.contentType != kControlNoContent )