X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0371a6914315f283371985bb751fb37504dd63d8..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/os2/gauge.cpp

diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp
index 8ce4c3e013..8bce479cec 100644
--- a/src/os2/gauge.cpp
+++ b/src/os2/gauge.cpp
@@ -9,7 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
@@ -47,7 +46,7 @@
 #define ZYZGS_3D        0x8000L     /* control will be 3D       */
 
 /* public function prototypes */
-BOOL _Optlink gaugeInit(HINSTANCE hInstance);
+// BOOL _Optlink gaugeInit(HINSTANCE hInstance);
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
@@ -58,20 +57,31 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,
            long style,
+#if wxUSE_VALIDATORS
+#  if defined(__VISAGECPP__)
+           const wxValidator* validator,
+#  else
            const wxValidator& validator,
+#  endif
+#endif
            const wxString& name)
 {
     static bool wxGaugeOS2Initialised = FALSE;
 
     if ( !wxGaugeOS2Initialised )
     {
+//TODO:
+/*
       if (!gaugeInit((HINSTANCE) wxGetInstance()))
           wxFatalError("Cannot initalize Gauge library");
+*/
       wxGaugeOS2Initialised = TRUE;
     }
 
     SetName(name);
+#if wxUSE_VALIDATORS
     SetValidator(validator);
+#endif
     if (parent) parent->AddChild(this);
     m_rangeMax = range;
     m_gaugePos = 0;
@@ -99,7 +109,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
   msFlags |= ZYZGS_3D;
 
   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);
 
@@ -636,7 +646,7 @@ bool wxGauge::SetBackgroundColour(const wxColour& col)
 
 
 /* static global variables */
-//static wxChar gszzYzGaugeClass[] = T("zYzGauge");
+//static wxChar gszzYzGaugeClass[] = wxT("zYzGauge");
 
 
 /* window word position definitions */
@@ -748,7 +758,7 @@ bool wxGauge::SetBackgroundColour(const wxColour& col)
     /*  Get a DC to determine whether device is mono or not, and set
      *  default foreground/background colors as appropriate.
      */
-//    hdc = CreateIC(T("DISPLAY"), NULL, NULL, 0L) ;
+//    hdc = CreateIC(wxT("DISPLAY"), NULL, NULL, 0L) ;
 //    if (hdc)
 //    {
         /* check for mono-display */
@@ -903,7 +913,7 @@ bool wxGauge::SetBackgroundColour(const wxColour& col)
 //    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);