Soem corrections for SetSize changes

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

diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp
index 1f82c799c436e9a00a32a8a5b5c43538973fe15f..c2137dd8c489e77a418d624c6c3329f26f9e35b7 100644 (file)
--- a/src/msw/gaugemsw.cpp
+++ b/src/msw/gaugemsw.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"

+#include "wx/utils.h"

 #endif
 
 #if wxUSE_GAUGE 
 #endif
 
 #if wxUSE_GAUGE 


@@ -141,7 +142,7 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxGaugeMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxGaugeMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -654,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>