#include "wx/wx.h"
#endif
-#if wxUSE_SPINBTN
+#if wxUSE_SPINCTRL
#include "wx/spinctrl.h"
#include "wx/os2/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
- EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
+ EVT_CHAR(wxSpinCtrl::OnChar)
+ EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange)
+ EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// constants
wxSpinCtrl* pSpin = (wxSpinCtrl *)::WinQueryWindowULong( hWnd
,QWL_USER
);
- bool bProccesed = FALSE;
- MRESULT rc = (MRESULT)0;
+
//
// Forward some messages (the key ones only so far) to the spin ctrl
//
{
SWP vSwp;
- if (vId == -1)
+ if (vId == wxID_ANY)
m_windowId = NewControlId();
else
m_windowId = vId;
);
if (m_hWnd == 0)
{
- return FALSE;
+ return false;
}
m_hWndBuddy = m_hWnd; // One in the same for OS/2
if(pParent)
fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
m_svAllSpins.Add(this);
delete pTextFont;
- return TRUE;
+ return true;
} // end of wxSpinCtrl::Create
wxSize wxSpinCtrl::DoGetBestSize() const
{
wxSize vSizeBtn = wxSpinButton::DoGetBestSize();
int nHeight;
+ wxFont vFont = (wxFont)GetFont();
vSizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;
wxGetCharSize( GetHWND()
,NULL
,&nHeight
- ,(wxFont*)&GetFont()
+ ,&vFont
);
nHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nHeight);
{
if (!wxControl::Enable(bEnable))
{
- return FALSE;
+ return false;
}
::WinEnableWindow(GetHwnd(), bEnable);
- return TRUE;
+ return true;
} // end of wxSpinCtrl::Enable
wxSpinCtrl* wxSpinCtrl::GetSpinForTextCtrl(
,SPBQ_UPDATEIFVALID
)
);
- lVal - atol(zVal);
- return lVal;
+ lVal = atol(zVal);
+ return (int)lVal;
} // end of wxSpinCtrl::GetValue
void wxSpinCtrl::OnChar (
wxKeyEvent& rEvent
)
{
- switch (rEvent.KeyCode())
+ switch (rEvent.GetKeyCode())
{
case WXK_RETURN:
{
wxString sVal = wxGetWindowText(m_hWndBuddy);
InitCommandEvent(vEvent);
- vEvent.SetString((char*)sVal.c_str());
+ vEvent.SetString(sVal);
vEvent.SetInt(GetValue());
if (GetEventHandler()->ProcessEvent(vEvent))
return;
}
} // end of wxSpinCtrl::OnSpinChange
+void wxSpinCtrl::OnSetFocus (
+ wxFocusEvent& rEvent
+)
+{
+ //
+ // When we get focus, give it to our buddy window as it needs it more than
+ // we do
+ //
+ ::WinSetFocus(HWND_DESKTOP, (HWND)m_hWndBuddy);
+ rEvent.Skip();
+} // end of wxSpinCtrl::OnSetFocus
+
bool wxSpinCtrl::ProcessTextCommand(
WXWORD wCmd
, WXWORD wId
wxString sVal = wxGetWindowText(m_hWndBuddy);
- vEvent.SetString((char*)sVal.c_str());
+ vEvent.SetString(sVal);
vEvent.SetInt(GetValue());
return (GetEventHandler()->ProcessEvent(vEvent));
}
//
// Not processed
//
- return FALSE;
+ return false;
} // end of wxSpinCtrl::ProcessTextCommand
void wxSpinCtrl::SetFocus()
if (!wxWindowBase::SetFont(rFont))
{
// nothing to do
- return FALSE;
+ return false;
}
- WXHANDLE hFont = GetFont().GetResourceHandle();
wxOS2SetFont( m_hWnd
,rFont
);
- return TRUE;
+ return true;
} // end of wxSpinCtrl::SetFont
void wxSpinCtrl::SetValue(
{
long lVal;
- lVal = atol(rsText.c_str());
+ lVal = atol((char*)rsText.c_str());
wxSpinButton::SetValue(lVal);
} // end of wxSpinCtrl::SetValue
{
if (!wxControl::Show(bShow))
{
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
} // end of wxSpinCtrl::Show
-#endif //wxUSE_SPINBTN
\ No newline at end of file
+void wxSpinCtrl::SetSelection (
+ long lFrom
+, long lTo
+)
+{
+ //
+ // If from and to are both -1, it means (in wxWidgets) that all text should
+ // be selected - translate into Windows convention
+ //
+ if ((lFrom == -1) && (lTo == -1))
+ {
+ lFrom = 0;
+ }
+ ::WinSendMsg(m_hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), (MPARAM)0);
+} // end of wxSpinCtrl::SetSelection
+
+#endif //wxUSE_SPINCTRL