fixing notifications

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

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 1176e5226bd12532cd273d708ecceacc9779876d..f6badadfeb5a52c9df4c259f3628de0ff1085c1f 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -1,50 +1,54 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.cpp
+// Name:        src/mac/carbon/bmpbuttn.cpp

 // Purpose:     wxBitmapButton
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxBitmapButton
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_BMPBUTTON
 
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_BMPBUTTON
 

-#include "wx/window.h"

 #include "wx/bmpbuttn.h"
 
 #include "wx/bmpbuttn.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/bitmap.h"
+#endif
+

 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 #include "wx/mac/uma.h"
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 #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,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxBitmapButton::Create( wxWindow *parent,
+                             wxWindowID id, const wxBitmap& bitmap,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             const wxValidator& validator,
+                             const wxString& name )

 {
 {

-    m_macIsUserPane = FALSE ;
-    
+    m_macIsUserPane = false;
+

     // since bitmapbuttonbase is subclass of button calling wxBitmapButtonBase::Create
     // essentially creates an additional button
     // since bitmapbuttonbase is subclass of button calling wxBitmapButtonBase::Create
     // essentially creates an additional button

-    if ( !wxControl::Create(parent, id, pos, size,
-                                     style, validator, name) )
+    if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )

         return false;
 
     m_bmpNormal = bitmap;
         return false;
 
     m_bmpNormal = bitmap;

- 
-    if (style & wxBU_AUTODRAW)
+
+    if ( style & wxBU_AUTODRAW )

     {
     {

-        m_marginX = wxDEFAULT_BUTTON_MARGIN;
+        m_marginX =

         m_marginY = wxDEFAULT_BUTTON_MARGIN;
     }
     else
     {
         m_marginY = wxDEFAULT_BUTTON_MARGIN;
     }
     else
     {

-        m_marginX = 0;
+        m_marginX =

         m_marginY = 0;
     }
 
         m_marginY = 0;
     }
 


@@ -54,77 +58,85 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     if ( bitmap.Ok() )
     {
         wxSize newSize = DoGetBestSize();
     if ( bitmap.Ok() )
     {
         wxSize newSize = DoGetBestSize();

-        if ( width == -1 )
+        if ( width == wxDefaultCoord )

             width = newSize.x;
             width = newSize.x;

-        if ( height == -1 )
+        if ( height == wxDefaultCoord )

             height = newSize.y;
     }
 
     m_bmpNormal = bitmap;
             height = newSize.y;
     }
 
     m_bmpNormal = bitmap;

-        
-    ControlButtonContentInfo info ;

 
 

-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl( this ) ;
+    OSStatus err = noErr;
+    ControlButtonContentInfo info;
+
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+    m_peer = new wxMacControl( this );

 
 #ifdef __WXMAC_OSX__
     if ( HasFlag( wxBORDER_NONE ) )
     {
 
 #ifdef __WXMAC_OSX__
     if ( HasFlag( wxBORDER_NONE ) )
     {

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

     }
     else
 #endif
     {
     }
     else
 #endif
     {

-        wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
-        verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
-                                                 (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel )  , 
-                                                 kControlBehaviorOffsetContents , &info , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
+        wxMacCreateBitmapButton( &info, m_bmpNormal );
+        err = CreateBevelButtonControl(
+            MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, CFSTR(""),
+            ((style & wxBU_AUTODRAW) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel ),
+            kControlBehaviorOffsetContents, &info, 0, 0, 0, m_peer->GetControlRefAddr() );

     }
     }

-    wxMacReleaseBitmapButton( &info ) ;
-    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
-    
-    MacPostControlCreate(pos,size) ;

 
 

-    return TRUE;
+    verify_noerr( err );
+
+    wxMacReleaseBitmapButton( &info );
+    wxASSERT_MSG( m_peer != NULL && m_peer->Ok(), wxT("No valid native Mac control") );
+
+    MacPostControlCreate( pos, size );
+
+    return true;

 }
 
 }
 

-void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
+void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )

 {
     m_bmpNormal = bitmap;
     InvalidateBestSize();
 
 {
     m_bmpNormal = bitmap;
     InvalidateBestSize();
 

-    ControlButtonContentInfo info ;
+    ControlButtonContentInfo info;
+

 #ifdef __WXMAC_OSX__
     if ( HasFlag( wxBORDER_NONE ) )
     {
 #ifdef __WXMAC_OSX__
     if ( HasFlag( wxBORDER_NONE ) )
     {

-        wxMacCreateBitmapButton( &info , m_bmpNormal , kControlContentIconRef ) ;
+        wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );

         if ( info.contentType != kControlNoContent )
         if ( info.contentType != kControlNoContent )

-        {
-            m_peer->SetData( kControlIconPart , kControlIconContentTag , info ) ;
-        }
+            m_peer->SetData( kControlIconPart, kControlIconContentTag, info );

     }
     else
 #endif
     {
     }
     else
 #endif
     {

-        wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
+        wxMacCreateBitmapButton( &info, m_bmpNormal );

         if ( info.contentType != kControlNoContent )
         if ( info.contentType != kControlNoContent )

-        {
-            m_peer->SetData( kControlButtonPart , kControlBevelButtonContentTag , info ) ;
-        }
+            m_peer->SetData( kControlButtonPart, kControlBevelButtonContentTag, info );

     }
     }

-    wxMacReleaseBitmapButton( &info ) ;
-}

 
 

+    wxMacReleaseBitmapButton( &info );
+}

 
 wxSize wxBitmapButton::DoGetBestSize() const
 {
     wxSize best;
 
 wxSize wxBitmapButton::DoGetBestSize() const
 {
     wxSize best;

-    if (m_bmpNormal.Ok())
+
+    best.x = 2 * m_marginX;
+    best.y = 2 * m_marginY;
+    if ( m_bmpNormal.Ok() )

     {
     {

-        best.x = m_bmpNormal.GetWidth() + 2*m_marginX;
-        best.y = m_bmpNormal.GetHeight() + 2*m_marginY;
+        best.x += m_bmpNormal.GetWidth();
+        best.y += m_bmpNormal.GetHeight();

     }
     }

+

     return best;
 }
 
     return best;
 }