!__WX_DC_BLIT_FIXED__ case

[wxWidgets.git] / src / gtk / window.cpp

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 616ac2f8364098b155ba446dd7651fd5e9513625..11567f27fbebb9b3ebd4a49585892d4802e672d9 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3019,9 +3019,7 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
         int dh = 0;
 
         if (m_hasScrolling)
         int dh = 0;
 
         if (m_hasScrolling)

-        {

             GetScrollbarWidth(m_widget, dw, dh);
             GetScrollbarWidth(m_widget, dw, dh);

-        }

 
 #ifndef __WXUNIVERSAL__
         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
 
 #ifndef __WXUNIVERSAL__
         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))


@@ -3841,16 +3839,18 @@ void wxWindowGTK::GtkSendPaintEvents()
     // Clip to paint region in wxClientDC
     m_clipPaintRegion = true;
 
     // Clip to paint region in wxClientDC
     m_clipPaintRegion = true;
 

-#if 0
+    m_nativeUpdateRegion = m_updateRegion;
+

     if (GetLayoutDirection() == wxLayout_RightToLeft)
     {
     if (GetLayoutDirection() == wxLayout_RightToLeft)
     {

-        maybe_rtl_region.Clear();
+        // Transform m_updateRegion under RTL
+        m_updateRegion.Clear();

         
         gint width;
         gdk_window_get_geometry( GTK_PIZZA(m_wxwindow)->bin_window,
                                  NULL, NULL, &width, NULL, NULL );
         
         
         gint width;
         gdk_window_get_geometry( GTK_PIZZA(m_wxwindow)->bin_window,
                                  NULL, NULL, &width, NULL, NULL );
         

-        wxRegionIterator upd( m_updateRegion );
+        wxRegionIterator upd( m_nativeUpdateRegion );

         while (upd)
         {
             wxRect rect;
         while (upd)
         {
             wxRect rect;


@@ -3860,12 +3860,11 @@ void wxWindowGTK::GtkSendPaintEvents()
             rect.height = upd.GetHeight();
             
             rect.x = width - rect.x - rect.width;
             rect.height = upd.GetHeight();
             
             rect.x = width - rect.x - rect.width;

-            maybe_rtl_region.Union( rect );
+            m_updateRegion.Union( rect );

             
             ++upd;
         }
     }
             
             ++upd;
         }
     }

-#endif

     
     // widget to draw on
     GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
     
     // widget to draw on
     GtkPizza *pizza = GTK_PIZZA (m_wxwindow);


@@ -3879,7 +3878,7 @@ void wxWindowGTK::GtkSendPaintEvents()
 
         if (GTK_WIDGET_MAPPED(parent->m_widget))
         {
 
         if (GTK_WIDGET_MAPPED(parent->m_widget))
         {

-            wxRegionIterator upd( m_updateRegion );
+            wxRegionIterator upd( m_nativeUpdateRegion );

             while (upd)
             {
                 GdkRectangle rect;
             while (upd)
             {
                 GdkRectangle rect;


@@ -3923,6 +3922,7 @@ void wxWindowGTK::GtkSendPaintEvents()
     m_clipPaintRegion = false;
 
     m_updateRegion.Clear();
     m_clipPaintRegion = false;
 
     m_updateRegion.Clear();

+    m_nativeUpdateRegion.Clear();

 }
 
 void wxWindowGTK::SetDoubleBuffered( bool on )
 }
 
 void wxWindowGTK::SetDoubleBuffered( bool on )


@@ -3933,6 +3933,11 @@ void wxWindowGTK::SetDoubleBuffered( bool on )
         gtk_widget_set_double_buffered( m_wxwindow, on );
 }
 
         gtk_widget_set_double_buffered( m_wxwindow, on );
 }
 

+bool wxWindowGTK::IsDoubleBuffered() const
+{
+    return GTK_WIDGET_DOUBLE_BUFFERED( m_wxwindow );
+}
+

 void wxWindowGTK::ClearBackground()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
 void wxWindowGTK::ClearBackground()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid window") );