added wx/defs.h include to correct compilation issues under Mac OS X

[wxWidgets.git] / src / os2 / gauge.cpp

diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp
index 8ce4c3e01319ac76beb92bf7d0325c52208209f6..620760fd5f6d5c2ecf85cbaeaadb1d8ac0621daa 100644 (file)
--- a/src/os2/gauge.cpp
+++ b/src/os2/gauge.cpp
@@ -9,7 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-// For compilers that support precompilation, includes "wx.h".

 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP


@@ -47,31 +46,36 @@
 #define ZYZGS_3D        0x8000L     /* control will be 3D       */
 
 /* public function prototypes */
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)

-#endif

 
 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,
            const wxPoint& pos,
            const wxSize& size,
            long style,
 
 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,
            const wxPoint& pos,
            const wxSize& size,
            long style,

+#if wxUSE_VALIDATORS

            const wxValidator& validator,
            const wxValidator& validator,

+#endif

            const wxString& name)
 {
     static bool wxGaugeOS2Initialised = FALSE;
 
     if ( !wxGaugeOS2Initialised )
     {
            const wxString& name)
 {
     static bool wxGaugeOS2Initialised = FALSE;
 
     if ( !wxGaugeOS2Initialised )
     {

+//TODO:
+/*

       if (!gaugeInit((HINSTANCE) wxGetInstance()))
           wxFatalError("Cannot initalize Gauge library");
       if (!gaugeInit((HINSTANCE) wxGetInstance()))
           wxFatalError("Cannot initalize Gauge library");

+*/

       wxGaugeOS2Initialised = TRUE;
     }
 
     SetName(name);
       wxGaugeOS2Initialised = TRUE;
     }
 
     SetName(name);

+#if wxUSE_VALIDATORS

     SetValidator(validator);
     SetValidator(validator);

+#endif

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


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


@@ -636,7 +640,7 @@ bool wxGauge::SetBackgroundColour(const wxColour& col)
 
 
 /* static global variables */
 
 
 /* static global variables */

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

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


@@ -748,7 +752,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.
      */
     /*  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 */
 //    if (hdc)
 //    {
         /* check for mono-display */


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