yet another attempt to wxFrame's last focus bug

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

diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp
index 1af85748f9d9c671216f3f28b33a198f9e1ddcd3..ee41a2ac0ea19a4115d198f38d79906ff05601e3 100644 (file)
--- a/src/msw/gaugemsw.cpp
+++ b/src/msw/gaugemsw.cpp
@@ -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,
@@ -82,7 +80,9 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   }
 
   SetName(name);
+#if wxUSE_VALIDATORS
   SetValidator(validator);
+#endif // wxUSE_VALIDATORS
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;
@@ -104,10 +104,16 @@ 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;
+
+  if ( m_windowStyle & wxCLIP_SIBLINGS )
+    msFlags |= WS_CLIPSIBLINGS;
 
   HWND wx_button =
-      CreateWindowEx(MakeExtendedStyle(m_windowStyle), _T("zYzGauge"), NULL, msFlags,
+      CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("zYzGauge"), NULL, msFlags,
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
 
@@ -129,6 +135,9 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   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());
 
   if (width == -1)
@@ -642,7 +651,7 @@ void FAR PASCAL Draw3DLine(HDC hdc, WORD x, WORD y, WORD nLen,
 
 
 /* static global variables */
-static wxChar gszzYzGaugeClass[] = _T("zYzGauge");
+static wxChar gszzYzGaugeClass[] = wxT("zYzGauge");
     
 
 /* window word position definitions */
@@ -754,7 +763,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(_T("DISPLAY"), NULL, NULL, 0L)))
+    hdc = CreateIC(wxT("DISPLAY"), NULL, NULL, 0L) ;
+    if (hdc)
     {
         /* check for mono-display */
         if ((GetDeviceCaps(hdc, BITSPIXEL) == 1) &&
@@ -908,7 +918,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, _T("%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);
@@ -1127,7 +1137,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;