more backwards compatible kbd handling in wxScrolledWindow

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 51a32f9814e39f6302901224a97b08340a11bb1b..5159b21ceb495373605c21cbf28266a85cb1aa82 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -19,6 +19,7 @@
 
 #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".


@@ -35,6 +36,8 @@
 // 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 wxUSE_SPINBTN
+

 #if defined(__WIN95__) && !defined(__TWIN32__)
 
 #include "wx/spinbutt.h"
 #if defined(__WIN95__) && !defined(__TWIN32__)
 
 #include "wx/spinbutt.h"


@@ -52,10 +55,8 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);

 
 // ----------------------------------------------------------------------------
 // wxSpinButton
 
 // ----------------------------------------------------------------------------
 // wxSpinButton


@@ -104,7 +105,8 @@ bool wxSpinButton::Create(wxWindow *parent,
 
     // translate the styles
     DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
 
     // translate the styles
     DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |

-                   UDS_SETBUDDYINT; // it doesn't harm if we don't have buddy
+                   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_HORIZONTAL )
         wstyle |= UDS_HORZ;


@@ -151,7 +153,7 @@ wxSpinButton::~wxSpinButton()
 // size calculation
 // ----------------------------------------------------------------------------
 
 // size calculation
 // ----------------------------------------------------------------------------
 

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

 {
     if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
     {
 {
     if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
     {


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

+
+#endif
+    // wxUSE_SPINCTN
+