wxEVT_COMMAND_CHOICE_SELECTED => wxEVT_COMMAND_COMBOBOX_SELECTED

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 462d0513e0c838a4996ada8b0bbb0fd9806c8647..03657deaa0d710c27ceece62de130f82127e11ec 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -21,15 +21,18 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

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

 #endif
 
 #endif
 

-#if defined(__WIN95__)
+// Can't resolve reference to CreateUpDownControl in
+// TWIN32, but could probably use normal CreateWindow instead.
+
+#if defined(__WIN95__) && !defined(__TWIN32__)

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

-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) || defined(__TWIN32__)

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


@@ -91,7 +94,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 +129,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,19 +237,16 @@ 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;
        }
 /*
                        break;
        }
 /*