X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..2004484f9b139978e86c3e9e102001a46f493576:/src/msw/gaugemsw.cpp

diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp
index be590a4556..f2d9d22743 100644
--- a/src/msw/gaugemsw.cpp
+++ b/src/msw/gaugemsw.cpp
@@ -22,9 +22,10 @@
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
+#include "wx/utils.h"
 #endif
 
-#if USE_GAUGE 
+#if wxUSE_GAUGE 
 
 #include "wx/msw/gaugemsw.h"
 #include "wx/msw/private.h"
@@ -75,7 +76,7 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
 
   if ( !wxGaugeMSWInitialised )
   {
-    if (!gaugeInit((HWND) wxGetInstance()))
+    if (!gaugeInit((HINSTANCE) wxGetInstance()))
     	wxFatalError("Cannot initalize Gauge library");
 	wxGaugeMSWInitialised = TRUE;
   }
@@ -85,9 +86,10 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
 
   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;
 
@@ -127,7 +129,7 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   SendMessage((HWND) GetHWND(), ZYZG_SETFGCOLOR, 0, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
   SendMessage((HWND) GetHWND(), ZYZG_SETBKCOLOR, 0, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
 
-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());
 
   if (width == -1)
     width = 50;
@@ -154,6 +156,8 @@ void wxGaugeMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
   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))
   {
@@ -540,13 +544,13 @@ void FAR PASCAL Draw3DLine(HDC hdc, WORD x, WORD y, WORD nLen,
     else return;
 
     /* select NULL_PEN for no borders */
-    hOldPen = SelectObject(hdc, GetStockObject(NULL_PEN));
+    hOldPen = (HPEN) SelectObject(hdc, GetStockObject(NULL_PEN));
 
     /* select the appropriate color for the fill */
     if (fDark)
-        hOldBrush = SelectObject(hdc, GetStockObject(GRAY_BRUSH));
+        hOldBrush = (HBRUSH) SelectObject(hdc, GetStockObject(GRAY_BRUSH));
     else
-        hOldBrush = SelectObject(hdc, GetStockObject(WHITE_BRUSH));
+        hOldBrush = (HBRUSH) SelectObject(hdc, GetStockObject(WHITE_BRUSH));
 
     /* finally, draw the dern thing */
     Polygon(hdc, (LPPOINT)&Point, 4);
@@ -857,7 +861,7 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
     GetClientRect(hwnd, &rc1);
 
     /* draw a black border on the _outside_ */
-    FrameRect(hdc, &rc1, GetStockObject(BLACK_BRUSH));
+    FrameRect(hdc, &rc1, (HBRUSH) GetStockObject(BLACK_BRUSH));
 
     /* we want to draw _just inside_ the black border */
     InflateRect(&rc1, -1, -1);
@@ -878,7 +882,7 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
 	InflateRect(&rc1, ~(pgauge->wWidth3D), ~(pgauge->wWidth3D));
 
         /* draw a black border on the _inside_ */
-        FrameRect(hdc, &rc1, GetStockObject(BLACK_BRUSH));
+        FrameRect(hdc, &rc1, (HBRUSH) GetStockObject(BLACK_BRUSH));
 
         /* we want to draw _just inside_ the black border */
         InflateRect(&rc1, -1, -1);
@@ -925,7 +929,7 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
     } /* switch () */
 
     /* select the correct font */
-    hFont = SelectObject(hdc, pgauge->hFont);
+    hFont = (HFONT) SelectObject(hdc, pgauge->hFont);
 
     /* build up a string to blit out--ie the meaning of life: "42%" */
     wsprintf(ach, "%3d%%", (WORD)((DWORD)iPos * 100 / iRange));
@@ -1148,7 +1152,7 @@ zyzgForceRepaint3D:
         case WM_SETFONT:
             /* if NULL hFont, use system font */
             if (!(hFont = (HFONT)wParam))
-                hFont = GetStockObject(SYSTEM_FONT);
+                hFont = (HFONT) GetStockObject(SYSTEM_FONT);
 
             pgauge->hFont = hFont;
 
@@ -1168,4 +1172,4 @@ zyzgForceRepaint3D:
 
 /** EOF: zyzgauge.c **/
 
-#endif // USE_GAUGE
+#endif // wxUSE_GAUGE