refactor wxDocChildFrame and wxDocMDIChildFrame to use wxDocChildFrameAny intead...

[wxWidgets.git] / src / univ / spinbutt.cpp

diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp
index 7df6ef7b8b70e3cbe88541ee9388ad12541ff2ec..e1d885795b7660168b04fd83f1f860759757cc7c 100644 (file)
--- a/src/univ/spinbutt.cpp
+++ b/src/univ/spinbutt.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "spinbutt.h"
-    #pragma implementation "univspinbutt.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -103,7 +98,7 @@ bool wxSpinButton::Create(wxWindow *parent,
                                    wxDefaultValidator, name) )
         return false;
 
                                    wxDefaultValidator, name) )
         return false;
 

-    SetBestSize(size);
+    SetInitialSize(size);

 
     CreateInputHandler(wxINP_HANDLER_SPINBTN);
 
 
     CreateInputHandler(wxINP_HANDLER_SPINBTN);
 


@@ -329,14 +324,14 @@ void wxSpinButton::CalcArrowRects(wxRect *rect1, wxRect *rect2) const
     }
 }
 
     }
 }
 

-wxScrollArrows::Arrow wxSpinButton::HitTest(const wxPoint& pt) const
+wxScrollArrows::Arrow wxSpinButton::HitTestArrow(const wxPoint& pt) const

 {
     wxRect rectArrow1, rectArrow2;
     CalcArrowRects(&rectArrow1, &rectArrow2);
 
 {
     wxRect rectArrow1, rectArrow2;
     CalcArrowRects(&rectArrow1, &rectArrow2);
 

-    if ( rectArrow1.Inside(pt) )
+    if ( rectArrow1.Contains(pt) )

         return wxScrollArrows::Arrow_First;
         return wxScrollArrows::Arrow_First;

-    else if ( rectArrow2.Inside(pt) )
+    else if ( rectArrow2.Contains(pt) )

         return wxScrollArrows::Arrow_Second;
     else
         return wxScrollArrows::Arrow_None;
         return wxScrollArrows::Arrow_Second;
     else
         return wxScrollArrows::Arrow_None;


@@ -360,6 +355,14 @@ bool wxSpinButton::PerformAction(const wxControlAction& action,
     return true;
 }
 
     return true;
 }
 

+/* static */
+wxInputHandler *wxSpinButton::GetStdInputHandler(wxInputHandler *handlerDef)
+{
+    static wxStdSpinButtonInputHandler s_handler(handlerDef);
+
+    return &s_handler;
+}
+

 // ----------------------------------------------------------------------------
 // wxStdSpinButtonInputHandler
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStdSpinButtonInputHandler
 // ----------------------------------------------------------------------------