wxWindow::Fit() infinite loop bug fixed

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 931add7bc9541ffa7b1dd84572b2e63eb4cf753f..e1efced86ed5b434a3e148b7337fda7ca534760a 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -6,49 +6,52 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "spinbutt.h"
+    #pragma implementation "spinbutt.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #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__
-#include <commctrl.h>
+#if !defined(__GNUWIN32__) || defined(__TWIN32__)
+    #include <commctrl.h>

 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)

 #endif
 
 #endif
 

-wxSpinButton::wxSpinButton(void)
+wxSpinButton::wxSpinButton()

 {
 {

-       m_min = 0;
-       m_max = 100;
+    m_min = 0;
+    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);
 


@@ -78,11 +81,11 @@ bool wxSpinButton::Create(wxWindow *parent, const wxWindowID id, const wxPoint&
   DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP;
   
   if ( m_windowStyle & wxSP_HORIZONTAL )
   DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP;
   
   if ( m_windowStyle & wxSP_HORIZONTAL )

-       wstyle |= UDS_HORZ;
+    wstyle |= UDS_HORZ;

   if ( m_windowStyle & wxSP_ARROW_KEYS )
   if ( m_windowStyle & wxSP_ARROW_KEYS )

-       wstyle |= UDS_ARROWKEYS;
+    wstyle |= UDS_ARROWKEYS;

   if ( m_windowStyle & wxSP_WRAP )
   if ( m_windowStyle & wxSP_WRAP )

-       wstyle |= UDS_WRAP;
+    wstyle |= UDS_WRAP;

 
   // Create the ListView control.
   HWND hWndListControl = CreateUpDownControl(wstyle,
 
   // Create the ListView control.
   HWND hWndListControl = CreateUpDownControl(wstyle,


@@ -91,179 +94,106 @@ 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);
 
   // TODO: have this for all controls.
   if ( !m_hWnd )
 
   m_hWnd = (WXHWND) hWndListControl;
   if (parent) parent->AddChild(this);
 
   // TODO: have this for all controls.
   if ( !m_hWnd )

-       return FALSE;
+    return FALSE;

   
   SubclassWin((WXHWND) m_hWnd);
 
   return TRUE;
 }
 
   
   SubclassWin((WXHWND) m_hWnd);
 
   return TRUE;
 }
 

-wxSpinButton::~wxSpinButton(void)
+wxSpinButton::~wxSpinButton()

 {
 }
 
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
 
 {
 }
 
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
 

-int wxSpinButton::GetValue(void) const
+int wxSpinButton::GetValue() 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;
-       ::SendMessage((HWND) GetHWND(), UDM_SETRANGE, 0, (LPARAM) MAKELONG((short) minVal, (short) maxVal));
+    m_min = minVal;
+    m_max = 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)
+bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
+                               WXWORD pos, WXHWND control)

 {
 {

-  if (control)
-  {
-    wxSpinEvent event(0, m_windowId);
-    event.SetPosition(pos);
-    event.SetOrientation(wxVERTICAL);
-    event.SetEventObject( this );
-
-       switch ( wParam )
-       {
-               case SB_TOP:
-                       event.m_eventType = wxEVT_SCROLL_TOP;
-                       break;
-
-               case SB_BOTTOM:
-                       event.m_eventType = wxEVT_SCROLL_BOTTOM;
-                       break;
-
-               case SB_LINEUP:
-                       event.m_eventType = wxEVT_SCROLL_LINEUP;
-                       break;
+    if ( !control )
+        return FALSE;

 
 

-               case SB_LINEDOWN:
-                       event.m_eventType = wxEVT_SCROLL_LINEDOWN;
-                       break;
-
-               case SB_PAGEUP:
-                        event.m_eventType = wxEVT_SCROLL_PAGEUP;
-                       break;
-
-               case SB_PAGEDOWN:
-                        event.m_eventType = wxEVT_SCROLL_PAGEDOWN;
-                       break;
-
-        case SB_THUMBTRACK:
-        case SB_THUMBPOSITION:
-                        event.m_eventType = wxEVT_SCROLL_THUMBTRACK;
-                       break;
-
-               default:
-                        return;
-                        break;
-       }
-    if (!GetEventHandler()->ProcessEvent(event))
-      Default();
-  }
-}
-
-void wxSpinButton::MSWOnHScroll( const WXWORD wParam, const WXWORD pos, const WXHWND control)
-{
-  if (control)
-  {
-    wxSpinEvent event(0, m_windowId);
+    wxSpinEvent event(wxEVT_NULL, m_windowId);

     event.SetPosition(pos);
     event.SetPosition(pos);

-    event.SetOrientation(wxHORIZONTAL);
-    event.SetEventObject( this );
+    event.SetOrientation(orientation);
+    event.SetEventObject(this);

 
 

-       switch ( wParam )
-       {
-               case SB_TOP:
-                       event.m_eventType = wxEVT_SCROLL_TOP;
-                       break;
+    switch ( wParam )
+    {
+        case SB_TOP:
+            event.m_eventType = wxEVT_SCROLL_TOP;
+            break;

 
 

-               case SB_BOTTOM:
-                       event.m_eventType = wxEVT_SCROLL_BOTTOM;
-                       break;
+        case SB_BOTTOM:
+            event.m_eventType = wxEVT_SCROLL_BOTTOM;
+            break;

 
 

-               case SB_LINEUP:
-                       event.m_eventType = wxEVT_SCROLL_LINEUP;
-                       break;
+        case SB_LINEUP:
+            event.m_eventType = wxEVT_SCROLL_LINEUP;
+            break;

 
 

-               case SB_LINEDOWN:
-               event.m_eventType = wxEVT_SCROLL_LINEDOWN;
-                       break;
+        case SB_LINEDOWN:
+            event.m_eventType = wxEVT_SCROLL_LINEDOWN;
+            break;

 
 

-               case SB_PAGEUP:
-                        event.m_eventType = wxEVT_SCROLL_PAGEUP;
-                       break;
+        case SB_PAGEUP:
+            event.m_eventType = wxEVT_SCROLL_PAGEUP;
+            break;

 
 

-               case SB_PAGEDOWN:
-                        event.m_eventType = wxEVT_SCROLL_PAGEDOWN;
-                       break;
+        case SB_PAGEDOWN:
+            event.m_eventType = wxEVT_SCROLL_PAGEDOWN;
+            break;

 
         case SB_THUMBTRACK:
         case SB_THUMBPOSITION:
 
         case SB_THUMBTRACK:
         case SB_THUMBPOSITION:

-                        event.m_eventType = wxEVT_SCROLL_THUMBTRACK;
-                       break;
-
-               default:
-                        return;
-                        break;
-       }
-    if (!GetEventHandler()->ProcessEvent(event))
-       Default();
-  }
-}
+            event.m_eventType = wxEVT_SCROLL_THUMBTRACK;
+            break;

 
 

-bool wxSpinButton::MSWCommand(const WXUINT cmd, const WXWORD id)
-{
-  // No command messages
-  return FALSE;
+        default:
+            return FALSE;
+    }
+
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-bool wxSpinButton::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)

 {
 {

-       NMHDR* hdr1 = (NMHDR*) lParam;
-       switch ( hdr1->code )
-       {
-/* We don't process this message, currently */
-               case UDN_DELTAPOS:
-               {
-                       return wxControl::MSWNotify(wParam, lParam);
-                       break;
-               }
-               default :
-                       return wxControl::MSWNotify(wParam, lParam);
-                       break;
-       }
-/*
-       event.eventObject = this;
-       event.SetEventType(eventType);
-
-       if ( !ProcessEvent(event) )
-               return FALSE;
-*/
-       return TRUE;
+    // No command messages
+    return FALSE;

 }
 
 // Spin event
 IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 
 }
 
 // Spin event
 IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 

-wxSpinEvent::wxSpinEvent(WXTYPE commandType, int id):
-  wxScrollEvent(commandType, id)
+wxSpinEvent::wxSpinEvent(wxEventType commandType, int id)
+           : wxScrollEvent(commandType, id)

 {
 }
 
 {
 }
 

-#endif
+#endif // __WIN95__