Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/quantize.h b/interface/wx/quantize.h
index d412add94a1c993709f5a93253308eea4eb9869f..8701ab5d72dd3fad6272f8d8d93b8ce0c2b9177a 100644 (file)
--- a/interface/wx/quantize.h
+++ b/interface/wx/quantize.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxQuantize
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -33,9 +33,9 @@ public:
         Fills @a out_rows with indexes into palette (which is also stored into @a palette
         variable).
     */
-    void DoQuantize(unsigned w, unsigned h, unsigned char** in_rows,
-                    unsigned char** out_rows, unsigned char* palette,
-                    int desiredNoColours);
+    static void DoQuantize(unsigned int w, unsigned int h,
+                           unsigned char** in_rows, unsigned char** out_rows,
+                           unsigned char* palette, int desiredNoColours);
 
     /**
         Reduce the colours in the source image and put the result into the destination image.
@@ -44,22 +44,22 @@ public:
         Specify an optional palette pointer to receive the resulting palette.
         This palette may be passed to ConvertImageToBitmap, for example.
     */
-    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);
+    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.
     */
-    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);
+    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);
 };