wxWindow::Fit() infinite loop bug fixed

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

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 31b9f85f19bcd037d616c96a17183c04d25a9f3c..e5c09362e280fdd46791e162b5a345356fd22d32 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -29,7 +29,7 @@
 #include "wx/msw/gauge95.h"
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !defined(__GNUWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
 #include <commctrl.h>
 #endif
 
@@ -69,6 +69,20 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
 
   long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
 
+#ifndef PBS_VERTICAL
+#define PBS_VERTICAL 0x04
+#endif
+
+  if (m_windowStyle & wxGA_VERTICAL)
+    msFlags |= PBS_VERTICAL;
+
+#ifndef PBS_SMOOTH
+#define PBS_SMOOTH 0x01
+#endif
+
+  if (m_windowStyle & wxGA_SMOOTH)
+    msFlags |= PBS_SMOOTH;
+
   HWND wx_button =
       CreateWindowEx(MakeExtendedStyle(m_windowStyle), PROGRESS_CLASS, NULL, msFlags,
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
@@ -94,7 +108,7 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   return TRUE;
 }
 
-void wxGauge95::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxGauge95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
@@ -168,14 +182,24 @@ int wxGauge95::GetValue(void) const
   return m_gaugePos;
 }
 
-void wxGauge95::SetForegroundColour(const wxColour& col)
+bool wxGauge95::SetForegroundColour(const wxColour& col)
 {
-  m_foregroundColour = col ;
+    if ( !wxControl::SetForegroundColour(col) )
+        return FALSE;
+
+    m_foregroundColour = col ;
+
+    return TRUE;
 }
 
-void wxGauge95::SetBackgroundColour(const wxColour& col)
+bool wxGauge95::SetBackgroundColour(const wxColour& col)
 {
-  m_backgroundColour = col ;
+    if ( !wxControl::SetBackgroundColour(col) )
+        return FALSE;
+
+    m_backgroundColour = col ;
+
+    return TRUE;
 }
 
 #endif // wxUSE_GAUGE