new file added

[wxWidgets.git] / src / generic / spinctlg.cpp

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index e9a7a32a3720f1faed833d6bf91d4c207e78e6ae..9a2a5eb4e4d30773d38a1ce28e3eab6cb40c58ec 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -283,16 +283,24 @@ void wxSpinCtrlGenericBase::SetFocus()
         m_textCtrl->SetFocus();
 }
 
         m_textCtrl->SetFocus();
 }
 

+#ifdef __WXMSW__
+
+void wxSpinCtrlGenericBase::DoEnable(bool enable)
+{
+    // We never enable this control itself, it must stay disabled to avoid
+    // interfering with the siblings event handling (see e.g. #12045 for the
+    // kind of problems which arise otherwise).
+    if ( !enable )
+        wxSpinCtrlBase::DoEnable(enable);
+}
+
+#endif // __WXMSW__
+

 bool wxSpinCtrlGenericBase::Enable(bool enable)
 {
 bool wxSpinCtrlGenericBase::Enable(bool enable)
 {

-    // Notice that we never enable this control itself, it must stay disabled
-    // to avoid interfering with the siblings event handling (see e.g. #12045
-    // for the kind of problems which arise otherwise).
-    if ( enable == m_isEnabled )
+    if ( !wxSpinCtrlBase::Enable(enable) )

         return false;
 
         return false;
 

-    m_isEnabled = enable;
-

     m_spinButton->Enable(enable);
     m_textCtrl->Enable(enable);
 
     m_spinButton->Enable(enable);
     m_textCtrl->Enable(enable);
 


@@ -315,17 +323,6 @@ bool wxSpinCtrlGenericBase::Show(bool show)
     return true;
 }
 
     return true;
 }
 

-bool wxSpinCtrlGenericBase::Reparent(wxWindowBase *newParent)
-{
-    if ( m_spinButton )
-    {
-        m_spinButton->Reparent(newParent);
-        m_textCtrl->Reparent(newParent);
-    }
-
-    return true;
-}
-

 #if wxUSE_TOOLTIPS
 void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip)
 {
 #if wxUSE_TOOLTIPS
 void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip)
 {