X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61a028dc4af537da90fd52935a75afc9056ecd09..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/os2/spinbutt.cpp?ds=inline diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp index c176baa141..19ea7af582 100644 --- a/src/os2/spinbutt.cpp +++ b/src/os2/spinbutt.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: src/os2/spinbutt.cpp // Purpose: wxSpinButton // Author: David Webster // Modified by: @@ -28,8 +28,6 @@ extern void wxAssociateWinWithHandle( HWND hWnd ,wxWindowOS2* pWin ); -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) - #include "wx/os2/private.h" // ============================================================================ @@ -40,8 +38,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) - bool wxSpinButton::Create( wxWindow* pParent , wxWindowID vId @@ -63,8 +59,11 @@ bool wxSpinButton::Create( 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; @@ -194,7 +193,7 @@ bool wxSpinButton::OS2OnScroll( int WXUNUSED(nOrientation), vEvent.SetPosition(nVal); vEvent.SetEventObject(this); - return(GetEventHandler()->ProcessEvent(vEvent)); + return(HandleWindowEvent(vEvent)); } // end of wxSpinButton::OS2OnScroll bool wxSpinButton::OS2Command( WXUINT WXUNUSED(uCmd),