Forward port r56500.

[wxWidgets.git] / src / generic / headerctrlg.cpp

diff --git a/src/generic/headerctrlg.cpp b/src/generic/headerctrlg.cpp
index 48e3117c397326d4c61c19b80f4b236028c8b923..4c70667487b14887742ab109143cf811a8175b6a 100644 (file)
--- a/src/generic/headerctrlg.cpp
+++ b/src/generic/headerctrlg.cpp
@@ -344,7 +344,8 @@ void wxHeaderCtrl::StartOrContinueResizing(unsigned int col, int xPhysical)
         }
         //else: we had already done the above when we started
 
-        UpdateResizingMarker(xPhysical);
+        // This results in ugly flicker
+        // UpdateResizingMarker(xPhysical);
     }
 }
 
@@ -497,8 +498,8 @@ void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
     GetClientSize(&w, &h);
     
 #ifdef __WXGTK__
-    int vw;
-    GetVirtualSize(&vw, NULL);
+//    int vw;
+//    GetVirtualSize(&vw, NULL);
 #endif
 
     wxAutoBufferedPaintDC dc(this);
@@ -553,8 +554,8 @@ void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 #ifdef __WXGTK__
         if (i == count-1)
         {
-            colWidth = wxMax( colWidth, vw - xpos );
-            state |= wxCONTROL_EXPANDED;
+//            colWidth = wxMax( colWidth, vw - xpos );
+            state |= wxCONTROL_DIRTY;
         }
 #endif