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 db8c8dc34bde72e237e82742b5babab9e928793a..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__)


@@ -43,12 +43,12 @@ wxSpinButton::wxSpinButton(void)
        m_max = 100;
 }
 
        m_max = 100;
 }
 

-bool wxSpinButton::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
-            const long style, const wxString& name)
+bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+            long style, const wxString& name)

 {
   wxSystemSettings settings;
 {
   wxSystemSettings settings;

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

 
   SetName(name);
 
 
   SetName(name);
 


@@ -91,7 +91,7 @@ bool wxSpinButton::Create(wxWindow *parent, const wxWindowID id, const wxPoint&
     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);


@@ -117,19 +117,20 @@ int wxSpinButton::GetValue(void) const
        return (int) ::SendMessage((HWND) GetHWND(), UDM_GETPOS, 0, 0);
 }
 
        return (int) ::SendMessage((HWND) GetHWND(), UDM_GETPOS, 0, 0);
 }
 

-void wxSpinButton::SetValue(const int val)
+void wxSpinButton::SetValue(int val)

 {
        ::SendMessage((HWND) GetHWND(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0));
 }
 
 {
        ::SendMessage((HWND) GetHWND(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0));
 }
 

-void wxSpinButton::SetRange(const int minVal, const int maxVal)
+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(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSpinButton::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)

 {
   if (control)
   {
 {
   if (control)
   {


@@ -178,7 +179,7 @@ void wxSpinButton::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXH
   }
 }
 
   }
 }
 

-void wxSpinButton::MSWOnHScroll( const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSpinButton::MSWOnHScroll( WXWORD wParam, WXWORD pos, WXHWND control)

 {
   if (control)
   {
 {
   if (control)
   {


@@ -227,32 +228,29 @@ void wxSpinButton::MSWOnHScroll( const WXWORD wParam, const WXWORD pos, const WX
   }
 }
 
   }
 }
 

-bool wxSpinButton::MSWCommand(const WXUINT cmd, const WXWORD id)
+bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)

 {
   // No command messages
   return FALSE;
 }
 
 {
   // No command messages
   return FALSE;
 }
 

-bool wxSpinButton::MSWNotify(const WXWPARAM wParam, const 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;