wxWidgets-c++.patch

   1 .././src/dfb/bitmap.cpp:626:64: error: in C++98 'r' must be initialized by constructor, not by '{...}'
   2      DFBRectangle r = { rect.x, rect.y, rect.width, rect.height };
   3                                                                 ^
   4 .././src/dfb/dc.cpp:707:47: error: in C++98 'srcRect' must be initialized by constructor, not by '{...}'
   5      DFBRectangle srcRect = { srcx, srcy, w, h };
   6                                                ^
   7 .././src/dfb/dc.cpp:709:61: error: in C++98 'dstRect' must be initialized by constructor, not by '{...}'
   8                               XLOG2DEVREL(w), YLOG2DEVREL(h) };
   9                                                              ^
  10 .././src/dfb/dcclient.cpp:170:62: error: in C++98 'dfbrect' must be initialized by constructor, not by '{...}'
  11          DFBRectangle dfbrect = { r.x, r.y, r.width, r.height };
  12                                                               ^
  13 .././src/dfb/nonownedwnd.cpp:348:67: error: in C++98 'r' must be initialized by constructor, not by '{...}'
  14                     paintedRect.GetRight(), paintedRect.GetBottom()};
  15                                                                    ^
  16 .././src/dfb/window.cpp:153:55: error: in C++98 'rect' must be initialized by constructor, not by '{...}'
  17      DFBRectangle rect = { r.x, r.y, r.width, r.height };
  18                                                        ^
  19 .././src/dfb/window.cpp:762:60: error: in C++98 'dfbRect' must be initialized by constructor, not by '{...}'
  20                                   orect.width, orect.height };
  21                                                             ^
  22
  23 --- wxWidgets-3.0.2/src/dfb/bitmap.cpp.orig     2014-10-06 23:33:44.000000000 +0200
  24 +++ wxWidgets-3.0.2/src/dfb/bitmap.cpp  2017-04-08 21:02:22.420076242 +0200
  25 @@ -623,7 +623,8 @@
  26
  27      // NB: DirectFB subsurfaces share the same pixels buffer, so we must
  28      //     clone the obtained subsurface
  29 -    DFBRectangle r = { rect.x, rect.y, rect.width, rect.height };
  30 +    DFBRectangle r;
  31 +    r.x = rect.x; r.y = rect.y; r.w = rect.width; r.h = rect.height;
  32      return wxBitmap(M_BITMAP->m_surface->GetSubSurface(&r)->Clone());
  33  }
  34
  35 --- wxWidgets-3.0.2/src/dfb/dc.cpp.orig 2014-10-06 23:33:44.000000000 +0200
  36 +++ wxWidgets-3.0.2/src/dfb/dc.cpp      2017-04-08 22:30:42.656682391 +0200
  37 @@ -704,9 +704,9 @@
  38      CalcBoundingBox(dstx, dsty);
  39      CalcBoundingBox(dstx + w, dsty + h);
  40
  41 -    DFBRectangle srcRect = { srcx, srcy, w, h };
  42 -    DFBRectangle dstRect = { XLOG2DEV(dstx), YLOG2DEV(dsty),
  43 -                             XLOG2DEVREL(w), YLOG2DEVREL(h) };
  44 +    DFBRectangle srcRect; srcRect.x = srcx; srcRect.y = srcy; srcRect.w = w; srcRect.h = h;
  45 +    DFBRectangle dstRect; dstRect.x = XLOG2DEV(dstx); dstRect.y = YLOG2DEV(dsty);
  46 +                          dstRect.w = XLOG2DEVREL(w); dstRect.h = YLOG2DEVREL(h);
  47
  48      wxIDirectFBSurfacePtr dst(m_surface);
  49
  50 --- wxWidgets-3.0.2/src/dfb/dcclient.cpp.orig   2014-10-06 23:33:44.000000000 +0200
  51 +++ wxWidgets-3.0.2/src/dfb/dcclient.cpp        2017-04-08 22:35:18.586679239 +0200
  52 @@ -167,7 +167,7 @@
  53      else
  54      {
  55          m_winRect = r;
  56 -        DFBRectangle dfbrect = { r.x, r.y, r.width, r.height };
  57 +        DFBRectangle dfbrect; dfbrect.x = r.x; dfbrect.y = r.y; dfbrect.w = r.width; dfbrect.h = r.height;
  58          surface = win->GetDfbSurface()->GetSubSurface(&dfbrect);
  59
  60          // if the DC was clipped thanks to rectPaint, we must adjust the
  61 --- wxWidgets-3.0.2/src/dfb/nonownedwnd.cpp.orig        2014-10-06 23:33:44.000000000 +0200
  62 +++ wxWidgets-3.0.2/src/dfb/nonownedwnd.cpp     2017-04-08 22:37:43.196677588 +0200
  63 @@ -344,8 +344,8 @@
  64      // do FlipToFront() for each of them, because that could result in visible
  65      // updating of the screen; instead, we prefer to flip everything at once.
  66
  67 -    DFBRegion r = {paintedRect.GetLeft(), paintedRect.GetTop(),
  68 -                   paintedRect.GetRight(), paintedRect.GetBottom()};
  69 +    DFBRegion r; r.x1 = paintedRect.GetLeft(); r.y1 = paintedRect.GetTop();
  70 +                 r.x2 = paintedRect.GetRight(); r.y2 = paintedRect.GetBottom();
  71      DFBRegion *rptr = (winRect == paintedRect) ? NULL : &r;
  72
  73      GetDfbSurface()->FlipToFront(rptr);
  74 --- wxWidgets-3.0.2/src/dfb/window.cpp.orig     2014-10-06 23:33:44.000000000 +0200
  75 +++ wxWidgets-3.0.2/src/dfb/window.cpp  2017-04-08 22:40:07.890009269 +0200
  76 @@ -150,7 +150,7 @@
  77
  78      wxRect r(GetRect());
  79      AdjustForParentClientOrigin(r.x, r.y, 0);
  80 -    DFBRectangle rect = { r.x, r.y, r.width, r.height };
  81 +    DFBRectangle rect; rect.x = r.x; rect.y = r.y; rect.w = r.width; rect.h = r.height;
  82
  83      return parentSurface->GetSubSurface(&rect);
  84  }
  85 @@ -758,8 +758,8 @@
  86          if ( overlay->IsEmpty() )
  87              continue; // nothing to paint
  88
  89 -        DFBRectangle dfbRect = { orect.x - orectOrig.x, orect.y - orectOrig.y,
  90 -                                 orect.width, orect.height };
  91 +        DFBRectangle dfbRect; dfbRect.x = orect.x - orectOrig.x; dfbRect.y = orect.y - orectOrig.y;
  92 +                              dfbRect.w = orect.width; dfbRect.h = orect.height;
  93          GetDfbSurface()->Blit
  94                           (
  95                             overlay->GetDirectFBSurface(),