Use wxCONTROL_PRESSED instead of wxCONTROL_SELECTED in wxOSX renderer code.

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

diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index 6a1f9fe6e16241f62fb33d37b89b11099271fded..788af596d357ba10a09435e01ff49df440a596f3 100644 (file)
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -346,7 +346,7 @@ private:
 
     virtual bool ProcessEvent( wxEvent& event )
     {
 
     virtual bool ProcessEvent( wxEvent& event )
     {

-        if ( event.IsKindOf(CLASSINFO(wxHeaderCtrlEvent)) )
+        if ( event.IsKindOf(wxCLASSINFO(wxHeaderCtrlEvent)) )

         {
             wxHeaderCtrlEvent& hcEvent =
                 static_cast<wxHeaderCtrlEvent&>(event);
         {
             wxHeaderCtrlEvent& hcEvent =
                 static_cast<wxHeaderCtrlEvent&>(event);


@@ -745,12 +745,14 @@ bool wxPropertyGridManager::DoSelectPage( int index )
             return false;
     }
 
             return false;
     }
 

+#if wxUSE_TOOLBAR

     wxPropertyGridPage* prevPage;
 
     if ( m_selPage >= 0 )
         prevPage = GetPage(m_selPage);
     else
         prevPage = m_emptyPage;
     wxPropertyGridPage* prevPage;
 
     if ( m_selPage >= 0 )
         prevPage = GetPage(m_selPage);
     else
         prevPage = m_emptyPage;

+#endif

 
     wxPropertyGridPage* nextPage;
 
 
     wxPropertyGridPage* nextPage;
 


@@ -1906,6 +1908,11 @@ void wxPropertyGridManager::OnResize( wxSizeEvent& WXUNUSED(event) )
             }
         }
     }
             }
         }
     }

+
+#if wxUSE_HEADERCTRL
+    if ( m_showHeader )
+        m_pHeaderCtrl->OnColumWidthsChanged();
+#endif

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


@@ -2003,7 +2010,7 @@ void wxPropertyGridManager::OnMouseClick( wxMouseEvent &event )
 
 void wxPropertyGridManager::OnMouseUp( wxMouseEvent &event )
 {
 
 void wxPropertyGridManager::OnMouseUp( wxMouseEvent &event )
 {

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

     // just stop dragging.
 
     if ( m_dragStatus >= 1 )
     // just stop dragging.
 
     if ( m_dragStatus >= 1 )