Funny resize behaviour fix.

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 1b89986f8d2b04a1b77aec3970db934d4e5e816f..fe6e08b37274fcf6850aa8ccd8e38088c540f5d3 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -9,8 +9,17 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
     #pragma implementation "spinbutt.h"
 #ifdef __GNUG__
     #pragma implementation "spinbutt.h"

+    #pragma implementation "spinbutbase.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -27,19 +36,33 @@
 // Can't resolve reference to CreateUpDownControl in
 // TWIN32, but could probably use normal CreateWindow instead.
 
 // Can't resolve reference to CreateUpDownControl in
 // TWIN32, but could probably use normal CreateWindow instead.
 

-#if defined(__WIN95__) && !defined(__TWIN32__)
+#if wxUSE_SPINBTN

 
 #include "wx/spinbutt.h"
 
 #include "wx/spinbutt.h"

+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
+
+#if defined(__WIN95__) && !defined(__TWIN32__)
+

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

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

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

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
-#endif
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+
+// ----------------------------------------------------------------------------
+// wxSpinButton
+// ----------------------------------------------------------------------------

 
 bool wxSpinButton::Create(wxWindow *parent,
                           wxWindowID id,
 
 bool wxSpinButton::Create(wxWindow *parent,
                           wxWindowID id,


@@ -48,70 +71,109 @@ bool wxSpinButton::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
                           long style,
                           const wxString& name)
 {

-  wxSystemSettings settings;
-  m_backgroundColour = parent->GetBackgroundColour() ;
-  m_foregroundColour = parent->GetForegroundColour() ;
-
-  SetName(name);
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    // basic initialization
+    InitBase();

 
 

-  m_windowStyle = style;
+    m_windowId = (id == -1) ? NewControlId() : id;

 
 

-  SetParent(parent);
+    m_backgroundColour = parent->GetBackgroundColour() ;
+    m_foregroundColour = parent->GetForegroundColour() ;

 
 

-  if (width <= 0)
-    width = 100;
-  if (height <= 0)
-    height = 30;
-  if (x < 0)
-    x = 0;
-  if (y < 0)
-    y = 0;
+    SetName(name);

 
 

-  InitBase();
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;

 
 

-  m_windowId = (id == -1) ? NewControlId() : id;
+    m_windowStyle = style;

 
 

-  DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP;
+    SetParent(parent);

 
 

-  if ( m_windowStyle & wxSP_HORIZONTAL )
-    wstyle |= UDS_HORZ;
-  if ( m_windowStyle & wxSP_ARROW_KEYS )
-    wstyle |= UDS_ARROWKEYS;
-  if ( m_windowStyle & wxSP_WRAP )
-    wstyle |= UDS_WRAP;
+    // get the right size for the control
+    if ( width <= 0 || height <= 0 )
+    {
+        wxSize size = DoGetBestSize();
+        if ( width <= 0 )
+            width = size.x;
+        if ( height <= 0 )
+            height = size.y;
+    }

 
 

-  // Create the ListView control.
-  HWND hWndListControl = CreateUpDownControl(wstyle,
-    x, y, width, height,
-    (HWND) parent->GetHWND(),
-    m_windowId,
-    wxGetInstance(),
-    0,
-    m_min, m_max, m_min);
+    if ( x < 0 )
+        x = 0;
+    if ( y < 0 )
+        y = 0;
+
+    // translate the styles
+    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
+                   UDS_NOTHOUSANDS | // never useful, sometimes harmful
+                   UDS_SETBUDDYINT;  // it doesn't harm if we don't have buddy
+
+    if ( m_windowStyle & wxSP_HORIZONTAL )
+        wstyle |= UDS_HORZ;
+    if ( m_windowStyle & wxSP_ARROW_KEYS )
+        wstyle |= UDS_ARROWKEYS;
+    if ( m_windowStyle & wxSP_WRAP )
+        wstyle |= UDS_WRAP;
+
+    // create the UpDown control.
+    m_hWnd = (WXHWND)CreateUpDownControl
+                     (
+                       wstyle,
+                       x, y, width, height,
+                       GetHwndOf(parent),
+                       m_windowId,
+                       wxGetInstance(),
+                       NULL, // no buddy
+                       m_max, m_min,
+                       m_min // initial position
+                     );
+
+    if ( !m_hWnd )
+    {
+        wxLogLastError("CreateUpDownControl");

 
 

-  m_hWnd = (WXHWND) hWndListControl;
-  if (parent) parent->AddChild(this);
+        return FALSE;
+    }

 
 

-  // TODO: have this for all controls.
-  if ( !m_hWnd )
-    return FALSE;
+    if ( parent )
+    {
+        parent->AddChild(this);
+    }

 
 

-  SubclassWin((WXHWND) m_hWnd);
+    SubclassWin(m_hWnd);

 
 

-  return TRUE;
+    return TRUE;

 }
 
 wxSpinButton::~wxSpinButton()
 {
 }
 
 }
 
 wxSpinButton::~wxSpinButton()
 {
 }
 

+// ----------------------------------------------------------------------------
+// size calculation
+// ----------------------------------------------------------------------------
+
+wxSize wxSpinButton::DoGetBestSize() const
+{
+    if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
+    {
+        // vertical control
+        return wxSize(GetSystemMetrics(SM_CXVSCROLL),
+                      2*GetSystemMetrics(SM_CYVSCROLL));
+    }
+    else
+    {
+        // horizontal control
+        return wxSize(2*GetSystemMetrics(SM_CXHSCROLL),
+                      GetSystemMetrics(SM_CYHSCROLL));
+    }
+}
+
+// ----------------------------------------------------------------------------

 // Attributes
 // Attributes

-////////////////////////////////////////////////////////////////////////////
+// ----------------------------------------------------------------------------

 
 int wxSpinButton::GetValue() const
 {
 
 int wxSpinButton::GetValue() const
 {


@@ -133,7 +195,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
                                WXWORD pos, WXHWND control)
 {
 bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
                                WXWORD pos, WXHWND control)
 {

-    wxCHECK_MSG( control, FALSE, T("scrolling what?") )
+    wxCHECK_MSG( control, FALSE, wxT("scrolling what?") )

 
     if ( wParam != SB_THUMBPOSITION )
     {
 
     if ( wParam != SB_THUMBPOSITION )
     {


@@ -151,9 +213,9 @@ bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
 bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
 #ifndef __GNUWIN32__
 bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
 #ifndef __GNUWIN32__

-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(__WATCOMC__)

     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;

-#elif defined(__VISUALC__) && (__VISUALC__ == 1010)
+#elif defined(__VISUALC__) && (__VISUALC__ >= 1000) && (__VISUALC__ < 1020)

     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
 #else
     LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
 #else
     LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;


@@ -170,7 +232,7 @@ bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     *result = event.IsAllowed() ? 0 : 1;
 
     return processed;
     *result = event.IsAllowed() ? 0 : 1;
 
     return processed;

-#else
+#else // GnuWin32

     return FALSE;
 #endif
 }
     return FALSE;
 #endif
 }


@@ -182,3 +244,7 @@ bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
 }
 
 #endif // __WIN95__
 }
 
 #endif // __WIN95__

+
+#endif
+    // wxUSE_SPINCTN
+