joystick made conditional

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

diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp
index 97fc9b7cfb66d6ad4339df7dcbb11af7a1dd170b..cb8c2b91d518c5a132a13436bc8712fe2d351c33 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);
 
 /* public function prototypes */
 BOOL FAR PASCAL gaugeInit(HINSTANCE hInstance);
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxGaugeMSW, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxGaugeMSW, wxControl)

-#endif

 
 bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
            int range,
 
 bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
            int range,


@@ -82,7 +80,9 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   }
 
   SetName(name);
   }
 
   SetName(name);

+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;


@@ -107,7 +107,7 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   msFlags |= ZYZGS_3D;
 
   HWND wx_button =
   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);
 
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
 


@@ -126,8 +126,8 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   SendMessage(wx_button, ZYZG_SETORIENTATION, wOrient, 0);
   SendMessage(wx_button, ZYZG_SETRANGE, range, 0);
 
   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()));

 
   SetFont(parent->GetFont());
 
 
   SetFont(parent->GetFont());
 


@@ -137,85 +137,53 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
     height = 50;
   SetSize(x, y, width, height);
 
     height = 50;
   SetSize(x, y, width, height);
 

-  ShowWindow((HWND) GetHWND(), SW_SHOW);
+  ShowWindow(GetHwnd(), SW_SHOW);

 
   return TRUE;
 }
 
 
   return TRUE;
 }
 

-void wxGaugeMSW::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 wxGaugeMSW::SetShadowWidth(int w)
 {
 void wxGaugeMSW::SetShadowWidth(int w)
 {

-  SendMessage((HWND) GetHWND(), ZYZG_SETWIDTH3D, w, 0);
+  SendMessage(GetHwnd(), ZYZG_SETWIDTH3D, w, 0);

 }
 
 void wxGaugeMSW::SetBezelFace(int w)
 {
 }
 
 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;
 
 }
 
 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;
 
 }
 
 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
 {
 }
 
 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
 {
 }
 
 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
 {
 }
 
 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
 {
 }
 
 int wxGaugeMSW::GetValue(void) const
 {

-  return (int) SendMessage((HWND) GetHWND(), ZYZG_GETPOSITION, 0, 0);
+  return (int) SendMessage(GetHwnd(), ZYZG_GETPOSITION, 0, 0);

 }
 
 bool wxGaugeMSW::SetForegroundColour(const wxColour& col)
 }
 
 bool wxGaugeMSW::SetForegroundColour(const wxColour& col)


@@ -223,7 +191,7 @@ bool wxGaugeMSW::SetForegroundColour(const wxColour& col)
     if ( !wxControl::SetForegroundColour(col) )
         return FALSE;
 
     if ( !wxControl::SetForegroundColour(col) )
         return FALSE;
 

-    SendMessage((HWND) GetHWND(), ZYZG_SETFGCOLOR, 0, RGB(col.Red(), col.Green(), col.Blue()));
+    SendMessage(GetHwnd(), ZYZG_SETFGCOLOR, 0, RGB(col.Red(), col.Green(), col.Blue()));

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -233,7 +201,7 @@ bool wxGaugeMSW::SetBackgroundColour(const wxColour& col)
     if ( !wxControl::SetBackgroundColour(col) )
         return FALSE;
 
     if ( !wxControl::SetBackgroundColour(col) )
         return FALSE;
 

-    SendMessage((HWND) GetHWND(), ZYZG_SETBKCOLOR, 0, RGB(col.Red(), col.Green(), col.Blue()));
+    SendMessage(GetHwnd(), ZYZG_SETBKCOLOR, 0, RGB(col.Red(), col.Green(), col.Blue()));

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -674,7 +642,7 @@ void FAR PASCAL Draw3DLine(HDC hdc, WORD x, WORD y, WORD nLen,
 
 
 /* static global variables */
 
 
 /* static global variables */

-static char gszzYzGaugeClass[] = "zYzGauge";
+static wxChar gszzYzGaugeClass[] = wxT("zYzGauge");

     
 
 /* window word position definitions */
     
 
 /* window word position definitions */


@@ -786,7 +754,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.
      */
     /*  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) &&
     {
         /* check for mono-display */
         if ((GetDeviceCaps(hdc, BITSPIXEL) == 1) &&


@@ -849,7 +818,7 @@ static void PASCAL gaugePaint(HWND hwnd, HDC hdc)
     DWORD       dwExtent;
     RECT        rc1, rc2;
     HFONT       hFont;
     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 */
     WORD        dx, dy, wGomerX, wGomerY;
 /* Win32s has no GetTextExtent(); let's try GetTextExtentPoint() instead,
  * which needs a SIZE* parameter */


@@ -940,7 +909,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%" */
     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);
 /* Win32s has no GetTextExtent(); let's try GetTextExtentPoint() instead */
 #if defined(__WIN32__)
     GetTextExtentPoint(hdc, ach, wGomerX = lstrlen(ach), &size);


@@ -1159,7 +1128,8 @@ zyzgForceRepaint3D:
 
         case WM_SETFONT:
             /* if NULL hFont, use system font */
 
         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;
                 hFont = (HFONT) GetStockObject(SYSTEM_FONT);
 
             pgauge->hFont = hFont;