A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index c67c470acfbe1ce05e35e4712f441df06949b063..e8a9b079b62e2aef6f56e8e6326d68e208356ce2 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "button.h"
 #endif
 
 #pragma implementation "button.h"
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/button.h"
 #include "wx/panel.h"
 
 #include "wx/button.h"
 #include "wx/panel.h"
 


@@ -35,7 +37,7 @@ 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 , true , 0 , 0 , 1, 
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 

                kControlPushButtonProc , (long) this ) ;
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
        
                kControlPushButtonProc , (long) this ) ;
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
        


@@ -51,11 +53,12 @@ void wxButton::SetDefault()
     wxPanel *panel = wxDynamicCast(parent, wxPanel);
     if ( panel )
     {
     wxPanel *panel = wxDynamicCast(parent, wxPanel);
     if ( panel )
     {

-        btnOldDefault = panel->GetDefaultItem();
+        btnOldDefault = wxDynamicCast(panel->GetDefaultItem(),
+           wxButton);

         panel->SetDefaultItem(this);
     }
 
         panel->SetDefaultItem(this);
     }
 

-#ifdef __UNIX__
+#ifdef __DARWIN__

        Boolean inData;
        if ( btnOldDefault && btnOldDefault->m_macControl )
        {
        Boolean inData;
        if ( btnOldDefault && btnOldDefault->m_macControl )
        {