check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / dfb / dcclient.cpp

diff --git a/src/dfb/dcclient.cpp b/src/dfb/dcclient.cpp
index c4bd27fc69a13edb07734bd90bb7603cd71c51e6..6514a4f599674a13e5e061d6cf36bca05c76b267 100644 (file)
--- a/src/dfb/dcclient.cpp
+++ b/src/dfb/dcclient.cpp
@@ -32,7 +32,7 @@
 
 #include "wx/dfb/private.h"
 
 
 #include "wx/dfb/private.h"
 

-#define TRACE_PAINT  _T("paint")
+#define TRACE_PAINT  "paint"

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -77,9 +77,14 @@ static wxRect GetUncoveredWindowArea(wxWindow *win)
 static
 wxIDirectFBSurfacePtr CreateDummySurface(wxWindow *win, const wxRect *rect)
 {
 static
 wxIDirectFBSurfacePtr CreateDummySurface(wxWindow *win, const wxRect *rect)
 {

-    wxLogTrace(TRACE_PAINT, _T("%p ('%s'): creating dummy DC surface"),
+    wxLogTrace(TRACE_PAINT, "%p ('%s'): creating dummy DC surface",

                win, win->GetName().c_str());
     wxSize size(rect ? rect->GetSize() : win->GetSize());
                win, win->GetName().c_str());
     wxSize size(rect ? rect->GetSize() : win->GetSize());

+
+    // we can't create a surface of 0 size but the size of the window may be 0,
+    // so ensure that we have at least a single pixel to draw on
+    size.IncTo(wxSize(1, 1));
+

     return win->GetDfbSurface()->CreateCompatible
            (
              size,
     return win->GetDfbSurface()->CreateCompatible
            (
              size,


@@ -100,7 +105,7 @@ wxWindowDC::wxWindowDC(wxWindow *win)
 
 void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
 {
 
 void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
 {

-    wxCHECK_RET( win, _T("invalid window") );
+    wxCHECK_RET( win, "invalid window" );

 
     m_win = win;
 
 
     m_win = win;
 


@@ -126,7 +131,7 @@ void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
         if ( win->GetTLW()->IsPainting() && !updateRegion.IsEmpty() )
         {
             r.Intersect(updateRegion.AsRect());
         if ( win->GetTLW()->IsPainting() && !updateRegion.IsEmpty() )
         {
             r.Intersect(updateRegion.AsRect());

-            wxCHECK_RET( !r.IsEmpty(), _T("invalid painting rectangle") );
+            wxCHECK_RET( !r.IsEmpty(), "invalid painting rectangle" );

 
             // parent TLW will flip the entire surface when painting is done
             m_shouldFlip = false;
 
             // parent TLW will flip the entire surface when painting is done
             m_shouldFlip = false;


@@ -179,7 +184,7 @@ void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
         return;
 
     wxLogTrace(TRACE_PAINT,
         return;
 
     wxLogTrace(TRACE_PAINT,

-               _T("%p ('%s'): creating DC for area [%i,%i,%i,%i], clipped to [%i,%i,%i,%i], origin [%i,%i]"),
+               "%p ('%s'): creating DC for area [%i,%i,%i,%i], clipped to [%i,%i,%i,%i], origin [%i,%i]",

                win, win->GetName().c_str(),
                rectOrig.x, rectOrig.y, rectOrig.GetRight(), rectOrig.GetBottom(),
                r.x, r.y, r.GetRight(), r.GetBottom(),
                win, win->GetName().c_str(),
                rectOrig.x, rectOrig.y, rectOrig.GetRight(), rectOrig.GetBottom(),
                r.x, r.y, r.GetRight(), r.GetBottom(),


@@ -229,7 +234,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 
 wxClientDC::wxClientDC(wxWindow *win)
 {
 
 wxClientDC::wxClientDC(wxWindow *win)
 {

-    wxCHECK_RET( win, _T("invalid window") );
+    wxCHECK_RET( win, "invalid window" );

 
     wxRect rect = win->GetClientRect();
     InitForWin(win, &rect);
 
     wxRect rect = win->GetClientRect();
     InitForWin(win, &rect);