Win64 compilation fixes: define SIZEOF_SIZE_T, added wxUIntPtr

[wxWidgets.git] / include / wx / quantize.h

diff --git a/include/wx/quantize.h b/include/wx/quantize.h
index dd50cf7102053a536749a780afbd7b366f32edab..7fdeb1d2d5d1f5d516f5ed15162f1fa4c7067f2f 100644 (file)
--- a/include/wx/quantize.h
+++ b/include/wx/quantize.h
@@ -17,7 +17,7 @@
  * For conditions of distribution and use, see the accompanying README file.
  */
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "quantize.h"
 #endif
 
@@ -42,7 +42,8 @@ DECLARE_DYNAMIC_CLASS(wxQuantize)
 
 //// Constructor
 
-    wxQuantize() {};
+    wxQuantize() {}
+    ~wxQuantize() {}
 
 //// Operations
 
@@ -52,7 +53,13 @@ DECLARE_DYNAMIC_CLASS(wxQuantize)
     // This palette may be passed to ConvertImageToBitmap, for example.
     // If you pass a palette pointer, you must free the palette yourself.
 
-    static bool Quantize(const wxImage& src, wxImage& dest, wxPalette** pPalette = NULL, int desiredNoColours = 236,
+    static bool Quantize(const wxImage& src, wxImage& dest, wxPalette** pPalette, int desiredNoColours = 236,
+        unsigned char** eightBitData = 0, int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE|wxQUANTIZE_RETURN_8BIT_DATA);
+
+    // This version sets a palette in the destination image so you don't
+    // have to manage it yourself.
+
+    static bool Quantize(const wxImage& src, wxImage& dest, int desiredNoColours = 236,
         unsigned char** eightBitData = 0, int flags = wxQUANTIZE_INCLUDE_WINDOWS_COLOURS|wxQUANTIZE_FILL_DESTINATION_IMAGE|wxQUANTIZE_RETURN_8BIT_DATA);
 
 //// Helpers