atsu for textctrl

[wxWidgets.git] / src / os2 / treectrl.cpp

diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp
index 8ea6c25d3dee2c658f1411be0ddafe7160be8f90..6ccf144ddb437a93eac0d620e09075cf05081ece 100644 (file)
--- a/src/os2/treectrl.cpp
+++ b/src/os2/treectrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/msw/treectrl.cpp
+// Name:        src/os2/treectrl.cpp

 // Purpose:     wxTreeCtrl
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
 // Purpose:     wxTreeCtrl
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "treectrl.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,14 +26,18 @@
 
 #if wxUSE_TREECTRL
 
 
 #if wxUSE_TREECTRL
 

+#include "wx/treectrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/settings.h"
+#endif
+

 #include "wx/os2/private.h"
 
 #include "wx/os2/private.h"
 

-#include "wx/app.h"
-#include "wx/log.h"
-#include "wx/dynarray.h"

 #include "wx/imaglist.h"
 #include "wx/imaglist.h"

-#include "wx/settings.h"
-#include "wx/os2/treectrl.h"

 
 // a macro to hide the ugliness of nested casts
 #define HITEM(item)     (HTREEITEM)(WXHTREEITEM)(item)
 
 // a macro to hide the ugliness of nested casts
 #define HITEM(item)     (HTREEITEM)(WXHTREEITEM)(item)


@@ -160,16 +160,16 @@ public:
 
     //
     // Do traverse the tree: visit all items (recursively by default) under the
 
     //
     // Do traverse the tree: visit all items (recursively by default) under the

-    // given one; return TRUE if all items were traversed or FALSE if the
-    // traversal was aborted because OnVisit returned FALSE
+    // given one; return true if all items were traversed or false if the
+    // traversal was aborted because OnVisit returned false

     //
     bool DoTraverse( const wxTreeItemId& rRoot
     //
     bool DoTraverse( const wxTreeItemId& rRoot

-                    ,bool                bRecursively = TRUE
+                    ,bool                bRecursively = true

                    );
 
     //
     // Override this function to do whatever is needed for each item, return
                    );
 
     //
     // Override this function to do whatever is needed for each item, return

-    // FALSE to stop traversing
+    // false to stop traversing

     //
     virtual bool OnVisit(const wxTreeItemId& rItem) = 0;
 
     //
     virtual bool OnVisit(const wxTreeItemId& rItem) = 0;
 


@@ -208,16 +208,16 @@ public:
         //
         if ((GetTree()->GetRootItem() == rItem) && (GetTree()->GetWindowStyle() & wxTR_HIDE_ROOT))
         {
         //
         if ((GetTree()->GetRootItem() == rItem) && (GetTree()->GetWindowStyle() & wxTR_HIDE_ROOT))
         {

-            return TRUE;
+            return true;

         }
         }

-        PMYRECORD                   pRecord = FindOS2TreeRecordByID( GetTree()->GetHWND()
+        PMYRECORD                   pRecord = FindOS2TreeRecordByID( (HWND)GetTree()->GetHWND()

                                                                     ,rItem.m_pItem
                                                                    );
         if (pRecord->m_vRecord.flRecordAttr & CRA_SELECTED)
         {
             m_aSelections.Add(rItem);
         }
                                                                     ,rItem.m_pItem
                                                                    );
         if (pRecord->m_vRecord.flRecordAttr & CRA_SELECTED)
         {
             m_aSelections.Add(rItem);
         }

-        return TRUE;
+        return true;

     }
 
     size_t GetCount(void) const { return m_aSelections.GetCount(); }
     }
 
     size_t GetCount(void) const { return m_aSelections.GetCount(); }


@@ -245,7 +245,7 @@ public:
     virtual bool OnVisit(const wxTreeItemId& WXUNUSED(rItem))
     {
         m_nCount++;
     virtual bool OnVisit(const wxTreeItemId& WXUNUSED(rItem))
     {
         m_nCount++;

-        return TRUE;
+        return true;

     }
 
     size_t GetCount(void) const { return m_nCount; }
     }
 
     size_t GetCount(void) const { return m_nCount; }


@@ -306,7 +306,7 @@ bool wxTreeTraversal::DoTraverse (
 )
 {
     if (!OnVisit(rRoot))
 )
 {
     if (!OnVisit(rRoot))

-        return FALSE;
+        return false;

 
     return Traverse( rRoot
                     ,bRecursively
 
     return Traverse( rRoot
                     ,bRecursively


@@ -327,15 +327,15 @@ bool wxTreeTraversal::Traverse (
         //
         // Depth first traversal
         //
         //
         // Depth first traversal
         //

-        if (bRecursively && !Traverse(vChild, TRUE))
-            return FALSE;
+        if (bRecursively && !Traverse(vChild, true))
+            return false;

         if (!OnVisit(vChild))
         if (!OnVisit(vChild))

-            return FALSE;
+            return false;

         vChild = m_pTree->GetNextChild( rRoot
                                        ,lCookie
                                       );
     }
         vChild = m_pTree->GetNextChild( rRoot
                                        ,lCookie
                                       );
     }

-    return TRUE;
+    return true;

 } // end of wxTreeTraversal::Traverse
 
 // ----------------------------------------------------------------------------
 } // end of wxTreeTraversal::Traverse
 
 // ----------------------------------------------------------------------------


@@ -346,9 +346,9 @@ void wxTreeCtrl::Init ()
 {
     m_pImageListNormal     = NULL;
     m_pImageListState      = NULL;
 {
     m_pImageListNormal     = NULL;
     m_pImageListState      = NULL;

-    m_bOwnsImageListNormal = FALSE;
-    m_bOwnsImageListState  = FALSE;
-    m_bHasAnyAttr          = FALSE;
+    m_bOwnsImageListNormal = false;
+    m_bOwnsImageListState  = false;
+    m_bHasAnyAttr          = false;

     m_pDragImage           = NULL;
 
     //
     m_pDragImage           = NULL;
 
     //


@@ -382,7 +382,7 @@ bool wxTreeCtrl::Create (
                        ,rValidator
                        ,rsName
                       ))
                        ,rValidator
                        ,rsName
                       ))

-        return FALSE;
+        return false;

 
     DWORD                           dwStyle = WS_VISIBLE | WS_TABSTOP;
 
 
     DWORD                           dwStyle = WS_VISIBLE | WS_TABSTOP;
 


@@ -393,7 +393,7 @@ bool wxTreeCtrl::Create (
     if (!OS2CreateControl( "CONTAINER"
                           ,dwStyle
                          ))
     if (!OS2CreateControl( "CONTAINER"
                           ,dwStyle
                          ))

-        return FALSE;
+        return false;

 
     //
     // Now set the display attributes to show a TREE/ICON view of the
 
     //
     // Now set the display attributes to show a TREE/ICON view of the


@@ -426,7 +426,7 @@ bool wxTreeCtrl::Create (
             ,rSize.x
             ,rSize.y
            );
             ,rSize.x
             ,rSize.y
            );

-    return TRUE;
+    return true;

 } // end of wxTreeCtrl::Create
 
 wxTreeCtrl::~wxTreeCtrl ()
 } // end of wxTreeCtrl::Create
 
 wxTreeCtrl::~wxTreeCtrl ()


@@ -440,7 +440,7 @@ wxTreeCtrl::~wxTreeCtrl ()
         {
             delete (wxTreeItemAttr *)pNode->Data();
         }
         {
             delete (wxTreeItemAttr *)pNode->Data();
         }

-        m_bHasAnyAttr = FALSE;
+        m_bHasAnyAttr = false;

     }
     DeleteTextCtrl();
 
     }
     DeleteTextCtrl();
 


@@ -474,9 +474,9 @@ bool wxTreeCtrl::DoGetItem (
     if (!pRecord)
     {
         wxLogLastError(wxT("Item not obtained"));
     if (!pRecord)
     {
         wxLogLastError(wxT("Item not obtained"));

-        return FALSE;
+        return false;

     }
     }

-    return TRUE;
+    return true;

 } // end of wxTreeCtrl::DoGetItem
 
 void wxTreeCtrl::DoSetItem (
 } // end of wxTreeCtrl::DoGetItem
 
 void wxTreeCtrl::DoSetItem (


@@ -496,16 +496,17 @@ void wxTreeCtrl::DoSetItem (
     }
 } // end of wxTreeCtrl::DoSetItem
 
     }
 } // end of wxTreeCtrl::DoSetItem
 

-size_t wxTreeCtrl::GetCount () const
+unsigned int wxTreeCtrl::GetCount () const

 {
 {

-    CNRINFO                         vCnrInfo;
+    CNRINFO  vCnrInfo;

 
     ::WinSendMsg( GetHWND()
                  ,CM_QUERYCNRINFO
                  ,MPFROMP(&vCnrInfo)
                  ,(MPARAM)(USHORT)sizeof(CNRINFO)
                 );
 
     ::WinSendMsg( GetHWND()
                  ,CM_QUERYCNRINFO
                  ,MPFROMP(&vCnrInfo)
                  ,(MPARAM)(USHORT)sizeof(CNRINFO)
                 );

-    return (size_t)vCnrInfo.cRecords;
+
+    return (unsigned int)vCnrInfo.cRecords;

 } // end of wxTreeCtrl::GetCount
 
 unsigned int wxTreeCtrl::GetIndent () const
 } // end of wxTreeCtrl::GetCount
 
 unsigned int wxTreeCtrl::GetIndent () const


@@ -553,7 +554,7 @@ wxImageList* wxTreeCtrl::GetStateImageList () const
 // The SETS of imagelists really do nothing under OS2 as a RECORDCORE
 // struct has the icon imbedded in it that it uses for the icon being
 // displayed via the TREEITEMDESC member.  Provided for interface
 // The SETS of imagelists really do nothing under OS2 as a RECORDCORE
 // struct has the icon imbedded in it that it uses for the icon being
 // displayed via the TREEITEMDESC member.  Provided for interface

-// compatability only
+// compatibility only

 //
 void wxTreeCtrl::SetAnyImageList (
   wxImageList*                      WXUNUSED(pImageList)
 //
 void wxTreeCtrl::SetAnyImageList (
   wxImageList*                      WXUNUSED(pImageList)


@@ -568,7 +569,7 @@ void wxTreeCtrl::SetImageList (
 {
     if (m_bOwnsImageListNormal)
         delete m_pImageListNormal;
 {
     if (m_bOwnsImageListNormal)
         delete m_pImageListNormal;

-    m_bOwnsImageListNormal = FALSE;
+    m_bOwnsImageListNormal = false;

 } // end of wxTreeCtrl::SetImageList
 
 void wxTreeCtrl::SetStateImageList (
 } // end of wxTreeCtrl::SetImageList
 
 void wxTreeCtrl::SetStateImageList (


@@ -577,21 +578,21 @@ void wxTreeCtrl::SetStateImageList (
 {
     if (m_bOwnsImageListState)
         delete m_pImageListState;
 {
     if (m_bOwnsImageListState)
         delete m_pImageListState;

-    m_bOwnsImageListState = FALSE;
+    m_bOwnsImageListState = false;

 } // end of wxTreeCtrl::SetStateImageList
 
 void wxTreeCtrl::AssignImageList (
   wxImageList*                      WXUNUSED(pImageList)
 )
 {
 } // end of wxTreeCtrl::SetStateImageList
 
 void wxTreeCtrl::AssignImageList (
   wxImageList*                      WXUNUSED(pImageList)
 )
 {

-    m_bOwnsImageListNormal = TRUE;
+    m_bOwnsImageListNormal = true;

 } // end of wxTreeCtrl::AssignImageList
 
 void wxTreeCtrl::AssignStateImageList (
   wxImageList*                      WXUNUSED(pImageList)
 )
 {
 } // end of wxTreeCtrl::AssignImageList
 
 void wxTreeCtrl::AssignStateImageList (
   wxImageList*                      WXUNUSED(pImageList)
 )
 {

-    m_bOwnsImageListState = TRUE;
+    m_bOwnsImageListState = true;

 } // end of wxTreeCtrl::AssignStateImageList
 
 size_t wxTreeCtrl::GetChildrenCount (
 } // end of wxTreeCtrl::AssignStateImageList
 
 size_t wxTreeCtrl::GetChildrenCount (


@@ -617,13 +618,13 @@ bool wxTreeCtrl::SetBackgroundColour (
     ULONG                           ulColor = wxColourToRGB(rColour);
 
     if ( !wxWindowBase::SetBackgroundColour(rColour) )
     ULONG                           ulColor = wxColourToRGB(rColour);
 
     if ( !wxWindowBase::SetBackgroundColour(rColour) )

-        return FALSE;
+        return false;

     ::WinSetPresParam( GetHWND()
                       ,PP_BACKGROUNDCOLOR
                       ,sizeof(ULONG)
                       ,&ulColor
                      );
     ::WinSetPresParam( GetHWND()
                       ,PP_BACKGROUNDCOLOR
                       ,sizeof(ULONG)
                       ,&ulColor
                      );

-    return TRUE;
+    return true;

 } // end of wxTreeCtrl::SetBackgroundColour
 
 bool wxTreeCtrl::SetForegroundColour (
 } // end of wxTreeCtrl::SetBackgroundColour
 
 bool wxTreeCtrl::SetForegroundColour (


@@ -633,13 +634,13 @@ bool wxTreeCtrl::SetForegroundColour (
     ULONG                           ulColor = wxColourToRGB(rColour);
 
     if (!wxWindowBase::SetForegroundColour(rColour))
     ULONG                           ulColor = wxColourToRGB(rColour);
 
     if (!wxWindowBase::SetForegroundColour(rColour))

-        return FALSE;
+        return false;

     ::WinSetPresParam( GetHWND()
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(ULONG)
                       ,&ulColor
                      );
     ::WinSetPresParam( GetHWND()
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(ULONG)
                       ,&ulColor
                      );

-    return TRUE;
+    return true;

 } // end of wxTreeCtrl::SetForegroundColour
 
 // ----------------------------------------------------------------------------
 } // end of wxTreeCtrl::SetForegroundColour
 
 // ----------------------------------------------------------------------------


@@ -881,7 +882,7 @@ bool wxTreeCtrl::HasIndirectData (
   const wxTreeItemId&               WXUNUSED(rItem)
 ) const
 {
   const wxTreeItemId&               WXUNUSED(rItem)
 ) const
 {

-    return FALSE;
+    return false;

 } // end of wxTreeCtrl::HasIndirectData
 
 // Irreleveant under OS/2 --- item either has child records or it doesn't.
 } // end of wxTreeCtrl::HasIndirectData
 
 // Irreleveant under OS/2 --- item either has child records or it doesn't.


@@ -974,7 +975,7 @@ void wxTreeCtrl::SetItemTextColour (
 , const wxColour&                   rCol
 )
 {
 , const wxColour&                   rCol
 )
 {

-    m_bHasAnyAttr = TRUE;
+    m_bHasAnyAttr = true;

 
     long                            lId = (long)rItem.m_pItem;
     wxTreeItemAttr*                 pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);
 
     long                            lId = (long)rItem.m_pItem;
     wxTreeItemAttr*                 pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);


@@ -993,7 +994,7 @@ void wxTreeCtrl::SetItemBackgroundColour (
 , const wxColour&                   rCol
 )
 {
 , const wxColour&                   rCol
 )
 {

-    m_bHasAnyAttr = TRUE;
+    m_bHasAnyAttr = true;

 
     long                            lId = (long)rItem.m_pItem;
     wxTreeItemAttr*                 pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);
 
     long                            lId = (long)rItem.m_pItem;
     wxTreeItemAttr*                 pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);


@@ -1012,7 +1013,7 @@ void wxTreeCtrl::SetItemFont (
 , const wxFont&                     rFont
 )
 {
 , const wxFont&                     rFont
 )
 {

-    m_bHasAnyAttr = TRUE;
+    m_bHasAnyAttr = true;

 
     long                            lId = (long)rItem.m_pItem;
     wxTreeItemAttr*                 pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);
 
     long                            lId = (long)rItem.m_pItem;
     wxTreeItemAttr*                 pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);


@@ -1068,7 +1069,7 @@ bool wxTreeCtrl::IsVisible (
     vWxRectContainer.SetTop(vRectContainer.yTop);
     vWxRectContainer.SetRight(vRectContainer.xRight);
     vWxRectContainer.SetBottom(vRectContainer.yBottom);
     vWxRectContainer.SetTop(vRectContainer.yTop);
     vWxRectContainer.SetRight(vRectContainer.xRight);
     vWxRectContainer.SetBottom(vRectContainer.yBottom);

-    return (vWxRectContainer.Inside(wxPoint(vWxRectRecord.x, vWxRectRecord.y)));
+    return (vWxRectContainer.Contains(wxPoint(vWxRectRecord.x, vWxRectRecord.y)));

 } // end of wxTreeCtrl::IsVisible
 
 bool wxTreeCtrl::ItemHasChildren (
 } // end of wxTreeCtrl::IsVisible
 
 bool wxTreeCtrl::ItemHasChildren (


@@ -1110,7 +1111,7 @@ bool wxTreeCtrl::IsBold (
   const wxTreeItemId&               rItem
 ) const
 {
   const wxTreeItemId&               rItem
 ) const
 {

-    return FALSE;
+    return false;

 } // end of wxTreeCtrl::IsBold
 
 // ----------------------------------------------------------------------------
 } // end of wxTreeCtrl::IsBold
 
 // ----------------------------------------------------------------------------


@@ -1478,24 +1479,6 @@ wxTreeItemId wxTreeCtrl::DoInsertItem (
     return wxTreeItemId((long)pRecord->m_ulItemId);
 }
 
     return wxTreeItemId((long)pRecord->m_ulItemId);
 }
 

-// for compatibility only
-wxTreeItemId wxTreeCtrl::InsertItem (
-  const wxTreeItemId&               rParent
-, const wxString&                   rsText
-, int                               nImage
-, int                               nSelImage
-, long                              lInsertAfter
-)
-{
-    return DoInsertItem( rParent
-                        ,wxTreeItemId(lInsertAfter)
-                        ,rsText
-                        ,nImage
-                        ,nSelImage
-                        ,NULL
-                       );
-} // end of wxTreeCtrl::InsertItem
-

 wxTreeItemId wxTreeCtrl::AddRoot (
   const wxString&                   rsText
 , int                               nImage
 wxTreeItemId wxTreeCtrl::AddRoot (
   const wxString&                   rsText
 , int                               nImage


@@ -1608,7 +1591,7 @@ void wxTreeCtrl::Delete (
         delete (wxTreeItemAttr *)m_vAttrs.Delete((long)rItem.m_pItem);
     }
     vEvent.SetEventType(vEventType);
         delete (wxTreeItemAttr *)m_vAttrs.Delete((long)rItem.m_pItem);
     }
     vEvent.SetEventType(vEventType);

-    GetEventHandler()->ProcessEvent(vEvent);
+    HandleWindowEvent(vEvent);

 } // end of wxTreeCtrl::Delete
 
 // delete all children (but don't delete the item itself)
 } // end of wxTreeCtrl::Delete
 
 // delete all children (but don't delete the item itself)


@@ -1736,16 +1719,6 @@ void wxTreeCtrl::Toggle (
             );
 } // end of wxTreeCtrl::Toggle
 
             );
 } // end of wxTreeCtrl::Toggle
 

-void wxTreeCtrl::ExpandItem (
-  const wxTreeItemId&               rItem
-, int                               nAction
-)
-{
-    DoExpand( rItem
-             ,nAction
-            );
-} // end of wxTreeCtrl::ExpandItem
-

 void wxTreeCtrl::Unselect ()
 {
     wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE),
 void wxTreeCtrl::Unselect ()
 {
     wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE),


@@ -1767,7 +1740,7 @@ void wxTreeCtrl::UnselectAll ()
         for (size_t n = 0; n < nCount; n++)
         {
             SetItemCheck( aSelections[n]
         for (size_t n = 0; n < nCount; n++)
         {
             SetItemCheck( aSelections[n]

-                         ,FALSE
+                         ,false

                         );
         }
     }
                         );
         }
     }


@@ -1923,12 +1896,12 @@ bool wxTreeCtrl::GetBoundingRect (
                       ,MPFROMP(&vRectRecord)
                       ,MPFROMP(&vQuery)
                      ))
                       ,MPFROMP(&vRectRecord)
                       ,MPFROMP(&vQuery)
                      ))

-        return FALSE;
+        return false;

     rRect.SetLeft(vRectRecord.xLeft);
     rRect.SetTop(vRectRecord.yTop);
     rRect.SetRight(vRectRecord.xRight);
     rRect.SetBottom(vRectRecord.yBottom);
     rRect.SetLeft(vRectRecord.xLeft);
     rRect.SetTop(vRectRecord.yTop);
     rRect.SetRight(vRectRecord.xRight);
     rRect.SetBottom(vRectRecord.yBottom);

-    return TRUE;
+    return true;

 } // end of wxTreeCtrl::GetBoundingRect
 
 // ----------------------------------------------------------------------------
 } // end of wxTreeCtrl::GetBoundingRect
 
 // ----------------------------------------------------------------------------


@@ -1989,7 +1962,7 @@ bool wxTreeCtrl::OS2Command (
 
         vEvent.SetEventObject( this );
         ProcessCommand(vEvent);
 
         vEvent.SetEventObject( this );
         ProcessCommand(vEvent);

-        return TRUE;
+        return true;

     }
     else if (uCmd == CN_KILLFOCUS)
     {
     }
     else if (uCmd == CN_KILLFOCUS)
     {


@@ -1998,10 +1971,10 @@ bool wxTreeCtrl::OS2Command (
                                           );
         vEvent.SetEventObject( this );
         ProcessCommand(vEvent);
                                           );
         vEvent.SetEventObject( this );
         ProcessCommand(vEvent);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 } // end of wxTreeCtrl::OS2Command
 
 //
 } // end of wxTreeCtrl::OS2Command
 
 //


@@ -2013,7 +1986,7 @@ MRESULT wxTreeCtrl::OS2WindowProc (
 , WXLPARAM                          lParam
 )
 {
 , WXLPARAM                          lParam
 )
 {

-    bool                            bProcessed = FALSE;
+    bool                            bProcessed = false;

     MRESULT                         mRc = 0;
     wxTreeEvent                     vEvent( wxEVT_NULL
                                            ,m_windowId
     MRESULT                         mRc = 0;
     wxTreeEvent                     vEvent( wxEVT_NULL
                                            ,m_windowId


@@ -2051,7 +2024,7 @@ MRESULT wxTreeCtrl::OS2WindowProc (
                         vEventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
                         vEvent.m_item = pRecord->m_ulItemId;
                         vEvent.m_label = pRecord->m_vRecord.pszTree;
                         vEventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
                         vEvent.m_item = pRecord->m_ulItemId;
                         vEvent.m_label = pRecord->m_vRecord.pszTree;

-                        vEvent.m_editCancelled = FALSE;
+                        vEvent.m_editCancelled = false;

                     }
                     break;
 
                     }
                     break;
 


@@ -2066,11 +2039,11 @@ MRESULT wxTreeCtrl::OS2WindowProc (
                         vEvent.m_label = pRecord->m_vRecord.pszTree;
                         if (pRecord->m_vRecord.pszTree == NULL)
                         {
                         vEvent.m_label = pRecord->m_vRecord.pszTree;
                         if (pRecord->m_vRecord.pszTree == NULL)
                         {

-                            vEvent.m_editCancelled = TRUE;
+                            vEvent.m_editCancelled = true;

                         }
                         else
                         {
                         }
                         else
                         {

-                            vEvent.m_editCancelled = FALSE;
+                            vEvent.m_editCancelled = false;

                         }
                     }
                     break;
                         }
                     }
                     break;


@@ -2085,7 +2058,7 @@ MRESULT wxTreeCtrl::OS2WindowProc (
                     break;
             }
             vEvent.SetEventType(vEventType);
                     break;
             }
             vEvent.SetEventType(vEventType);

-            bProcessed = GetEventHandler()->ProcessEvent(vEvent);
+            bProcessed = HandleWindowEvent(vEvent);

             break;
     }
     if (!bProcessed)
             break;
     }
     if (!bProcessed)