Applied patch [ 1845819 ] wxMSW Top level window freeze fix for trunk

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

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index 2172b870db7ccdaf782fc6f37ca4b3290b322c6b..3e599a602b287855d457b70de368a9f31d7cb957 100644 (file)
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_RAWBMP_H_BASE_
-#define _WX_RAWBMP_H_BASE_
+#ifndef _WX_RAWBMP_H_
+#define _WX_RAWBMP_H_

 
 #include "wx/image.h"
 
 
 #include "wx/image.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
 
 // ----------------------------------------------------------------------------
 // wxPixelFormat


@@ -107,7 +109,7 @@ template <class Channel,
           size_t Bpp, int R, int G, int B, int A = -1,
           class Pixel = wxUint32>
 
           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;
 {
     // 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__)
 
 // 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
     typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
 
     #define wxPIXEL_FORMAT_ALPHA 3


@@ -160,6 +162,16 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
     // Cocoa is standard RGB or RGBA (normally it is RGBA)
     typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
 
     // Cocoa is standard RGB or RGBA (normally it is RGBA)
     typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
 

+    #define wxPIXEL_FORMAT_ALPHA 3
+#elif defined(__WXGTK__)
+    // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA
+    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
+
+    #define wxPIXEL_FORMAT_ALPHA 3
+#elif defined(__WXDFB__)
+    // Under DirectFB, RGB components are reversed, they're in BGR order
+    typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
+

     #define wxPIXEL_FORMAT_ALPHA 3
 #endif
 
     #define wxPIXEL_FORMAT_ALPHA 3
 #endif
 


@@ -176,14 +188,16 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
 // used as default value for the pixel format in wxPixelIterator template
 template <class T> struct wxPixelFormatFor;
 
 // used as default value for the pixel format in wxPixelIterator template
 template <class T> struct wxPixelFormatFor;
 

+#if wxUSE_IMAGE

 // wxPixelFormatFor is only defined for wxImage, attempt to use it with other
 // classes (wxBitmap...) will result in compile errors which is exactly what we
 // want
 template <>
 // wxPixelFormatFor is only defined for wxImage, attempt to use it with other
 // classes (wxBitmap...) will result in compile errors which is exactly what we
 // want
 template <>

-struct WXDLLEXPORT wxPixelFormatFor<wxImage>
+struct wxPixelFormatFor<wxImage>

 {
     typedef wxImagePixelFormat Format;
 };
 {
     typedef wxImagePixelFormat Format;
 };

+#endif //wxUSE_IMAGE

 
 // ----------------------------------------------------------------------------
 // wxPixelData
 
 // ----------------------------------------------------------------------------
 // wxPixelData


@@ -193,7 +207,7 @@ struct WXDLLEXPORT wxPixelFormatFor<wxImage>
     wxPixelDataBase is just a helper for wxPixelData: it contains things common
     to both wxImage and wxBitmap specializations.
  */
     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
 {
 public:
     // origin of the rectangular region we represent


@@ -261,26 +275,28 @@ protected:
 
 // we need to define this skeleton template to mollify VC++
 template <class Image>
 
 // we need to define this skeleton template to mollify VC++
 template <class Image>

-struct WXDLLEXPORT wxPixelDataOut
+struct wxPixelDataOut

 {
     template <class PixelFormat>
 {
     template <class PixelFormat>

-    class WXDLLEXPORT wxPixelDataIn
+    class wxPixelDataIn

     {
     public:
         class Iterator { };
     };
 };
 
     {
     public:
         class Iterator { };
     };
 };
 

+#if wxUSE_IMAGE

 // wxPixelData specialization for wxImage: this is the simplest case as we
 // don't have to care about different pixel formats here
 template <>
 // 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>
 {
     // 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
         typedef wxImage ImageType;
 
         // the type of the class we're working with
         typedef wxImage ImageType;
 


@@ -455,20 +471,22 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
         Iterator m_pixels;
     };
 };
         Iterator m_pixels;
     };
 };

+#endif //wxUSE_IMAGE

 
 

+#if wxUSE_GUI

 // wxPixelData specialization for wxBitmap: here things are more interesting as
 // we also have to support different pixel formats
 template <>
 // 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>
 {
     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;
 
     {
     public:
         // the type of the class we're working with
         typedef wxBitmap ImageType;
 

-        class WXDLLEXPORT Iterator
+        class Iterator

         {
         public:
             // the pixel format we use
         {
         public:
             // the pixel format we use


@@ -507,6 +525,12 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
                             bmp.GetRawData(data, PixelFormat::BitsPerPixel);
             }
 
                             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; }
 
             // return true if this iterator is valid
             bool IsOk() const { return m_ptr != NULL; }
 


@@ -612,11 +636,22 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
         // dtor unlocks the bitmap
         ~wxPixelDataIn()
         {
         // dtor unlocks the bitmap
         ~wxPixelDataIn()
         {

-            m_bmp.UngetRawData(*this);
+            if ( m_pixels.IsOk() )
+            {
+#if defined(__WXMSW__) || defined(__WXMAC__)
+                // this is a hack to mark wxBitmap as using alpha channel
+                if ( Format::HasAlpha )
+                    m_bmp.UseAlpha();
+#endif
+                m_bmp.UngetRawData(*this);
+            }
+            // else: don't call UngetRawData() if GetRawData() failed

         }
 
         }
 

-        // call this to indicate that we should use the alpha channel
-        void UseAlpha() { m_bmp.UseAlpha(); }
+#if WXWIN_COMPATIBILITY_2_8
+        // not needed anymore, calls to it should be simply removed
+        wxDEPRECATED_INLINE( void UseAlpha(), wxEMPTY_PARAMETER_VALUE )
+#endif

 
     // private: -- see comment in the beginning of the file
 
 
     // private: -- see comment in the beginning of the file
 


@@ -638,13 +673,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
     };
 };
 
     };
 };
 

-#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__
+#endif //wxUSE_GUI

 
 template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
 class wxPixelData :
 
 template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
 class wxPixelData :


@@ -665,12 +694,16 @@ public:
     }
 };
 
     }
 };
 

-

 // some "predefined" pixel data classes
 // some "predefined" pixel data classes

+#if wxUSE_IMAGE

 typedef wxPixelData<wxImage> wxImagePixelData;
 typedef wxPixelData<wxImage> wxImagePixelData;

+#endif //wxUSE_IMAGE
+#if wxUSE_GUI

 typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData;
 typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
 
 typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData;
 typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
 

+#endif //wxUSE_GUI
+

 // ----------------------------------------------------------------------------
 // wxPixelIterator
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPixelIterator
 // ----------------------------------------------------------------------------


@@ -688,14 +721,8 @@ typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
     partial template specialization then and neither VC6 nor VC7 provide it.
  */
 template < class Image, class PixelFormat = wxPixelFormatFor<Image> >
     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_
-
+#endif // _WX_RAWBMP_H_