Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

[wxWidgets.git] / src / common / quantize.cpp

diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index 695375657ce5bf68dcf0d77ef9049a11f78786a3..618f4e26b622340fd37a2f363b62de8accdf0247 100644 (file)
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     22/6/2000
 // Author:      Julian Smart
 // Modified by:
 // Created:     22/6/2000

-// RCS-ID:      $Id$

 // Copyright:   (c) Thomas G. Lane, Vaclav Slavik, Julian Smart
 // Licence:     wxWindows licence + JPEG library licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Thomas G. Lane, Vaclav Slavik, Julian Smart
 // Licence:     wxWindows licence + JPEG library licence
 /////////////////////////////////////////////////////////////////////////////


@@ -37,17 +36,17 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/palette.h"
-#endif
-

 #if wxUSE_IMAGE
 
 #if wxUSE_IMAGE
 

-#include "wx/image.h"

 #include "wx/quantize.h"
 
 #include "wx/quantize.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/palette.h"
+    #include "wx/image.h"
+#endif
+

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-#include "wx/msw/private.h"
+    #include "wx/msw/private.h"

 #endif
 
 #include <stdlib.h>
 #endif
 
 #include <stdlib.h>


@@ -1546,7 +1545,7 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
 
     if (flags & wxQUANTIZE_FILL_DESTINATION_IMAGE)
     {
 
     if (flags & wxQUANTIZE_FILL_DESTINATION_IMAGE)
     {

-        if (!dest.Ok())
+        if (!dest.IsOk())

             dest.Create(w, h);
 
         imgdt = dest.GetData();
             dest.Create(w, h);
 
         imgdt = dest.GetData();


@@ -1621,7 +1620,9 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
         delete[] g;
         delete[] b;
     }
         delete[] g;
         delete[] b;
     }

-#endif // wxUSE_PALETTE
+#else // !wxUSE_PALETTE
+    wxUnusedVar(pPalette);
+#endif // wxUSE_PALETTE/!wxUSE_PALETTE

 
     return true;
 }
 
     return true;
 }