fixed the menu bug introduced by the previous commit

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index e8a9b079b62e2aef6f56e8e6326d68e208356ce2..cbc1d846d95bf5ca56a7c54f1d034813a45b3e86 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -22,7 +22,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #endif
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 // Button
 
 
 // Button
 
 


@@ -37,9 +37,9 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
        
        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 ) ;
                kControlPushButtonProc , (long) this ) ;

-       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+       wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;

        
        MacPostControlCreate() ;
 
        
        MacPostControlCreate() ;
 


@@ -50,40 +50,26 @@ void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
     wxButton *btnOldDefault = NULL;
 {
     wxWindow *parent = GetParent();
     wxButton *btnOldDefault = NULL;

-    wxPanel *panel = wxDynamicCast(parent, wxPanel);
-    if ( panel )
+    if ( parent )

     {
     {

-        btnOldDefault = wxDynamicCast(panel->GetDefaultItem(),
+        btnOldDefault = wxDynamicCast(parent->GetDefaultItem(),

            wxButton);
            wxButton);

-        panel->SetDefaultItem(this);
+        parent->SetDefaultItem(this);

     }
 
     }
 

-#ifdef __DARWIN__

        Boolean inData;
        if ( btnOldDefault && btnOldDefault->m_macControl )
        {
                inData = 0;
        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) ) ;
        }
                                                   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
        }

-       if ( m_macControl )
+       if ( (ControlHandle) m_macControl )

        {
                inData = 1;
        {
                inData = 1;

-               UMASetControlData( m_macControl , kControlButtonPart ,
+               ::SetControlData(  (ControlHandle) m_macControl , kControlButtonPart ,

                                                   kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
        }
                                                   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
 }
 
 wxSize wxButton::DoGetBestSize() const


@@ -109,20 +95,23 @@ wxSize wxButton::GetDefaultSize()
 
 void wxButton::Command (wxCommandEvent & event)
 {
 
 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 ) ;
                unsigned long finalTicks ;
                Delay( 8 , &finalTicks ) ;

-               HiliteControl( m_macControl , 0 ) ;
+               HiliteControl(  (ControlHandle) m_macControl , 0 ) ;

        }
     ProcessCommand (event);
 }
 
        }
     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);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
     event.SetEventObject(this);
     ProcessCommand(event);

+  }

 }
 
 }