[start of] a wxUniversal implementation of wxToolBar

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

diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index 6b702ebf5e7c5299e461bfaf0f6effbd986d2dd7..1d1e1500fb7c06e7635ca3def11144298c96b6d1 100644 (file)
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -90,7 +90,7 @@ typedef struct {
         JSAMPLE *sample_range_limit, *srl_orig;
 } j_decompress;
 
         JSAMPLE *sample_range_limit, *srl_orig;
 } j_decompress;
 

-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)

     #define JMETHOD(type,methodname,arglist)  type (__cdecl methodname) arglist
 #else
     #define JMETHOD(type,methodname,arglist)  type (methodname) arglist
     #define JMETHOD(type,methodname,arglist)  type (__cdecl methodname) arglist
 #else
     #define JMETHOD(type,methodname,arglist)  type (methodname) arglist


@@ -334,7 +334,7 @@ typedef my_cquantizer * my_cquantize_ptr;
 
 void
 prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
 
 void
 prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,

-          JSAMPARRAY output_buf, int num_rows)
+          JSAMPARRAY WXUNUSED(output_buf), int num_rows)

 {
   my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
   register JSAMPROW ptr;
 {
   my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
   register JSAMPROW ptr;


@@ -1284,7 +1284,7 @@ finish_pass1 (j_decompress_ptr cinfo)
 
 
 void
 
 
 void

-finish_pass2 (j_decompress_ptr cinfo)
+finish_pass2 (j_decompress_ptr WXUNUSED(cinfo))

 {
   /* no work */
 }
 {
   /* no work */
 }