compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 34592bd208148151b640f10ff8028244a828e5e3..492bc1b7d47d8f11ccec8c01e3d1a108b5000b3d 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -28,7 +28,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/generic/treectrl.h"
+#include "wx/treectrl.h"

 #include "wx/generic/imaglist.h"
 #include "wx/settings.h"
 #include "wx/log.h"
 #include "wx/generic/imaglist.h"
 #include "wx/settings.h"
 #include "wx/log.h"


@@ -162,8 +162,6 @@ private:
 // wxTreeEvent
 // -----------------------------------------------------------------------------
 
 // wxTreeEvent
 // -----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
-

 wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
            : wxNotifyEvent( commandType, id )
 {
 wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
            : wxNotifyEvent( commandType, id )
 {


@@ -1036,7 +1034,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
     event.SetEventObject( this );
     // TODO : Here we don't send any selection mode yet !
 
     event.SetEventObject( this );
     // TODO : Here we don't send any selection mode yet !
 

-    if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() )
+    if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )

       return;
 
     // ctrl press
       return;
 
     // ctrl press


@@ -1278,7 +1276,7 @@ void wxTreeCtrl::AdjustMyScrollbars()
 
 int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
 {
 
 int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
 {

-  if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HIGHT)
+  if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT)

     return item->GetHeight();
   else
     return m_lineHeight;
     return item->GetHeight();
   else
     return m_lineHeight;