compilation fix

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

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 9e16993a8336ed78b772708b53595e0028cfda5d..ade3fdca7ce4924ee623022fbb892fb1f40c773c 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -58,9 +58,9 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   m_windowStyle = style;
 
   if ( id == -1 )
   m_windowStyle = style;
 
   if ( id == -1 )

-       m_windowId = (int)NewControlId();
+      m_windowId = (int)NewControlId();

   else
   else

-       m_windowId = id;
+      m_windowId = id;

 
   int x = pos.x;
   int y = pos.y;
 
   int x = pos.x;
   int y = pos.y;


@@ -68,9 +68,18 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   int height = size.y;
 
   long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
   int height = size.y;
 
   long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;

+
+#ifndef PBS_VERTICAL
+#define PBS_VERTICAL 0x04
+#endif
+

   if (m_windowStyle & wxGA_VERTICAL)
     msFlags |= PBS_VERTICAL;
 
   if (m_windowStyle & wxGA_VERTICAL)
     msFlags |= PBS_VERTICAL;
 

+#ifndef PBS_SMOOTH
+#define PBS_SMOOTH 0x01
+#endif
+

   if (m_windowStyle & wxGA_SMOOTH)
     msFlags |= PBS_SMOOTH;
 
   if (m_windowStyle & wxGA_SMOOTH)
     msFlags |= PBS_SMOOTH;
 


@@ -99,38 +108,6 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxGauge95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int x1 = x;
-  int y1 = y;
-  int w1 = width;
-  int h1 = height;
-
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  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))
-  {
-    GetSize(&w1, &h1);
-  }
-
-  // Deal with default size (using -1 values)
-  if (w1<=0)
-    w1 = DEFAULT_ITEM_WIDTH;
-
-  if (h1<=0)
-    h1 = DEFAULT_ITEM_HEIGHT;
-
-  MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
-}
-

 void wxGauge95::SetShadowWidth(int w)
 {
 }
 void wxGauge95::SetShadowWidth(int w)
 {
 }


@@ -173,14 +150,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 // wxUSE_GAUGE
 }
 
 #endif // wxUSE_GAUGE