fixes to the sizers behaviour necessary to make the log dialog work again

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

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index 53c0861dbe5bac228463e87318395a9d38180b2c..cbc1d846d95bf5ca56a7c54f1d034813a45b3e86 100644 (file)
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "button.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/button.h"
 #include "wx/panel.h"
 
@@ -20,7 +22,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 // Button
 
 
@@ -35,9 +37,9 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
                kControlPushButtonProc , (long) this ) ;
-       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+       wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
        
        MacPostControlCreate() ;
 
@@ -48,39 +50,26 @@ void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
     wxButton *btnOldDefault = NULL;
-    wxPanel *panel = wxDynamicCast(parent, wxPanel);
-    if ( panel )
+    if ( parent )
     {
-        btnOldDefault = panel->GetDefaultItem();
-        panel->SetDefaultItem(this);
+        btnOldDefault = wxDynamicCast(parent->GetDefaultItem(),
+           wxButton);
+        parent->SetDefaultItem(this);
     }
 
-#ifdef __UNIX__
        Boolean inData;
        if ( btnOldDefault && btnOldDefault->m_macControl )
        {
                inData = 0;
-               UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
+               ::SetControlData( (ControlHandle) btnOldDefault->m_macControl , kControlButtonPart ,
                                                   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
        }
-       if ( m_macControl )
+       if ( (ControlHandle) m_macControl )
        {
                inData = 1;
-               UMASetControlData( m_macControl , kControlButtonPart ,
+               ::SetControlData(  (ControlHandle) m_macControl , kControlButtonPart ,
                                                   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
        }
-#else
-       if ( btnOldDefault && btnOldDefault->m_macControl )
-       {
-               UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart ,
-                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)0) ) ;
-       }
-       if ( m_macControl )
-       {
-               UMASetControlData( m_macControl , kControlButtonPart ,
-                                                  kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ;
-       }
-#endif
 }
 
 wxSize wxButton::DoGetBestSize() const
@@ -106,20 +95,23 @@ wxSize wxButton::GetDefaultSize()
 
 void wxButton::Command (wxCommandEvent & event)
 {
-       if ( m_macControl )
+       if ( (ControlHandle) m_macControl )
        {
-               HiliteControl( m_macControl , kControlButtonPart ) ;
+               HiliteControl(  (ControlHandle) m_macControl , kControlButtonPart ) ;
                unsigned long finalTicks ;
                Delay( 8 , &finalTicks ) ;
-               HiliteControl( m_macControl , 0 ) ;
+               HiliteControl(  (ControlHandle) m_macControl , 0 ) ;
        }
     ProcessCommand (event);
 }
 
-void wxButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
+  if ( controlpart != kControlNoPart )
+  {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
     event.SetEventObject(this);
     ProcessCommand(event);
+  }
 }