wxControl::SetLabel no longer strips out codes so do it here

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

diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp
index ba09050661d432fff21dbb9305d3c6e656cf1cfc..d54a567d251461aa9700c6a894814b931666f8ba 100644 (file)
--- a/src/os2/treectrl.cpp
+++ b/src/os2/treectrl.cpp
@@ -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"
 


@@ -210,7 +206,7 @@ public:
         {
             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)
                                                                     ,rItem.m_pItem
                                                                    );
         if (pRecord->m_vRecord.flRecordAttr & CRA_SELECTED)


@@ -346,9 +342,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;
 
     //


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

-        m_bHasAnyAttr = FALSE;
+        m_bHasAnyAttr = false;

     }
     DeleteTextCtrl();
 
     }
     DeleteTextCtrl();
 


@@ -544,6 +540,30 @@ wxImageList* wxTreeCtrl::GetImageList () const
     return m_pImageListNormal;
 } // end of wxTreeCtrl::GetImageList
 
     return m_pImageListNormal;
 } // end of wxTreeCtrl::GetImageList
 

+#if WXWIN_COMPATIBILITY_2_4
+
+wxImageList* wxTreeCtrl::GetImageList(int nVal) const
+{
+    return GetImageList();
+}
+
+void wxTreeCtrl::SetImageList(wxImageList* pImageList, int nVal)
+{
+    SetImageList(pImageList);
+}
+
+int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& rItem) const
+{
+    return GetItemImage(rItem, wxTreeItemIcon_Selected);
+}
+
+void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& rItem, int nImage)
+{
+    SetItemImage(rItem, nImage, wxTreeItemIcon_Selected);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+

 wxImageList* wxTreeCtrl::GetStateImageList () const
 {
     return m_pImageListNormal;
 wxImageList* wxTreeCtrl::GetStateImageList () const
 {
     return m_pImageListNormal;


@@ -553,7 +573,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 +588,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 +597,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 (


@@ -974,7 +994,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 +1013,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 +1032,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);


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

+#if WXWIN_COMPATIBILITY_2_4
+

 // for compatibility only
 wxTreeItemId wxTreeCtrl::InsertItem (
   const wxTreeItemId&               rParent
 // for compatibility only
 wxTreeItemId wxTreeCtrl::InsertItem (
   const wxTreeItemId&               rParent


@@ -1496,6 +1518,8 @@ wxTreeItemId wxTreeCtrl::InsertItem (
                        );
 } // end of wxTreeCtrl::InsertItem
 
                        );
 } // end of wxTreeCtrl::InsertItem
 

+#endif // WXWIN_COMPATIBILITY_2_4
+

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


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

+#if WXWIN_COMPATIBILITY_2_4
+

 void wxTreeCtrl::ExpandItem (
   const wxTreeItemId&               rItem
 , int                               nAction
 void wxTreeCtrl::ExpandItem (
   const wxTreeItemId&               rItem
 , int                               nAction


@@ -1746,6 +1772,8 @@ void wxTreeCtrl::ExpandItem (
             );
 } // end of wxTreeCtrl::ExpandItem
 
             );
 } // end of wxTreeCtrl::ExpandItem
 

+#endif // WXWIN_COMPATIBILITY_2_4
+

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


@@ -1767,7 +1795,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

                         );
         }
     }
                         );
         }
     }


@@ -2051,7 +2079,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 +2094,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;


@@ -2096,13 +2124,4 @@ MRESULT wxTreeCtrl::OS2WindowProc (
     return mRc;
 } // end of wxTreeCtrl::OS2WindowProc
 
     return mRc;
 } // end of wxTreeCtrl::OS2WindowProc
 

-#if WXWIN_COMPATIBILITY_2_2
-
-wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
-{
-    return GetItemParent( item );
-}
-
-#endif  // WXWIN_COMPATIBILITY_2_2
-

 #endif // wxUSE_TREECTRL
 #endif // wxUSE_TREECTRL