// Created: 10/15/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "spinbutt.h"
- #pragma implementation "spinbutbase.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
extern void wxAssociateWinWithHandle( HWND hWnd
,wxWindowOS2* pWin
);
-static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL;
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
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;
::WinQueryWindowPos(m_hWnd, &vSwp);
SetXComp(vSwp.x);
- SetYComp(vSwp.y);
- wxFont* pTextFont = new wxFont( 10
- ,wxMODERN
- ,wxNORMAL
- ,wxNORMAL
- );
- SetFont(*pTextFont);
+ SetYComp(vSwp.y-5); // compensate for the associated TextControl border
+
+ SetFont(*wxSMALL_FONT);
//
// For OS/2 we want to hide the text portion so we can substitute an
- // independent text ctrl in its place. 10 device units does this
+ // independent text ctrl in its place.
+ // Therefore we must override any user given width with our best guess.
//
- SetSize( nX
- ,nY
- ,10L
+ SetSize( nX - GetXComp()
+ ,nY - GetYComp()
+ ,nWidth
,nHeight
);
wxAssociateWinWithHandle( m_hWnd
::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this);
fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
#endif
- delete pTextFont;
return TRUE;
} // end of wxSpinButton::Create
wxSize wxSpinButton::DoGetBestSize() const
{
//
- // OS/2 PM does not really have system metrics so we'll just set it to
- // 24x20 which is the size of the buttons and the borders.
- // Also we have no horizontal spin buttons.
+ // OS/2 PM does not really have system metrics so we'll just set it to
+ // a square based on its height.
//
- return (wxSize(24,20));
+ RECTL vRect;
+ ::WinQueryWindowRect(GetHwnd(),&vRect);
+ return wxSize(vRect.yTop,vRect.yTop);
} // end of wxSpinButton::DoGetBestSize
// ----------------------------------------------------------------------------
return ((int)lVal);
} // end of wxSpinButton::GetValue
-bool wxSpinButton::OS2OnScroll(
- int nOrientation
-, WXWORD wParam
-, WXWORD wPos
-, WXHWND hControl
-)
+bool wxSpinButton::OS2OnScroll( int WXUNUSED(nOrientation),
+ WXWORD WXUNUSED(wParam),
+ WXWORD wPos,
+ WXHWND hControl )
{
- wxCHECK_MSG(hControl, FALSE, wxT("scrolling what?") )
+ wxCHECK_MSG(hControl, false, wxT("scrolling what?") );
- wxSpinEvent vEvent( wxEVT_SCROLL_THUMBTRACK
- ,m_windowId
- );
- int nVal = (int)wPos; // cast is important for negative values!
+ wxSpinEvent vEvent( wxEVT_SCROLL_THUMBTRACK, m_windowId );
+ int nVal = (int)wPos; // cast is important for negative values!
vEvent.SetPosition(nVal);
vEvent.SetEventObject(this);
- return(GetEventHandler()->ProcessEvent(vEvent));
+ return(HandleWindowEvent(vEvent));
} // end of wxSpinButton::OS2OnScroll
-bool wxSpinButton::OS2Command(
- WXUINT uCmd
-, WXWORD wId
-)
+bool wxSpinButton::OS2Command( WXUINT WXUNUSED(uCmd),
+ WXWORD WXUNUSED(wId) )
{
- return FALSE;
+ return false;
} // end of wxSpinButton::OS2Command
void wxSpinButton::SetRange(