toplevel code transferred to wxTopLevelWindow

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 19600ac5d797cf03fb6c383d28dc2938e21c7bba..83cdba79e008cd151a574309749453df2e0edf8b 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -50,12 +50,11 @@ 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);

     }
 
        Boolean inData;
     }
 
        Boolean inData;


@@ -108,8 +107,11 @@ void wxButton::Command (wxCommandEvent & event)
 
 void wxButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
 
 void wxButton::MacHandleControlClick( ControlHandle control , SInt16 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);

+  }

 }
 
 }