compile fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/gaugemsw.h b/include/wx/msw/gaugemsw.h
index 45774569bafdf5ee2ba9323f4ec4b613790e6a19..627f842afe907f53011996b0ef80710fc3d72edd 100644 (file)
--- a/include/wx/msw/gaugemsw.h
+++ b/include/wx/msw/gaugemsw.h
@@ -57,8 +57,8 @@ public:
     int GetRange(void) const ;
     int GetValue(void) const ;
 
     int GetRange(void) const ;
     int GetValue(void) const ;
 

-    void SetForegroundColour(const wxColour& col);
-    void SetBackgroundColour(const wxColour& col);
+    bool SetForegroundColour(const wxColour& col);
+    bool SetBackgroundColour(const wxColour& col);

 
     // Backward compatibility
 #if WXWIN_COMPATIBILITY
 
     // Backward compatibility
 #if WXWIN_COMPATIBILITY

diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp
index c2137dd8c489e77a418d624c6c3329f26f9e35b7..4a82b4f8965ede0b81be7b9f8cb02654e2c62936 100644 (file)
--- a/src/msw/gaugemsw.cpp
+++ b/src/msw/gaugemsw.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:       wxWindows licence

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


@@ -77,8 +77,8 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   if ( !wxGaugeMSWInitialised )
   {
     if (!gaugeInit((HINSTANCE) wxGetInstance()))
   if ( !wxGaugeMSWInitialised )
   {
     if (!gaugeInit((HINSTANCE) wxGetInstance()))

-       wxFatalError("Cannot initalize Gauge library");
-       wxGaugeMSWInitialised = TRUE;
+        wxFatalError("Cannot initalize Gauge library");
+    wxGaugeMSWInitialised = TRUE;

   }
 
   SetName(name);
   }
 
   SetName(name);


@@ -94,9 +94,9 @@ bool wxGaugeMSW::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;


@@ -218,16 +218,24 @@ int wxGaugeMSW::GetValue(void) const
   return (int) SendMessage((HWND) GetHWND(), ZYZG_GETPOSITION, 0, 0);
 }
 
   return (int) SendMessage((HWND) GetHWND(), ZYZG_GETPOSITION, 0, 0);
 }
 

-void wxGaugeMSW::SetForegroundColour(const wxColour& col)
+bool wxGaugeMSW::SetForegroundColour(const wxColour& col)

 {
 {

-  m_foregroundColour = col ;
-  SendMessage((HWND) GetHWND(), ZYZG_SETFGCOLOR, 0, RGB(col.Red(), col.Green(), col.Blue()));
+    if ( !wxControl::SetForegroundColour(col) )
+        return FALSE;
+
+    SendMessage((HWND) GetHWND(), ZYZG_SETFGCOLOR, 0, RGB(col.Red(), col.Green(), col.Blue()));
+
+    return TRUE;

 }
 
 void wxGaugeMSW::SetBackgroundColour(const wxColour& col)
 {
 }
 
 void wxGaugeMSW::SetBackgroundColour(const wxColour& col)
 {

-  m_backgroundColour = col ;
-  SendMessage((HWND) GetHWND(), ZYZG_SETBKCOLOR, 0, RGB(col.Red(), col.Green(), col.Blue()));
+    if ( !wxControl::SetBackgroundColour(col) )
+        return FALSE;
+
+    SendMessage((HWND) GetHWND(), ZYZG_SETBKCOLOR, 0, RGB(col.Red(), col.Green(), col.Blue()));
+
+    return TRUE;

 }
 
 
 }
 
 


@@ -704,7 +712,7 @@ static DWORD    rgbDefTextColor;
 static DWORD    rgbDefBkColor;
 static BOOL     fSupport3D;
 
 static DWORD    rgbDefBkColor;
 static BOOL     fSupport3D;
 

-#if !defined(APIENTRY) // NT defines APIENTRY, 3.x not
+#if !defined(APIENTRY)    // NT defines APIENTRY, 3.x not

 #define APIENTRY FAR PASCAL
 #endif
  
 #define APIENTRY FAR PASCAL
 #endif
  


@@ -873,13 +881,13 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
     if ((GetWindowLong(hwnd, GWL_STYLE) & ZYZGS_3D) && fSupport3D)
     {
         Draw3DRect(hdc, &rc1, pgauge->wWidth3D, DRAW3D_OUT);
     if ((GetWindowLong(hwnd, GWL_STYLE) & ZYZGS_3D) && fSupport3D)
     {
         Draw3DRect(hdc, &rc1, pgauge->wWidth3D, DRAW3D_OUT);

-       InflateRect(&rc1, ~(pgauge->wWidth3D), ~(pgauge->wWidth3D));
+    InflateRect(&rc1, ~(pgauge->wWidth3D), ~(pgauge->wWidth3D));

 
         Draw3DFaceFrame(hdc, &rc1, pgauge->wWidthBezelFace);
 
         Draw3DFaceFrame(hdc, &rc1, pgauge->wWidthBezelFace);

-       InflateRect(&rc1, ~(pgauge->wWidthBezelFace), ~(pgauge->wWidthBezelFace));
+    InflateRect(&rc1, ~(pgauge->wWidthBezelFace), ~(pgauge->wWidthBezelFace));

 
         Draw3DRect(hdc, &rc1, pgauge->wWidth3D, DRAW3D_IN);
 
         Draw3DRect(hdc, &rc1, pgauge->wWidth3D, DRAW3D_IN);

-       InflateRect(&rc1, ~(pgauge->wWidth3D), ~(pgauge->wWidth3D));
+    InflateRect(&rc1, ~(pgauge->wWidth3D), ~(pgauge->wWidth3D));

 
         /* draw a black border on the _inside_ */
         FrameRect(hdc, &rc1, (HBRUSH) GetStockObject(BLACK_BRUSH));
 
         /* draw a black border on the _inside_ */
         FrameRect(hdc, &rc1, (HBRUSH) GetStockObject(BLACK_BRUSH));


@@ -1106,7 +1114,7 @@ zyzgForceRepaint:
             else
                 wParam = 1;
 
             else
                 wParam = 1;
 

-           InflateRect(&rc, ~(wParam), ~(wParam));
+        InflateRect(&rc, ~(wParam), ~(wParam));

             InvalidateRect(hwnd, &rc, FALSE);
             UpdateWindow(hwnd);
             return (0L);
             InvalidateRect(hwnd, &rc, FALSE);
             UpdateWindow(hwnd);
             return (0L);