#endif // WXWIN_COMPATIBILITY
}
+bool wxControl::Create(wxWindow *parent, wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size, long style,
+#if wxUSE_VALIDATORS
+ const wxValidator& validator,
+#endif
+ const wxString& name)
+{
+ bool rval = wxWindow::Create(parent, id, pos, size, style, name);
+ if (rval) {
+#if wxUSE_VALIDATORS
+ SetValidator(validator);
+#endif
+ }
+ return rval;
+}
+
wxControl::~wxControl()
{
m_isBeingDeleted = TRUE;
}
-bool wxControl::OS2CreateControl(const wxChar *classname, WXDWORD style)
+bool wxControl::OS2CreateControl(const wxChar *classname,
+ WXDWORD style,
+ const wxPoint& pos,
+ const wxSize& size,
+ const wxString& label,
+ WXDWORD exstyle)
{
- m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(GetParent())
- ,classname
- ,NULL
- ,style
- ,0,0,0,0
- ,NULLHANDLE
- ,HWND_TOP
- ,(HMENU)GetId()
- ,NULL
- ,NULL
- );
+ // VZ: if someone could put a comment here explaining what exactly this is
+ // needed for, it would be nice...
+ bool want3D;
+
+ // if no extended style given, determine it ourselves
+ if ( exstyle == (WXDWORD)-1 )
+ {
+ exstyle = GetExStyle(style);
+ }
+// TODO:
+/*
+ // all controls have these childs (wxWindows creates all controls visible
+ // by default)
+ style |= WS_CHILD | WS_VISIBLE;
+
+ m_hWnd = (WXHWND)::CreateWindowEx
+ (
+ exstyle, // extended style
+ classname, // the kind of control to create
+ label, // the window name
+ style, // the window style
+ pos.x, pos.y, // the window position
+ size.x, size.y, // and size
+ GetHwndOf(GetParent()), // parent
+ (HMENU)GetId(), // child id
+ wxGetInstance(), // app instance
+ NULL // creation parameters
+ );
if ( !m_hWnd )
{
return FALSE;
}
+#if wxUSE_CTL3D
+ if ( want3D )
+ {
+ Ctl3dSubclassCtl(GetHwnd());
+ m_useCtl3D = TRUE;
+ }
+#endif // wxUSE_CTL3D
+
// subclass again for purposes of dialog editing mode
SubclassWin(m_hWnd);
// controls use the same font and colours as their parent dialog by default
InheritAttributes();
-
+*/
return TRUE;
}
// macros
// ----------------------------------------------------------------------------
- IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
+ EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
+END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// before using DoGetBestSize(), have to set style to let the base class
// know whether this is a horizontal or vertical control (we're always
// vertical)
- SetWindowStyle(style | wxSP_VERTICAL);
+ style |= wxSP_VERTICAL;
+ SetWindowStyle(style);
// calculate the sizes: the size given is the toal size for both controls
// and we need to fit them both in the given width (height is the same)
wxSize sizeText(size), sizeBtn(size);
sizeBtn.x = wxSpinButton::DoGetBestSize().x;
+ if ( sizeText.x <= 0 )
+ {
+ // DEFAULT_ITEM_WIDTH is the default width for the text control
+ sizeText.x = DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN + sizeBtn.x;
+ }
+
sizeText.x -= sizeBtn.x + MARGIN_BETWEEN;
if ( sizeText.x <= 0 )
{
SetValue(initial);
// create the text window
- if ( sizeText.y <= 0 )
- {
- // make it the same height as the button then
- int x, y;
- wxSpinButton::DoGetSize(&x, &y);
-
- sizeText.y = y;
- }
-
m_hwndBuddy = (WXHWND)::CreateWindowEx
(
- WS_EX_CLIENTEDGE, // sunken border
- _T("EDIT"), // window class
- NULL, // no window title
- WS_CHILD | WS_VISIBLE | WS_BORDER, // style
- pos.x, pos.y, // position
- sizeText.x, sizeText.y, // size
- GetHwndOf(parent), // parent
- (HMENU)-1, // control id
- wxGetInstance(), // app instance
- NULL // unused client data
+ WS_EX_CLIENTEDGE, // sunken border
+ _T("EDIT"), // window class
+ NULL, // no window title
+ WS_CHILD | WS_BORDER, // style (will be shown later)
+ pos.x, pos.y, // position
+ 0, 0, // size (will be set later)
+ GetHwndOf(parent), // parent
+ (HMENU)-1, // control id
+ wxGetInstance(), // app instance
+ NULL // unused client data
);
if ( !m_hwndBuddy )
}
// should have the same font as the other controls
- WXHANDLE hFont = GetParent()->GetFont().GetResourceHandle();
- ::SendMessage((HWND)m_hwndBuddy, WM_SETFONT, (WPARAM)hFont, TRUE);
+ SetFont(GetParent()->GetFont());
+
+ // set the size of the text window - can do it only now, because we
+ // couldn't call DoGetBestSize() before as font wasn't set
+ if ( sizeText.y <= 0 )
+ {
+ int cx, cy;
+ wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+
+ sizeText.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
+ }
+
+ DoMoveWindow(pos.x, pos.y,
+ sizeText.x + sizeBtn.x + MARGIN_BETWEEN, sizeText.y);
+
+ (void)::ShowWindow((HWND)m_hwndBuddy, SW_SHOW);
// associate the text window with the spin button
- (void)SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
+ (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
+
+ if ( !value.IsEmpty() )
+ {
+ SetValue(value);
+ }
*/
return FALSE;
}
+// ----------------------------------------------------------------------------
+// wxTextCtrl-like methods
+// ----------------------------------------------------------------------------
+
+void wxSpinCtrl::SetValue(const wxString& text)
+{
+ // TODO:
+ /*
+ if ( !::SetWindowText((HWND)m_hwndBuddy, text.c_str()) )
+ {
+ wxLogLastError("SetWindowText(buddy)");
+ }
+ */
+}
+
+int wxSpinCtrl::GetValue() const
+{
+ wxString val = wxGetWindowText(m_hwndBuddy);
+
+ long n;
+ if ( (wxSscanf(val, wxT("%lu"), &n) != 1) )
+ n = INT_MIN;
+
+ return n;
+}
+
+// ----------------------------------------------------------------------------
+// forward some methods to subcontrols
+// ----------------------------------------------------------------------------
+
+bool wxSpinCtrl::SetFont(const wxFont& font)
+{
+ if ( !wxWindowBase::SetFont(font) )
+ {
+ // nothing to do
+ return FALSE;
+ }
+
+ WXHANDLE hFont = GetFont().GetResourceHandle();
+ // TODO:
+ /*
+ (void)::SendMessage((HWND)m_hwndBuddy, WM_SETFONT, (WPARAM)hFont, TRUE);
+ */
+ return TRUE;
+}
+
+bool wxSpinCtrl::Show(bool show)
+{
+ if ( !wxControl::Show(show) )
+ {
+ return FALSE;
+ }
+
+ // TODO:
+ /*
+ ::ShowWindow((HWND)m_hwndBuddy, show ? SW_SHOW : SW_HIDE);
+ */
+ return TRUE;
+}
+
+bool wxSpinCtrl::Enable(bool enable)
+{
+ if ( !wxControl::Enable(enable) )
+ {
+ return FALSE;
+ }
+
+ // TODO:
+ /*
+ ::EnableWindow((HWND)m_hwndBuddy, enable);
+ */
+ return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// event processing
+// ----------------------------------------------------------------------------
+
+void wxSpinCtrl::OnSpinChange(wxSpinEvent& eventSpin)
+{
+ wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
+ event.SetEventObject(this);
+ event.SetInt(eventSpin.GetPosition());
+
+ (void)GetEventHandler()->ProcessEvent(event);
+
+ if ( eventSpin.GetSkipped() )
+ {
+ event.Skip();
+ }
+}
+
// ----------------------------------------------------------------------------
// size calculations
// ----------------------------------------------------------------------------
+wxSize wxSpinCtrl::DoGetBestSize() const
+{
+ wxSize sizeBtn = wxSpinButton::DoGetBestSize();
+ // TODO:
+ /*
+ sizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;
+
+ int y;
+ wxGetCharSize(GetHWND(), NULL, &y, &GetFont());
+ y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(y);
+
+ if ( sizeBtn.y < y )
+ {
+ // make the text tall enough
+ sizeBtn.y = y;
+ }
+ */
+ return sizeBtn;
+}
+
void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
{
int widthBtn = DoGetBestSize().x;
projects / wxWidgets.git / commitdiff
