more minimal stuff

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

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 1e5ed522668e83575a2e3eb605f658f49383f5e6..e8f8323ff3c8d073644f5212d9523217d08c6973 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -33,12 +33,14 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+#if wxUSE_SPINCTRL
+

 #if defined(__WIN95__)
 
 #include "wx/spinctrl.h"
 #include "wx/msw/private.h"
 
 #if defined(__WIN95__)
 
 #include "wx/spinctrl.h"
 #include "wx/msw/private.h"
 

-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 


@@ -48,9 +50,11 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
+
+BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
+    EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
+END_EVENT_TABLE()

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -81,7 +85,8 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // 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)
     // 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)
 
     // 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)


@@ -140,8 +145,10 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // couldn't call DoGetBestSize() before as font wasn't set
     if ( sizeText.y <= 0 )
     {
     // couldn't call DoGetBestSize() before as font wasn't set
     if ( sizeText.y <= 0 )
     {

-        // make it the same height as the button then
-        sizeText.y = DoGetBestSize().y;
+        int cx, cy;
+        wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+
+        sizeText.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);

     }
 
     DoMoveWindow(pos.x, pos.y,
     }
 
     DoMoveWindow(pos.x, pos.y,


@@ -166,7 +173,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
 
 void wxSpinCtrl::SetValue(const wxString& text)
 {
 
 void wxSpinCtrl::SetValue(const wxString& text)
 {

-    if ( ::SetWindowText((HWND)m_hwndBuddy, text.c_str()) )
+    if ( !::SetWindowText((HWND)m_hwndBuddy, text.c_str()) )

     {
         wxLogLastError("SetWindowText(buddy)");
     }
     {
         wxLogLastError("SetWindowText(buddy)");
     }


@@ -184,7 +191,7 @@ int wxSpinCtrl::GetValue() const
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// when setting font, we need to do it for both controls
+// forward some methods to subcontrols

 // ----------------------------------------------------------------------------
 
 bool wxSpinCtrl::SetFont(const wxFont& font)
 // ----------------------------------------------------------------------------
 
 bool wxSpinCtrl::SetFont(const wxFont& font)


@@ -201,11 +208,58 @@ bool wxSpinCtrl::SetFont(const wxFont& font)
     return TRUE;
 }
 
     return TRUE;
 }
 

+bool wxSpinCtrl::Show(bool show)
+{
+    if ( !wxControl::Show(show) )
+    {
+        return FALSE;
+    }
+
+    ::ShowWindow((HWND)m_hwndBuddy, show ? SW_SHOW : SW_HIDE);
+
+    return TRUE;
+}
+
+bool wxSpinCtrl::Enable(bool enable)
+{
+    if ( !wxControl::Enable(enable) )
+    {
+        return FALSE;
+    }
+
+    ::EnableWindow((HWND)m_hwndBuddy, enable);
+
+    return TRUE;
+}
+
+void wxSpinCtrl::SetFocus()
+{
+    ::SetFocus((HWND)m_hwndBuddy);
+}
+
+// ----------------------------------------------------------------------------
+// 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
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // size calculations
 // ----------------------------------------------------------------------------
 

-wxSize wxSpinCtrl::DoGetBestSize()
+wxSize wxSpinCtrl::DoGetBestSize() const

 {
     wxSize sizeBtn = wxSpinButton::DoGetBestSize();
     sizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;
 {
     wxSize sizeBtn = wxSpinButton::DoGetBestSize();
     sizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;


@@ -245,3 +299,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 }
 
 #endif // __WIN95__
 }
 
 #endif // __WIN95__

+
+#endif
+       // wxUSE_SPINCTRL
+