Further performance optimizations

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

diff --git a/include/wx/image.h b/include/wx/image.h
index afcbaf95c2fd16492ff7b7554cf411ab50101ae6..eb536ca793382e12e81e2429b74f3587b0871d76 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -69,9 +69,9 @@ const unsigned char wxIMAGE_ALPHA_OPAQUE = 0xff;
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxImageHandler;
-class WXDLLEXPORT wxImage;
-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxImageHandler;
+class WXDLLIMPEXP_FWD_CORE wxImage;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 
 //-----------------------------------------------------------------------------
 // wxVariant support
 
 //-----------------------------------------------------------------------------
 // wxVariant support


@@ -79,14 +79,14 @@ class WXDLLEXPORT wxPalette;
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"

-DECLARE_VARIANT_OBJECT_EXPORTED(wxImage,WXDLLEXPORT)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxImage,WXDLLIMPEXP_CORE)

 #endif
 
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
 
 #endif
 
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxImageHandler()
 {
 public:
     wxImageHandler()


@@ -140,7 +140,7 @@ private:
 // wxImageHistogram
 //-----------------------------------------------------------------------------
 
 // wxImageHistogram
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxImageHistogramEntry
+class WXDLLIMPEXP_CORE wxImageHistogramEntry

 {
 public:
     wxImageHistogramEntry() { index = value = 0; }
 {
 public:
     wxImageHistogramEntry() { index = value = 0; }


@@ -152,7 +152,7 @@ WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry,
                              wxIntegerHash, wxIntegerEqual,
                              wxImageHistogramBase);
 
                              wxIntegerHash, wxIntegerEqual,
                              wxImageHistogramBase);
 

-class WXDLLEXPORT wxImageHistogram : public wxImageHistogramBase
+class WXDLLIMPEXP_CORE wxImageHistogram : public wxImageHistogramBase

 {
 public:
     wxImageHistogram() : wxImageHistogramBase(256) { }
 {
 public:
     wxImageHistogram() : wxImageHistogramBase(256) { }


@@ -182,7 +182,7 @@ public:
 // wxImage
 //-----------------------------------------------------------------------------
 
 // wxImage
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     // red, green and blue are 8 bit unsigned integers in the range of 0..255
 {
 public:
     // red, green and blue are 8 bit unsigned integers in the range of 0..255


@@ -258,9 +258,9 @@ public:
     wxImage ResampleBicubic(int width, int height) const;
 
     // blur the image according to the specified pixel radius
     wxImage ResampleBicubic(int width, int height) const;
 
     // blur the image according to the specified pixel radius

-    wxImage Blur(int radius);
-    wxImage BlurHorizontal(int radius);
-    wxImage BlurVertical(int radius);
+    wxImage Blur(int radius) const;
+    wxImage BlurHorizontal(int radius) const;
+    wxImage BlurVertical(int radius) const;

 
     wxImage ShrinkBy( int xFactor , int yFactor ) const ;
 
 
     wxImage ShrinkBy( int xFactor , int yFactor ) const ;
 


@@ -438,15 +438,15 @@ protected:
     virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
 
 private:
     virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
 
 private:

-    friend class WXDLLEXPORT wxImageHandler;
+    friend class WXDLLIMPEXP_FWD_CORE wxImageHandler;

 
     DECLARE_DYNAMIC_CLASS(wxImage)
 };
 
 
 
     DECLARE_DYNAMIC_CLASS(wxImage)
 };
 
 

-extern void WXDLLEXPORT wxInitAllImageHandlers();
+extern void WXDLLIMPEXP_CORE wxInitAllImageHandlers();

 
 

-extern WXDLLEXPORT_DATA(wxImage)    wxNullImage;
+extern WXDLLIMPEXP_DATA_CORE(wxImage)    wxNullImage;

 
 //-----------------------------------------------------------------------------
 // wxImage handlers
 
 //-----------------------------------------------------------------------------
 // wxImage handlers