X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..71e483d39adbc1c80ef2fa998bd7f18e1704440c:/src/msw/gaugemsw.cpp

diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp
index f2d9d22743..278fbfce57 100644
--- 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
-// Licence:   	wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -60,9 +60,7 @@
 /* public function prototypes */
 BOOL FAR PASCAL gaugeInit(HINSTANCE hInstance);
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGaugeMSW, wxControl)
-#endif
 
 bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
            int range,
@@ -77,12 +75,14 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   if ( !wxGaugeMSWInitialised )
   {
     if (!gaugeInit((HINSTANCE) wxGetInstance()))
-    	wxFatalError("Cannot initalize Gauge library");
-	wxGaugeMSWInitialised = TRUE;
+        wxFatalError("Cannot initalize Gauge library");
+    wxGaugeMSWInitialised = TRUE;
   }
 
   SetName(name);
+#if wxUSE_VALIDATORS
   SetValidator(validator);
+#endif // wxUSE_VALIDATORS
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;
@@ -94,9 +94,9 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   m_windowStyle = style;
 
   if ( id == -1 )
-  	m_windowId = (int)NewControlId();
+      m_windowId = (int)NewControlId();
   else
-	m_windowId = id;
+    m_windowId = id;
 
   int x = pos.x;
   int y = pos.y;
@@ -104,10 +104,13 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   int height = size.y;
 
   long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
-  msFlags |= ZYZGS_3D;
+  bool want3D;
+  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
+  if (want3D)
+    msFlags |= ZYZGS_3D;
 
   HWND wx_button =
-      CreateWindowEx(MakeExtendedStyle(m_windowStyle), "zYzGauge", NULL, msFlags,
+      CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("zYzGauge"), NULL, msFlags,
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
 
@@ -126,8 +129,11 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   SendMessage(wx_button, ZYZG_SETORIENTATION, wOrient, 0);
   SendMessage(wx_button, ZYZG_SETRANGE, range, 0);
 
-  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()));
+  SendMessage(GetHwnd(), ZYZG_SETFGCOLOR, 0, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+  SendMessage(GetHwnd(), ZYZG_SETBKCOLOR, 0, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
+
+  //SetBezelFace(1);
+  //SetShadowWidth(1);
 
   SetFont(parent->GetFont());
 
@@ -137,97 +143,73 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
     height = 50;
   SetSize(x, y, width, height);
 
-  ShowWindow((HWND) GetHWND(), SW_SHOW);
+  ShowWindow(GetHwnd(), SW_SHOW);
 
   return TRUE;
 }
 
-void wxGaugeMSW::SetSize(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 wxGaugeMSW::SetShadowWidth(int w)
 {
-  SendMessage((HWND) GetHWND(), ZYZG_SETWIDTH3D, w, 0);
+  SendMessage(GetHwnd(), ZYZG_SETWIDTH3D, w, 0);
 }
 
 void wxGaugeMSW::SetBezelFace(int w)
 {
-  SendMessage((HWND) GetHWND(), ZYZG_SETBEZELFACE, w, 0);
+  SendMessage(GetHwnd(), ZYZG_SETBEZELFACE, w, 0);
 }
 
 void wxGaugeMSW::SetRange(int r)
 {
   m_rangeMax = r;
 
-  SendMessage((HWND) GetHWND(), ZYZG_SETRANGE, r, 0);
+  SendMessage(GetHwnd(), ZYZG_SETRANGE, r, 0);
 }
 
 void wxGaugeMSW::SetValue(int pos)
 {
   m_gaugePos = pos;
 
-  SendMessage((HWND) GetHWND(), ZYZG_SETPOSITION, pos, 0);
+  SendMessage(GetHwnd(), ZYZG_SETPOSITION, pos, 0);
 }
 
 int wxGaugeMSW::GetShadowWidth(void) const
 {
-  return (int) SendMessage((HWND) GetHWND(), ZYZG_GETWIDTH3D, 0, 0);
+  return (int) SendMessage(GetHwnd(), ZYZG_GETWIDTH3D, 0, 0);
 }
 
 int wxGaugeMSW::GetBezelFace(void) const
 {
-  return (int) SendMessage((HWND) GetHWND(), ZYZG_GETBEZELFACE, 0, 0);
+  return (int) SendMessage(GetHwnd(), ZYZG_GETBEZELFACE, 0, 0);
 }
 
 int wxGaugeMSW::GetRange(void) const
 {
-  return (int) SendMessage((HWND) GetHWND(), ZYZG_GETRANGE, 0, 0);
+  return (int) SendMessage(GetHwnd(), ZYZG_GETRANGE, 0, 0);
 }
 
 int wxGaugeMSW::GetValue(void) const
 {
-  return (int) SendMessage((HWND) GetHWND(), ZYZG_GETPOSITION, 0, 0);
+  return (int) SendMessage(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(GetHwnd(), ZYZG_SETFGCOLOR, 0, RGB(col.Red(), col.Green(), col.Blue()));
+
+    return TRUE;
 }
 
-void wxGaugeMSW::SetBackgroundColour(const wxColour& col)
+bool 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(GetHwnd(), ZYZG_SETBKCOLOR, 0, RGB(col.Red(), col.Green(), col.Blue()));
+
+    return TRUE;
 }
 
 
@@ -655,7 +637,7 @@ void FAR PASCAL Draw3DLine(HDC hdc, WORD x, WORD y, WORD nLen,
 
 
 /* get the includes we need */
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
 #include <malloc.h>
 #endif
 #include <stdio.h>
@@ -666,7 +648,7 @@ void FAR PASCAL Draw3DLine(HDC hdc, WORD x, WORD y, WORD nLen,
 
 
 /* static global variables */
-static char gszzYzGaugeClass[] = "zYzGauge";
+static wxChar gszzYzGaugeClass[] = wxT("zYzGauge");
     
 
 /* window word position definitions */
@@ -704,7 +686,7 @@ static DWORD    rgbDefTextColor;
 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
  
@@ -778,7 +760,8 @@ BOOL FAR PASCAL gaugeInit(HINSTANCE hInstance)
     /*  Get a DC to determine whether device is mono or not, and set
      *  default foreground/background colors as appropriate.
      */
-    if ((hdc = CreateIC("DISPLAY", NULL, NULL, 0L)))
+    hdc = CreateIC(wxT("DISPLAY"), NULL, NULL, 0L) ;
+    if (hdc)
     {
         /* check for mono-display */
         if ((GetDeviceCaps(hdc, BITSPIXEL) == 1) &&
@@ -841,7 +824,7 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
     DWORD       dwExtent;
     RECT        rc1, rc2;
     HFONT       hFont;
-    char        ach[ 6 ];
+    wxChar      ach[ 6 ];
     WORD        dx, dy, wGomerX, wGomerY;
 /* Win32s has no GetTextExtent(); let's try GetTextExtentPoint() instead,
  * which needs a SIZE* parameter */
@@ -873,13 +856,13 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
     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);
-	InflateRect(&rc1, ~(pgauge->wWidthBezelFace), ~(pgauge->wWidthBezelFace));
+    InflateRect(&rc1, ~(pgauge->wWidthBezelFace), ~(pgauge->wWidthBezelFace));
 
         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));
@@ -932,7 +915,7 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
     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));
+    wsprintf(ach, wxT("%3d%%"), (WORD)((DWORD)iPos * 100 / iRange));
 /* Win32s has no GetTextExtent(); let's try GetTextExtentPoint() instead */
 #if defined(__WIN32__)
     GetTextExtentPoint(hdc, ach, wGomerX = lstrlen(ach), &size);
@@ -1106,7 +1089,7 @@ zyzgForceRepaint:
             else
                 wParam = 1;
 
-	    InflateRect(&rc, ~(wParam), ~(wParam));
+        InflateRect(&rc, ~(wParam), ~(wParam));
             InvalidateRect(hwnd, &rc, FALSE);
             UpdateWindow(hwnd);
             return (0L);
@@ -1151,7 +1134,8 @@ zyzgForceRepaint3D:
 
         case WM_SETFONT:
             /* if NULL hFont, use system font */
-            if (!(hFont = (HFONT)wParam))
+            hFont = (HFONT)wParam ;
+            if (!hFont)
                 hFont = (HFONT) GetStockObject(SYSTEM_FONT);
 
             pgauge->hFont = hFont;