X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfa7a6e2391857846ab46968ce71d6730139939e..0f5378d414cb68caaa535199c1af12dec1720c3d:/src/common/spinctrlcmn.cpp

diff --git a/src/common/spinctrlcmn.cpp b/src/common/spinctrlcmn.cpp
index a412181416..87c820bcf1 100644
--- a/src/common/spinctrlcmn.cpp
+++ b/src/common/spinctrlcmn.cpp
@@ -28,8 +28,8 @@
 
 #if wxUSE_SPINCTRL
 
-wxDEFINE_EVENT(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, wxSpinDoubleEvent);
+wxDEFINE_EVENT(wxEVT_SPINCTRL, wxSpinEvent);
+wxDEFINE_EVENT(wxEVT_SPINCTRLDOUBLE, wxSpinDoubleEvent);
 
 // ----------------------------------------------------------------------------
 // XTI
@@ -70,14 +70,14 @@ wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
 wxFLAGS_MEMBER(wxSP_WRAP)
 wxEND_FLAGS( wxSpinCtrlStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl, "wx/spinbut.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl, "wx/spinctrl.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl)
 wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent )
 
-wxEVENT_PROPERTY( Updated, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEvent )
-wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
-wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+wxEVENT_PROPERTY( Updated, wxEVT_SPINCTRL, wxCommandEvent )
+wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_TEXT_ENTER, wxCommandEvent )
 
 wxPROPERTY( ValueString, wxString, SetValue, GetValue, \
            wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) ;
@@ -103,4 +103,17 @@ wxCONSTRUCTOR_6( wxSpinCtrl, wxWindow*, Parent, wxWindowID, Id, \
                 wxSize, Size, long, WindowStyle )
 
 
+wxString wxPrivate::wxSpinCtrlFormatAsHex(long val, long maxVal)
+{
+    // We format the value like this is for compatibility with (native
+    // behaviour of) wxMSW
+    wxString text;
+    if ( maxVal < 0x10000 )
+        text.Printf(wxS("0x%04lx"), val);
+    else
+        text.Printf(wxS("0x%08lx"), val);
+
+    return text;
+}
+
 #endif // wxUSE_SPINCTRL