mbstowcs hack for CodeWarrior's MSL

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

diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp
index 38f5192969c3573b3501dfff3304239ccda06030..515dbe7b5d276902a11085487ed186e7ad852ce7 100644 (file)
--- a/src/msw/gaugemsw.cpp
+++ b/src/msw/gaugemsw.cpp
@@ -22,9 +22,10 @@
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"

+#include "wx/utils.h"

 #endif
 
 #endif
 

-#if USE_GAUGE 
+#if wxUSE_GAUGE 

 
 #include "wx/msw/gaugemsw.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/gaugemsw.h"
 #include "wx/msw/private.h"


@@ -85,9 +86,10 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;

+  m_gaugePos = 0;

 
 

-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+  SetBackgroundColour(parent->GetBackgroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;

 
   m_windowStyle = style;
 
 
   m_windowStyle = style;
 


@@ -127,7 +129,7 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   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((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()));
 

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

 
   if (width == -1)
     width = 50;
 
   if (width == -1)
     width = 50;


@@ -653,7 +655,7 @@ void FAR PASCAL Draw3DLine(HDC hdc, WORD x, WORD y, WORD nLen,
 
 
 /* get the includes we need */
 
 
 /* get the includes we need */

-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)

 #include <malloc.h>
 #endif
 #include <stdio.h>
 #include <malloc.h>
 #endif
 #include <stdio.h>


@@ -1170,4 +1172,4 @@ zyzgForceRepaint3D:
 
 /** EOF: zyzgauge.c **/
 
 
 /** EOF: zyzgauge.c **/
 

-#endif // USE_GAUGE
+#endif // wxUSE_GAUGE