added new text event macros description

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index e5423b1ffb438e30d2029be2169b252c708303a6..24d5340b6e8a5a2fc769ae12ddc21bb86c06ed91 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_BUTTON
+

 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"


@@ -126,15 +128,6 @@ bool wxButton::Create(wxWindow *parent,
 
 wxButton::~wxButton()
 {
 
 wxButton::~wxButton()
 {

-    wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-    if ( panel )
-    {
-        if ( panel->GetDefaultItem() == this )
-        {
-            // don't leave the panel with invalid default item
-            panel->SetDefaultItem(NULL);
-        }
-    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -164,7 +157,7 @@ wxSize wxButton::DoGetBestSize() const
 }
 
 /* static */
 }
 
 /* static */

-wxSize wxButton::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize()

 {
     static wxSize s_sizeBtn;
 
 {
     static wxSize s_sizeBtn;
 


@@ -195,20 +188,20 @@ wxSize wxButton::GetDefaultSize()
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();

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

     {
     {

-        btnOldDefault = panel->GetDefaultItem();
-        panel->SetDefaultItem(this);
-    }
+        wxWindow *winOldDefault = parent->SetDefaultItem(this);
+        btnOldDefault = wxDynamicCast(winOldDefault, wxButton);

 
 

-    if ( parent )
+        ::SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L);
+    }
+    else // is a button without parent really normal?

     {
     {

-        SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L);
+        btnOldDefault = NULL;

     }
 
     }
 

-    if ( btnOldDefault )
+    if ( btnOldDefault && btnOldDefault != this )

     {
         // remove the BS_DEFPUSHBUTTON style from the other button
         long style = GetWindowLong(GetHwndOf(btnOldDefault), GWL_STYLE);
     {
         // remove the BS_DEFPUSHBUTTON style from the other button
         long style = GetWindowLong(GetHwndOf(btnOldDefault), GWL_STYLE);


@@ -527,3 +520,6 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
 }
 
 #endif // __WIN32__
 }
 
 #endif // __WIN32__

+
+#endif // wxUSE_BUTTON
+