fix for Borland compilation

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

diff --git a/include/wx/quantize.h b/include/wx/quantize.h
index bb935dbcd7a9b30e1bd771e43b482e7fa9b58be2..2c01c1d72a10954b2d0aea192a334c550b03e583 100644 (file)
--- a/include/wx/quantize.h
+++ b/include/wx/quantize.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        quantize.h
+// Name:        wx/quantize.h

 // Purpose:     wxQuantizer class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxQuantizer class
 // Author:      Julian Smart
 // Modified by:


@@ -9,6 +9,11 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_QUANTIZE_H_
+#define _WX_QUANTIZE_H_
+
+#include "wx/object.h"
+

 /*
  * From jquant2.c
  *
 /*
  * From jquant2.c
  *


@@ -17,14 +22,8 @@
  * For conditions of distribution and use, see the accompanying README file.
  */
 
  * For conditions of distribution and use, see the accompanying README file.
  */
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "quantize.h"
-#endif
-
-#ifndef _WX_QUANTIZE_H_
-#define _WX_QUANTIZE_H_
-
-class WXDLLEXPORT wxImage;
+class WXDLLIMPEXP_FWD_CORE wxImage;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 
 /*
  * wxQuantize
 
 /*
  * wxQuantize


@@ -35,7 +34,7 @@ class WXDLLEXPORT wxImage;
 #define wxQUANTIZE_RETURN_8BIT_DATA             0x02
 #define wxQUANTIZE_FILL_DESTINATION_IMAGE       0x04
 
 #define wxQUANTIZE_RETURN_8BIT_DATA             0x02
 #define wxQUANTIZE_FILL_DESTINATION_IMAGE       0x04
 

-class WXDLLEXPORT wxQuantize: public wxObject
+class WXDLLIMPEXP_CORE wxQuantize: public wxObject

 {
 public:
 DECLARE_DYNAMIC_CLASS(wxQuantize)
 {
 public:
 DECLARE_DYNAMIC_CLASS(wxQuantize)


@@ -43,7 +42,7 @@ DECLARE_DYNAMIC_CLASS(wxQuantize)
 //// Constructor
 
     wxQuantize() {}
 //// Constructor
 
     wxQuantize() {}

-    ~wxQuantize() {}
+    virtual ~wxQuantize() {}

 
 //// Operations
 
 
 //// Operations
 


@@ -65,7 +64,7 @@ DECLARE_DYNAMIC_CLASS(wxQuantize)
 //// Helpers
 
     // Converts input bitmap(s) into 8bit representation with custom palette
 //// Helpers
 
     // Converts input bitmap(s) into 8bit representation with custom palette

-    
+

     // in_rows and out_rows are arrays [0..h-1] of pointer to rows
     // (in_rows contains w * 3 bytes per row, out_rows w bytes per row)
     // fills out_rows with indexes into palette (which is also stored into palette variable)
     // in_rows and out_rows are arrays [0..h-1] of pointer to rows
     // (in_rows contains w * 3 bytes per row, out_rows w bytes per row)
     // fills out_rows with indexes into palette (which is also stored into palette variable)


@@ -75,4 +74,3 @@ DECLARE_DYNAMIC_CLASS(wxQuantize)
 
 #endif
     // _WX_QUANTIZE_H_
 
 #endif
     // _WX_QUANTIZE_H_

-