Corrected thread.h inline problem. Set WXWIN_COMPATIBILITY to 0 by default in wxMSW.

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 56d537619e8380f03866f7bfd1059bf8505f75f6..bb3e75b68d4a35cd9e82cea8cb1dde09bb9411d8 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx.h"
+#include "wx/wx.h"

 #endif
 
 #if defined(__WIN95__)
 #endif
 
 #if defined(__WIN95__)


@@ -91,7 +91,7 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
     m_windowId,
     wxGetInstance(),
     0,
     m_windowId,
     wxGetInstance(),
     0,

-       m_min, m_max, 0);
+       m_min, m_max, m_min);

 
   m_hWnd = (WXHWND) hWndListControl;
   if (parent) parent->AddChild(this);
 
   m_hWnd = (WXHWND) hWndListControl;
   if (parent) parent->AddChild(this);


@@ -126,7 +126,8 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 {
        m_min = minVal;
        m_max = maxVal;
 {
        m_min = minVal;
        m_max = maxVal;

-       ::SendMessage((HWND) GetHWND(), UDM_SETRANGE, 0, (LPARAM) MAKELONG((short) minVal, (short) maxVal));
+       ::SendMessage((HWND) GetHWND(), UDM_SETRANGE, 0,
+                   (LPARAM) MAKELONG((short)maxVal, (short)minVal));

 }
 
 void wxSpinButton::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
 }
 
 void wxSpinButton::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)


@@ -233,26 +234,23 @@ bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
   return FALSE;
 }
 
   return FALSE;
 }
 

-bool wxSpinButton::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
+bool wxSpinButton::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM* result)

 {
        NMHDR* hdr1 = (NMHDR*) lParam;
        switch ( hdr1->code )
        {
 {
        NMHDR* hdr1 = (NMHDR*) lParam;
        switch ( hdr1->code )
        {

-/* We don't process this message, currently */
+        /* We don't process this message, currently */

                case UDN_DELTAPOS:
                case UDN_DELTAPOS:

-               {
-                       return wxControl::MSWNotify(wParam, lParam);
-                       break;
-               }
+

                default :
                default :

-                       return wxControl::MSWNotify(wParam, lParam);
+                       return wxControl::MSWNotify(wParam, lParam, result);

                        break;
        }
 /*
        event.eventObject = this;
        event.SetEventType(eventType);
 
                        break;
        }
 /*
        event.eventObject = this;
        event.SetEventType(eventType);
 

-       if ( !ProcessEvent(event) )
+       if ( !GetEventHandler()->ProcessEvent(event) )

                return FALSE;
 */
        return TRUE;
                return FALSE;
 */
        return TRUE;