X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ac31c429f668e236f4d9686c47b5172f625781c..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/common/quantize.cpp diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp index 37674b2c4b..b5936f21fb 100644 --- a/src/common/quantize.cpp +++ b/src/common/quantize.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: quantize.cpp +// Name: src/common/quantize.cpp // Purpose: wxQuantize implementation // Author: Julian Smart // Modified by: @@ -30,10 +30,6 @@ /* modified by Vaclav Slavik for use as jpeglib-independent module */ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "quantize.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -41,14 +37,15 @@ #pragma hdrstop #endif +#if wxUSE_IMAGE + +#include "wx/quantize.h" + #ifndef WX_PRECOMP #include "wx/palette.h" #endif -#if wxUSE_IMAGE - #include "wx/image.h" -#include "wx/quantize.h" #ifdef __WXMSW__ #include "wx/msw/private.h" @@ -77,7 +74,7 @@ typedef unsigned short UINT16; typedef signed short INT16; -#ifndef __WATCOMC__ +#if !(defined(__WATCOMC__) && (defined(__WXMSW__) || defined(__WXMOTIF__))) typedef signed int INT32; #endif @@ -1656,4 +1653,3 @@ bool wxQuantize::Quantize(const wxImage& src, #endif // wxUSE_IMAGE -