X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9a2692dbe8db32938121899073abef4d07dee13..fdc62f44622dfcfea2f43910478fe5bb8ac0e938:/include/wx/rawbmp.h

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index 3fca5566a7..d4e9b60d45 100644
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -71,10 +71,12 @@
     }
  */
 
-#ifdef __VISUALC__
-    // VC++ gives an absolutely harmless warning for wxPixelData<wxBitmap> ctor
-    #pragma warning(disable: 4355) // 'this' used in initializer list
-#endif
+/*
+    Note: we do not use WXDLLEXPORT with classes in this file because VC++ has
+    problems with exporting inner class defined inside a specialization of a
+    template class from a DLL. Besides, as all the methods are inline it's not
+    really necessary to put them in DLL at all.
+ */
 
 // ----------------------------------------------------------------------------
 // wxPixelFormat
@@ -107,7 +109,7 @@ template <class Channel,
           size_t Bpp, int R, int G, int B, int A = -1,
           class Pixel = wxUint32>
 
-struct WXDLLEXPORT wxPixelFormat
+struct wxPixelFormat
 {
     // iterator over pixels is usually of type "ChannelType *"
     typedef Channel ChannelType;
@@ -146,7 +148,7 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
 
 // the (most common) native bitmap format without alpha support
 #if defined(__WXMSW__)
-    // under MSW the RGB components are inversed, they're in BGR order
+    // under MSW the RGB components are reversed, they're in BGR order
     typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
 
     #define wxPIXEL_FORMAT_ALPHA 3
@@ -163,7 +165,7 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
     #define wxPIXEL_FORMAT_ALPHA 3
 #elif defined(__WXGTK__)
     // Under GTK+ 2.X we use GdkPixbuf, which should be RGBA
-    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
+    typedef wxPixelFormat<unsigned char, 32, 0, 1, 2> wxNativePixelFormat;
 
     #define wxPIXEL_FORMAT_ALPHA 3
 #endif
@@ -186,7 +188,7 @@ template <class T> struct wxPixelFormatFor;
 // classes (wxBitmap...) will result in compile errors which is exactly what we
 // want
 template <>
-struct WXDLLEXPORT wxPixelFormatFor<wxImage>
+struct wxPixelFormatFor<wxImage>
 {
     typedef wxImagePixelFormat Format;
 };
@@ -200,7 +202,7 @@ struct WXDLLEXPORT wxPixelFormatFor<wxImage>
     wxPixelDataBase is just a helper for wxPixelData: it contains things common
     to both wxImage and wxBitmap specializations.
  */
-class WXDLLEXPORT wxPixelDataBase
+class wxPixelDataBase
 {
 public:
     // origin of the rectangular region we represent
@@ -268,10 +270,10 @@ protected:
 
 // we need to define this skeleton template to mollify VC++
 template <class Image>
-struct WXDLLEXPORT wxPixelDataOut
+struct wxPixelDataOut
 {
     template <class PixelFormat>
-    class WXDLLEXPORT wxPixelDataIn
+    class wxPixelDataIn
     {
     public:
         class Iterator { };
@@ -282,12 +284,12 @@ struct WXDLLEXPORT wxPixelDataOut
 // wxPixelData specialization for wxImage: this is the simplest case as we
 // don't have to care about different pixel formats here
 template <>
-struct WXDLLEXPORT wxPixelDataOut<wxImage>
+struct wxPixelDataOut<wxImage>
 {
     // NB: this is a template class even though it doesn't use its template
     //     parameter because otherwise wxPixelData couldn't compile
     template <class dummyPixelFormat>
-    class WXDLLEXPORT wxPixelDataIn : public wxPixelDataBase
+    class wxPixelDataIn : public wxPixelDataBase
     {
     public:
         // the type of the class we're working with
@@ -470,16 +472,16 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
 // wxPixelData specialization for wxBitmap: here things are more interesting as
 // we also have to support different pixel formats
 template <>
-struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
+struct wxPixelDataOut<wxBitmap>
 {
     template <class Format>
-    class WXDLLEXPORT wxPixelDataIn : public wxPixelDataBase
+    class wxPixelDataIn : public wxPixelDataBase
     {
     public:
         // the type of the class we're working with
         typedef wxBitmap ImageType;
 
-        class WXDLLEXPORT Iterator
+        class Iterator
         {
         public:
             // the pixel format we use
@@ -518,6 +520,12 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
                             bmp.GetRawData(data, PixelFormat::BitsPerPixel);
             }
 
+            // default constructor
+            Iterator()
+            {
+                m_ptr = NULL;
+            }
+            
             // return true if this iterator is valid
             bool IsOk() const { return m_ptr != NULL; }
 
@@ -650,14 +658,6 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
 };
 #endif //wxUSE_GUI
 
-#ifdef __VISUALC__
-    // typedef-name 'foo' used as synonym for class-name 'bar'
-    // (VC++ gives this warning each time wxPixelData::Base is used but it
-    //  doesn't make any sense here -- what's wrong with using typedef instead
-    //  of class, this is what it is here for!)
-    #pragma warning(disable: 4097)
-#endif // __VISUALC__
-
 template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
 class wxPixelData :
     public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
@@ -685,6 +685,7 @@ typedef wxPixelData<wxImage> wxImagePixelData;
 #if wxUSE_GUI
 typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData;
 typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
+
 #endif //wxUSE_GUI
 
 // ----------------------------------------------------------------------------
@@ -704,14 +705,9 @@ typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
     partial template specialization then and neither VC6 nor VC7 provide it.
  */
 template < class Image, class PixelFormat = wxPixelFormatFor<Image> >
-struct WXDLLEXPORT wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
+struct wxPixelIterator : public wxPixelData<Image, PixelFormat>::Iterator
 {
 };
 
-#ifdef __VISUALC__
-    #pragma warning(default: 4355)
-    #pragma warning(default: 4097)
-#endif
-
 #endif // _WX_RAWBMP_H_BASE_