possible fix for templates with digitalmars

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/platform.h b/include/wx/platform.h
index dfcbfb232954988a18f14f60712c9e2c83e1e753..24d8e5a99f0d0174524accf2087c763da9a837c3 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -306,7 +306,7 @@
 #endif
 
 #if defined (__WXMSW__)
 #endif
 
 #if defined (__WXMSW__)

-    #if !defined(__DIGITALMARS__) && !defined(__WATCOMC__)
+    #if !defined(__WATCOMC__)

         #define wxHAVE_RAW_BITMAP
     #endif
 #endif
         #define wxHAVE_RAW_BITMAP
     #endif
 #endif

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index 2d43d81e299fac6f1499e1e539257ed881c033fb..a9199e541cb8e403275391fb55b3c97cda40a554 100644 (file)
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -100,9 +100,17 @@
         - index of the alpha component or -1 if none
         - type which can contain the full pixel value (all channels)
  */
         - index of the alpha component or -1 if none
         - type which can contain the full pixel value (all channels)
  */

+
+#ifdef __DIGITALMARS__
+template <class Channel,
+          size_t Bpp, int R, int G, int B, int A = -1,
+          class Pixel = wxUint32>
+#else

 template <typename Channel,
           size_t Bpp, int R, int G, int B, int A = -1,
           typename Pixel = wxUint32>
 template <typename Channel,
           size_t Bpp, int R, int G, int B, int A = -1,
           typename Pixel = wxUint32>

+#endif
+          

 struct WXDLLEXPORT wxPixelFormat
 {
     // iterator over pixels is usually of type "ChannelType *"
 struct WXDLLEXPORT wxPixelFormat
 {
     // iterator over pixels is usually of type "ChannelType *"


@@ -621,6 +629,28 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
     };
 };
 
     };
 };
 

+#ifdef __DIGITALMARS__
+template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
+class wxPixelData :
+    public wxPixelDataOut<Image>:: wxPixelDataIn<PixelFormat>
+{
+public:
+    wxPixelData(Image& image)
+        : wxPixelDataOut<Image>:: wxPixelDataIn<PixelFormat>(image)
+        {
+        }
+
+    wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz)
+        : wxPixelDataOut<Image>:: wxPixelDataIn<PixelFormat>(i, pt, sz)
+        {
+        }
+
+    wxPixelData(Image& i, const wxRect& rect)
+        : wxPixelDataOut<Image>:: wxPixelDataIn<PixelFormat>(i, rect)
+        {
+        }
+};
+#else // not __DIGITALMARS__

 template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
 class wxPixelData :
     public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
 template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
 class wxPixelData :
     public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>


@@ -641,6 +671,7 @@ public:
         {
         }
 };
         {
         }
 };

+#endif // __DIGITALMARS__

 
 // some "predefined" pixel data classes
 typedef wxPixelData<wxImage> wxImagePixelData;
 
 // some "predefined" pixel data classes
 typedef wxPixelData<wxImage> wxImagePixelData;