Set column field of wxDVC ITEM_{ACTIVATED,CONTEXT_MENU} events.

[wxWidgets.git] / src / propgrid / propgrid.cpp

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 31b518e95cfc6185dc5a9d5b341c1dea9e828924..e89c12abd44aa815993d7ef00b498ab9ab1e21bf 100644 (file)
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -235,6 +235,10 @@ wxPGGlobalVarsClass::~wxPGGlobalVarsClass()
         delete ((wxPGEditor*)vt_it->second);
     }
 
         delete ((wxPGEditor*)vt_it->second);
     }
 

+    // Make sure the global pointers have been reset
+    wxASSERT(wxPG_EDITOR(TextCtrl) == NULL);
+    wxASSERT(wxPG_EDITOR(ChoiceAndButton) == NULL);
+

     delete wxPGProperty::sm_wxPG_LABEL;
 }
 
     delete wxPGProperty::sm_wxPG_LABEL;
 }
 


@@ -1945,6 +1949,7 @@ void wxPropertyGrid::DrawItems( wxDC& dc,
     vx *= wxPG_PIXELS_PER_UNIT;
     vy *= wxPG_PIXELS_PER_UNIT;
 
     vx *= wxPG_PIXELS_PER_UNIT;
     vy *= wxPG_PIXELS_PER_UNIT;
 

+    // itemRect is in virtual grid space

     wxRect drawRect(itemsRect->x - vx,
                     itemsRect->y - vy,
                     itemsRect->width,
     wxRect drawRect(itemsRect->x - vx,
                     itemsRect->y - vy,
                     itemsRect->width,


@@ -1985,13 +1990,13 @@ void wxPropertyGrid::DrawItems( wxDC& dc,
 
         if ( dcPtr )
         {
 
         if ( dcPtr )
         {

+            // paintFinishY and drawBottomY are in buffer/physical space

             paintFinishY = DoDrawItems( *dcPtr, itemsRect, isBuffered );
             paintFinishY = DoDrawItems( *dcPtr, itemsRect, isBuffered );

-            int drawBottomY = itemsRect->y + itemsRect->height;
+            int drawBottomY = itemsRect->y + itemsRect->height - vy;

 
             // Clear area beyond last painted property
             if ( paintFinishY < drawBottomY )
             {
 
             // Clear area beyond last painted property
             if ( paintFinishY < drawBottomY )
             {

-                wxLogDebug("%i", paintFinishY);

                 dcPtr->SetPen(m_colEmptySpace);
                 dcPtr->SetBrush(m_colEmptySpace);
                 dcPtr->DrawRectangle(0, paintFinishY,
                 dcPtr->SetPen(m_colEmptySpace);
                 dcPtr->SetBrush(m_colEmptySpace);
                 dcPtr->DrawRectangle(0, paintFinishY,


@@ -2549,7 +2554,7 @@ wxRect wxPropertyGrid::GetPropertyRect( const wxPGProperty* p1, const wxPGProper
     //
     // Return rect which encloses the given property range
     // (in logical grid coordinates)
     //
     // Return rect which encloses the given property range
     // (in logical grid coordinates)

-    // 
+    //

 
     int visTop = p1->GetY();
     int visBottom;
 
     int visTop = p1->GetY();
     int visBottom;


@@ -4563,6 +4568,11 @@ void wxPropertyGrid::RecalculateVirtualSize( int forceXPos )
     SetScrollbars( wxPG_PIXELS_PER_UNIT, wxPG_PIXELS_PER_UNIT,
                    xAmount, yAmount, xPos, yPos, true );
 
     SetScrollbars( wxPG_PIXELS_PER_UNIT, wxPG_PIXELS_PER_UNIT,
                    xAmount, yAmount, xPos, yPos, true );
 

+    // This may be needed in addition to calling SetScrollbars()
+    // when class inherits from wxScrollHelper instead of
+    // actual wxScrolled<T>.
+    AdjustScrollbars();
+

     // Must re-get size now
     GetClientSize(&width,&height);
 
     // Must re-get size now
     GetClientSize(&width,&height);
 


@@ -5184,7 +5194,7 @@ bool wxPropertyGrid::HandleMouseUp( int x, unsigned int WXUNUSED(y),
         // Disable splitter auto-centering (but only if moved any -
         // otherwise we end up disabling auto-center even after a
         // recentering double-click).
         // Disable splitter auto-centering (but only if moved any -
         // otherwise we end up disabling auto-center even after a
         // recentering double-click).

-        int posDiff = abs(m_startingSplitterX - 
+        int posDiff = abs(m_startingSplitterX -

                           GetSplitterPosition(m_draggedSplitter));
 
         if ( posDiff > 1 )
                           GetSplitterPosition(m_draggedSplitter));
 
         if ( posDiff > 1 )