Further performance optimizations

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 309a09f1617828e91e70ff35f7bfa389ad4eb23b..eb536ca793382e12e81e2429b74f3587b0871d76 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -79,14 +79,14 @@ class WXDLLIMPEXP_FWD_CORE 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


@@ -444,9 +444,9 @@ private:
 };
 
 
 };
 
 

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

 
 

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

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