better update rect calculation

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

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 7fbe861c1d4a418b991b460b0a4255d0094f0658..e5c09362e280fdd46791e162b5a345356fd22d32 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -24,12 +24,12 @@
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"
 #endif
 

-#if USE_GAUGE && defined(__WIN95__)
+#if wxUSE_GAUGE && defined(__WIN95__)

 
 #include "wx/msw/gauge95.h"
 #include "wx/msw/private.h"
 
 
 #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
 
 #include <commctrl.h>
 #endif
 


@@ -50,9 +50,10 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;

+  m_gaugePos = 0;

 
 

-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+  SetBackgroundColour(parent->GetBackgroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;

 
   m_windowStyle = style;
 
 
   m_windowStyle = style;
 


@@ -68,6 +69,20 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
 
   long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
 
 
   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,
   HWND wx_button =
       CreateWindowEx(MakeExtendedStyle(m_windowStyle), PROGRESS_CLASS, NULL, msFlags,
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,


@@ -80,12 +95,12 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
 
   SendMessage((HWND) GetHWND(), PBM_SETRANGE, 0, MAKELPARAM(0, range));
 
 
   SendMessage((HWND) GetHWND(), PBM_SETRANGE, 0, MAKELPARAM(0, range));
 

-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());

 
   if (width == -1)
     width = 50;
   if (height == -1)
 
   if (width == -1)
     width = 50;
   if (height == -1)

-    height = 50;
+    height = 28;

   SetSize(x, y, width, height);
 
   ShowWindow((HWND) GetHWND(), SW_SHOW);
   SetSize(x, y, width, height);
 
   ShowWindow((HWND) GetHWND(), SW_SHOW);


@@ -93,7 +108,7 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   return TRUE;
 }
 
   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);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -107,6 +122,8 @@ void wxGauge95::SetSize(int x, int y, int width, int height, int sizeFlags)
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 

+  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+

   // If we're prepared to use the existing size, then...
   if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
   {
   // If we're prepared to use the existing size, then...
   if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
   {


@@ -165,14 +182,24 @@ int wxGauge95::GetValue(void) const
   return m_gaugePos;
 }
 
   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 // USE_GAUGE
+#endif // wxUSE_GAUGE