Added ability to switch off more components of the size page UI

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

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index c494ce97fa729c873064e03a2ac61505c79bf7a0..aa61cf944d58a9aa850c7a8c4c8a29f6a7d41dd9 100644 (file)
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -348,6 +348,7 @@ void wxPropertyGrid::Init1()
     m_eventObject = this;
     m_curFocused = NULL;
     m_processedEvent = NULL;
     m_eventObject = this;
     m_curFocused = NULL;
     m_processedEvent = NULL;

+    m_tlp = NULL;

     m_sortFunction = NULL;
     m_inDoPropertyChanged = false;
     m_inCommitChangesFromEditor = false;
     m_sortFunction = NULL;
     m_inDoPropertyChanged = false;
     m_inCommitChangesFromEditor = false;


@@ -375,9 +376,7 @@ void wxPropertyGrid::Init1()
     m_coloursCustomized = 0;
     m_frozen = 0;
 
     m_coloursCustomized = 0;
     m_frozen = 0;
 

-#if wxPG_DOUBLE_BUFFER

     m_doubleBuffer = NULL;
     m_doubleBuffer = NULL;

-#endif

 
 #ifndef wxPG_ICON_WIDTH
     m_expandbmp = NULL;
 
 #ifndef wxPG_ICON_WIDTH
     m_expandbmp = NULL;


@@ -467,7 +466,6 @@ void wxPropertyGrid::Init2()
     SetBackgroundStyle( wxBG_STYLE_CUSTOM );
 
     // Hook the top-level parent
     SetBackgroundStyle( wxBG_STYLE_CUSTOM );
 
     // Hook the top-level parent

-    m_tlp = NULL;

     m_tlpClosed = NULL;
     m_tlpClosedTime = 0;
 
     m_tlpClosed = NULL;
     m_tlpClosedTime = 0;
 


@@ -544,10 +542,8 @@ wxPropertyGrid::~wxPropertyGrid()
                       wxS("Close(false).)") );
     }
 
                       wxS("Close(false).)") );
     }
 

-#if wxPG_DOUBLE_BUFFER

     if ( m_doubleBuffer )
         delete m_doubleBuffer;
     if ( m_doubleBuffer )
         delete m_doubleBuffer;

-#endif

 
     if ( m_iFlags & wxPG_FL_CREATEDSTATE )
         delete m_pState;
 
     if ( m_iFlags & wxPG_FL_CREATEDSTATE )
         delete m_pState;


@@ -672,9 +668,7 @@ void wxPropertyGrid::Thaw()
     {
         wxControl::Thaw();
         RecalculateVirtualSize();
     {
         wxControl::Thaw();
         RecalculateVirtualSize();

-    #if wxPG_REFRESH_CONTROLS_AFTER_REPAINT

         Refresh();
         Refresh();

-    #endif

 
         // Force property re-selection
         // NB: We must copy the selection.
 
         // Force property re-selection
         // NB: We must copy the selection.


@@ -1127,9 +1121,7 @@ void wxPropertyGrid::SetExtraStyle( long exStyle )
         }
         else
         {
         }
         else
         {

-        #if wxPG_DOUBLE_BUFFER

             wxDELETE(m_doubleBuffer);
             wxDELETE(m_doubleBuffer);

-        #endif

         }
     }
 
         }
     }
 


@@ -1965,7 +1957,6 @@ void wxPropertyGrid::DrawItems( wxDC& dc,
         wxDC* dcPtr = &dc;
         bool isBuffered = false;
 
         wxDC* dcPtr = &dc;
         bool isBuffered = false;
 

-    #if wxPG_DOUBLE_BUFFER

         wxMemoryDC* bufferDC = NULL;
 
         if ( !(GetExtraStyle() & wxPG_EX_NATIVE_DOUBLE_BUFFERING) )
         wxMemoryDC* bufferDC = NULL;
 
         if ( !(GetExtraStyle() & wxPG_EX_NATIVE_DOUBLE_BUFFERING) )


@@ -1986,7 +1977,6 @@ void wxPropertyGrid::DrawItems( wxDC& dc,
                 isBuffered = true;
             }
         }
                 isBuffered = true;
             }
         }

-    #endif

 
         if ( dcPtr )
         {
 
         if ( dcPtr )
         {


@@ -2005,7 +1995,6 @@ void wxPropertyGrid::DrawItems( wxDC& dc,
             }
         }
 
             }
         }
 

-    #if wxPG_DOUBLE_BUFFER

         if ( bufferDC )
         {
             dc.Blit( drawRect.x, drawRect.y, drawRect.width,
         if ( bufferDC )
         {
             dc.Blit( drawRect.x, drawRect.y, drawRect.width,


@@ -2013,7 +2002,6 @@ void wxPropertyGrid::DrawItems( wxDC& dc,
                      bufferDC, 0, 0, wxCOPY );
             delete bufferDC;
         }
                      bufferDC, 0, 0, wxCOPY );
             delete bufferDC;
         }

-    #endif

     }
     else
     {
     }
     else
     {


@@ -2085,10 +2073,11 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
     int xRelMod = 0;
 
     //
     int xRelMod = 0;
 
     //

-    // With wxPG_DOUBLE_BUFFER, do double buffering
+    // For now, do some manual calculation for double buffering

     // - buffer's y = 0, so align itemsRect and coordinates to that
     //
     // - buffer's y = 0, so align itemsRect and coordinates to that
     //

-#if wxPG_DOUBLE_BUFFER
+    // TODO: In future use wxAutoBufferedPaintDC (for example)
+    //

     int yRelMod = 0;
 
     wxRect cr2;
     int yRelMod = 0;
 
     wxRect cr2;


@@ -2107,9 +2096,6 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
         firstItemTopY -= yRelMod;
         lastItemBottomY -= yRelMod;
     }
         firstItemTopY -= yRelMod;
         lastItemBottomY -= yRelMod;
     }

-#else
-    wxUnusedVar(isBuffered);
-#endif

 
     int x = m_marginWidth - xRelMod;
 
 
     int x = m_marginWidth - xRelMod;
 


@@ -2151,10 +2137,6 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
     const wxPropertyGridPageState* state = m_pState;
     const wxArrayInt& colWidths = state->m_colWidths;
 
     const wxPropertyGridPageState* state = m_pState;
     const wxArrayInt& colWidths = state->m_colWidths;
 

-#if wxPG_REFRESH_CONTROLS_AFTER_REPAINT
-    bool wasSelectedPainted = false;
-#endif
-

     // TODO: Only render columns that are within clipping region.
 
     dc.SetFont(normalFont);
     // TODO: Only render columns that are within clipping region.
 
     dc.SetFont(normalFont);


@@ -2282,11 +2264,6 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
         }
         else
         {
         }
         else
         {

-#if wxPG_REFRESH_CONTROLS_AFTER_REPAINT
-            if ( p == firstSelected )
-                wasSelectedPainted = true;
-#endif
-

             renderFlags |= wxPGCellRenderer::Selected;
 
             if ( !p->IsCategory() )
             renderFlags |= wxPGCellRenderer::Selected;
 
             if ( !p->IsCategory() )


@@ -2523,18 +2500,6 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
         y += rowHeight;
     }
 
         y += rowHeight;
     }
 

-    // Refresh editor controls (seems not needed on msw)
-    // NOTE: This code is mandatory for GTK!
-#if wxPG_REFRESH_CONTROLS_AFTER_REPAINT
-    if ( wasSelectedPainted )
-    {
-        if ( m_wndEditor )
-            m_wndEditor->Refresh();
-        if ( m_wndEditor2 )
-            m_wndEditor2->Refresh();
-    }
-#endif
-

     return y;
 }
 
     return y;
 }
 


@@ -2612,7 +2577,7 @@ void wxPropertyGrid::DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 )
 
 void wxPropertyGrid::RefreshProperty( wxPGProperty* p )
 {
 
 void wxPropertyGrid::RefreshProperty( wxPGProperty* p )
 {

-    if ( m_pState->DoIsPropertySelected(p) )
+    if ( m_pState->DoIsPropertySelected(p) || p->IsChildSelected(true) )

     {
         // NB: We must copy the selection.
         wxArrayPGProperty selection = m_pState->m_selection;
     {
         // NB: We must copy the selection.
         wxArrayPGProperty selection = m_pState->m_selection;


@@ -2674,7 +2639,7 @@ void wxPropertyGrid::Refresh( bool WXUNUSED(eraseBackground),
 
     wxWindow::Refresh(false, rect);
 
 
     wxWindow::Refresh(false, rect);
 

-#if wxPG_REFRESH_CONTROLS_AFTER_REPAINT
+#if wxPG_REFRESH_CONTROLS

     // I think this really helps only GTK+1.2
     if ( m_wndEditor ) m_wndEditor->Refresh();
     if ( m_wndEditor2 ) m_wndEditor2->Refresh();
     // I think this really helps only GTK+1.2
     if ( m_wndEditor ) m_wndEditor->Refresh();
     if ( m_wndEditor2 ) m_wndEditor2->Refresh();


@@ -3093,7 +3058,7 @@ bool wxPropertyGrid::PerformValidation( wxPGProperty* p, wxVariant& pendingValue
             if ( changedProperty == GetSelection() )
             {
                 wxWindow* editor = GetEditorControl();
             if ( changedProperty == GetSelection() )
             {
                 wxWindow* editor = GetEditorControl();

-                wxASSERT( editor->IsKindOf(CLASSINFO(wxTextCtrl)) );
+                wxASSERT( wxDynamicCast(editor, wxTextCtrl) );

                 evtChangingValue = wxStaticCast(editor, wxTextCtrl)->GetValue();
             }
             else
                 evtChangingValue = wxStaticCast(editor, wxTextCtrl)->GetValue();
             }
             else


@@ -3148,7 +3113,7 @@ bool wxPropertyGrid::PerformValidation( wxPGProperty* p, wxVariant& pendingValue
 wxStatusBar* wxPropertyGrid::GetStatusBar()
 {
     wxWindow* topWnd = ::wxGetTopLevelParent(this);
 wxStatusBar* wxPropertyGrid::GetStatusBar()
 {
     wxWindow* topWnd = ::wxGetTopLevelParent(this);

-    if ( topWnd && topWnd->IsKindOf(CLASSINFO(wxFrame)) )
+    if ( wxDynamicCast(topWnd, wxFrame) )

     {
         wxFrame* pFrame = wxStaticCast(topWnd, wxFrame);
         if ( pFrame )
     {
         wxFrame* pFrame = wxStaticCast(topWnd, wxFrame);
         if ( pFrame )


@@ -3231,7 +3196,7 @@ bool wxPropertyGrid::OnValidationFailure( wxPGProperty* property,
 
     //
     // For non-wxTextCtrl editors, we do need to revert the value
 
     //
     // For non-wxTextCtrl editors, we do need to revert the value

-    if ( !editor->IsKindOf(CLASSINFO(wxTextCtrl)) &&
+    if ( !wxDynamicCast(editor, wxTextCtrl) &&

          property == GetSelection() )
     {
         property->GetEditorClass()->UpdateControl(property, editor);
          property == GetSelection() )
     {
         property->GetEditorClass()->UpdateControl(property, editor);


@@ -3441,7 +3406,7 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
     }
     else
     {
     }
     else
     {

-#if wxPG_REFRESH_CONTROLS_AFTER_REPAINT
+#if wxPG_REFRESH_CONTROLS

         if ( m_wndEditor ) m_wndEditor->Refresh();
         if ( m_wndEditor2 ) m_wndEditor2->Refresh();
 #endif
         if ( m_wndEditor ) m_wndEditor->Refresh();
         if ( m_wndEditor2 ) m_wndEditor2->Refresh();
 #endif


@@ -3597,7 +3562,7 @@ bool wxPropertyGrid::HandleCustomEditorEvent( wxEvent &event )
     // Filter out excess wxTextCtrl modified events
     if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED && wnd )
     {
     // Filter out excess wxTextCtrl modified events
     if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED && wnd )
     {

-        if ( wnd->IsKindOf(CLASSINFO(wxTextCtrl)) )
+        if ( wxDynamicCast(wnd, wxTextCtrl) )

         {
             wxTextCtrl* tc = (wxTextCtrl*) wnd;
 
         {
             wxTextCtrl* tc = (wxTextCtrl*) wnd;
 


@@ -3606,8 +3571,14 @@ bool wxPropertyGrid::HandleCustomEditorEvent( wxEvent &event )
                 return true;
             m_prevTcValue = newTcValue;
         }
                 return true;
             m_prevTcValue = newTcValue;
         }

-        else if ( wnd->IsKindOf(CLASSINFO(wxComboCtrl)) )
+        else if ( wxDynamicCast(wnd, wxComboCtrl) )

         {
         {

+            // In some cases we might stumble unintentionally on
+            // wxComboCtrl's embedded wxTextCtrl's events. Let's
+            // avoid them.
+            if ( wxDynamicCast(editorWnd, wxTextCtrl) )
+                return false;
+

             wxComboCtrl* cc = (wxComboCtrl*) wnd;
 
             wxString newTcValue = cc->GetTextCtrl()->GetValue();
             wxComboCtrl* cc = (wxComboCtrl*) wnd;
 
             wxString newTcValue = cc->GetTextCtrl()->GetValue();


@@ -3982,20 +3953,7 @@ void wxPropertyGrid::FreeEditors()
     // Return focus back to canvas from children (this is required at least for
     // GTK+, which, unlike Windows, clears focus when control is destroyed
     // instead of moving it to closest parent).
     // Return focus back to canvas from children (this is required at least for
     // GTK+, which, unlike Windows, clears focus when control is destroyed
     // instead of moving it to closest parent).

-    wxWindow* focus = wxWindow::FindFocus();
-    if ( focus )
-    {
-        wxWindow* parent = focus->GetParent();
-        while ( parent )
-        {
-            if ( parent == this )
-            {
-                SetFocusOnCanvas();
-                break;
-            }
-            parent = parent->GetParent();
-        }
-    }
+    SetFocusOnCanvas();

 
     // Do not free editors immediately if processing events
     if ( m_wndEditor2 )
 
     // Do not free editors immediately if processing events
     if ( m_wndEditor2 )


@@ -4599,7 +4557,6 @@ void wxPropertyGrid::RecalculateVirtualSize( int forceXPos )
     if ( !HasVirtualWidth() )
     {
         m_pState->SetVirtualWidth(width);
     if ( !HasVirtualWidth() )
     {
         m_pState->SetVirtualWidth(width);

-        x = width;

     }
 
     m_width = width;
     }
 
     m_width = width;


@@ -4626,7 +4583,6 @@ void wxPropertyGrid::OnResize( wxSizeEvent& event )
     m_width = width;
     m_height = height;
 
     m_width = width;
     m_height = height;
 

-#if wxPG_DOUBLE_BUFFER

     if ( !(GetExtraStyle() & wxPG_EX_NATIVE_DOUBLE_BUFFERING) )
     {
         int dblh = (m_lineHeight*2);
     if ( !(GetExtraStyle() & wxPG_EX_NATIVE_DOUBLE_BUFFERING) )
     {
         int dblh = (m_lineHeight*2);


@@ -4654,8 +4610,6 @@ void wxPropertyGrid::OnResize( wxSizeEvent& event )
         }
     }
 
         }
     }
 

-#endif
-

     m_pState->OnClientWidthChange( width, event.GetSize().x - m_ncWidth, true );
     m_ncWidth = event.GetSize().x;
 
     m_pState->OnClientWidthChange( width, event.GetSize().x - m_ncWidth, true );
     m_ncWidth = event.GetSize().x;
 


@@ -4691,7 +4645,24 @@ void wxPropertyGrid::SetVirtualWidth( int width )
 
 void wxPropertyGrid::SetFocusOnCanvas()
 {
 
 void wxPropertyGrid::SetFocusOnCanvas()
 {

-    SetFocus();
+    // To prevent wxPropertyGrid from stealing focus from other controls,
+    // only move focus to the grid if it was already in one if its child
+    // controls.
+    wxWindow* focus = wxWindow::FindFocus();
+    if ( focus )
+    {
+        wxWindow* parent = focus->GetParent();
+        while ( parent )
+        {
+            if ( parent == this )
+            {
+                SetFocus();
+                break;
+            }
+            parent = parent->GetParent();
+        }
+    }
+

     m_editorFocused = 0;
 }
 
     m_editorFocused = 0;
 }
 


@@ -4824,7 +4795,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even
                     }
 
                 // Do not Skip() the event after selection has been made.
                     }
 
                 // Do not Skip() the event after selection has been made.

-                // Otherwise default event handling behavior kicks in
+                // Otherwise default event handling behaviour kicks in

                 // and may revert focus back to the main canvas.
                 res = true;
             }
                 // and may revert focus back to the main canvas.
                 res = true;
             }


@@ -4881,7 +4852,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even
                             m_draggedSplitter = splitterHit;
                             m_dragOffset = splitterHitOffset;
 
                             m_draggedSplitter = splitterHit;
                             m_dragOffset = splitterHitOffset;
 

-                        #if wxPG_REFRESH_CONTROLS_AFTER_REPAINT
+                        #if wxPG_REFRESH_CONTROLS

                             // Fixes button disappearance bug
                             if ( m_wndEditor2 )
                                 m_wndEditor2->Show ( false );
                             // Fixes button disappearance bug
                             if ( m_wndEditor2 )
                                 m_wndEditor2->Show ( false );


@@ -5193,7 +5164,7 @@ bool wxPropertyGrid::HandleMouseUp( int x, unsigned int WXUNUSED(y),
     int splitterHitOffset;
     state->HitTestH( x, &splitterHit, &splitterHitOffset );
 
     int splitterHitOffset;
     state->HitTestH( x, &splitterHit, &splitterHitOffset );
 

-    // No event type check - basicly calling this method should
+    // No event type check - basically calling this method should

     // just stop dragging.
     // Left up after dragged?
     if ( m_dragStatus >= 1 )
     // just stop dragging.
     // Left up after dragged?
     if ( m_dragStatus >= 1 )


@@ -5246,7 +5217,7 @@ bool wxPropertyGrid::HandleMouseUp( int x, unsigned int WXUNUSED(y),
             m_wndEditor->Show ( true );
         }
 
             m_wndEditor->Show ( true );
         }
 

-    #if wxPG_REFRESH_CONTROLS_AFTER_REPAINT
+    #if wxPG_REFRESH_CONTROLS

         // Fixes button disappearance bug
         if ( m_wndEditor2 )
             m_wndEditor2->Show ( true );
         // Fixes button disappearance bug
         if ( m_wndEditor2 )
             m_wndEditor2->Show ( true );


@@ -5272,7 +5243,7 @@ bool wxPropertyGrid::OnMouseCommon( wxMouseEvent& event, int* px, int* py )
 
     // Hide popup on clicks
     if ( event.GetEventType() != wxEVT_MOTION )
 
     // Hide popup on clicks
     if ( event.GetEventType() != wxEVT_MOTION )

-        if ( wnd && wnd->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)) )
+        if ( wxDynamicCast(wnd, wxOwnerDrawnComboBox) )

         {
             ((wxOwnerDrawnComboBox*)wnd)->HidePopup();
         }
         {
             ((wxOwnerDrawnComboBox*)wnd)->HidePopup();
         }


@@ -5581,12 +5552,14 @@ void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
 
     if ( keycode == WXK_TAB )
     {
 
     if ( keycode == WXK_TAB )
     {

+#if defined(__WXGTK__)

         wxWindow* mainControl;
 
         if ( HasInternalFlag(wxPG_FL_IN_MANAGER) )
             mainControl = GetParent();
         else
             mainControl = this;
         wxWindow* mainControl;
 
         if ( HasInternalFlag(wxPG_FL_IN_MANAGER) )
             mainControl = GetParent();
         else
             mainControl = this;

+#endif

 
         if ( !event.ShiftDown() )
         {
 
         if ( !event.ShiftDown() )
         {


@@ -6232,6 +6205,7 @@ void wxPropertyGridEvent::Init()
     m_column = 1;
     m_canVeto = false;
     m_wasVetoed = false;
     m_column = 1;
     m_canVeto = false;
     m_wasVetoed = false;

+    m_pg = NULL;

 }
 
 // -----------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------


@@ -6369,7 +6343,7 @@ wxPGProperty* wxPropertyGridPopulator::Add( const wxString& propClass,
         return NULL;
     }
 
         return NULL;
     }
 

-    if ( !classInfo || !classInfo->IsKindOf(CLASSINFO(wxPGProperty)) )
+    if ( !classInfo || !classInfo->IsKindOf(wxCLASSINFO(wxPGProperty)) )

     {
         ProcessError(wxString::Format(wxT("'%s' is not valid property class"),propClass.c_str()));
         return NULL;
     {
         ProcessError(wxString::Format(wxT("'%s' is not valid property class"),propClass.c_str()));
         return NULL;