Ensure that the default wxWebView backends are registered.

[wxWidgets.git] / src / os2 / spinctrl.cpp

diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp
index 1777cda78b95be3b3b7088b1c5f32cd76304c0da..a826c0957dde3b056f732d817d040514428f92e5 100644 (file)
--- a/src/os2/spinctrl.cpp
+++ b/src/os2/spinctrl.cpp
@@ -40,8 +40,6 @@ extern void  wxAssociateWinWithHandle( HWND         hWnd
 static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL;
 wxArraySpins                        wxSpinCtrl::m_svAllSpins;
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
     EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange)
@@ -126,8 +124,11 @@ bool wxSpinCtrl::Create( wxWindow*       pParent,
         m_windowId = NewControlId();
     else
         m_windowId = vId;
-    m_backgroundColour = pParent->GetBackgroundColour();
-    m_foregroundColour = pParent->GetForegroundColour();
+    if (pParent)
+    {
+        m_backgroundColour = pParent->GetBackgroundColour();
+        m_foregroundColour = pParent->GetForegroundColour();
+    }
     SetName(rsName);
     SetParent(pParent);
     m_windowStyle      = lStyle;
@@ -296,7 +297,7 @@ wxSpinCtrl* wxSpinCtrl::GetSpinForTextCtrl(
 
     // sanity check
     wxASSERT_MSG( pSpin->m_hWndBuddy == hWndBuddy,
-                  _T("wxSpinCtrl has incorrect buddy HWND!") );
+                  wxT("wxSpinCtrl has incorrect buddy HWND!") );
 
     return pSpin;
 } // end of wxSpinCtrl::GetSpinForTextCtrl
@@ -325,7 +326,7 @@ void wxSpinCtrl::OnChar (
     {
         case WXK_RETURN:
             {
-                wxCommandEvent              vEvent( wxEVT_COMMAND_TEXT_ENTER
+                wxCommandEvent              vEvent( wxEVT_TEXT_ENTER
                                                    ,m_windowId
                                                   );
                 wxString                    sVal = wxGetWindowText(m_hWndBuddy);
@@ -367,7 +368,7 @@ void wxSpinCtrl::OnSpinChange(
   wxSpinEvent&                      rEventSpin
 )
 {
-    wxCommandEvent                  vEvent( wxEVT_COMMAND_SPINCTRL_UPDATED
+    wxCommandEvent                  vEvent( wxEVT_SPINCTRL
                                            ,GetId()
                                           );
 
@@ -399,7 +400,7 @@ bool wxSpinCtrl::ProcessTextCommand( WXWORD wCmd,
     {
         case SPBN_CHANGE:
         {
-            wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED, GetId() );
+            wxCommandEvent vEvent( wxEVT_TEXT, GetId() );
             vEvent.SetEventObject(this);
 
             wxString sVal = wxGetWindowText(m_hWndBuddy);