]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/treectrl.cpp
Applied patch [ 1428990 ] wxUniv: patch for toolbar button remain in pressed status
[wxWidgets.git] / src / os2 / treectrl.cpp
index 8ea6c25d3dee2c658f1411be0ddafe7160be8f90..d54a567d251461aa9700c6a894814b931666f8ba 100644 (file)
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "treectrl.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -160,16 +156,16 @@ public:
 
     //
     // 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                bRecursively = TRUE
+                    ,bool                bRecursively = true
                    );
 
     //
     // 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;
 
@@ -208,16 +204,16 @@ public:
         //
         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);
         }
-        return TRUE;
+        return true;
     }
 
     size_t GetCount(void) const { return m_aSelections.GetCount(); }
@@ -245,7 +241,7 @@ public:
     virtual bool OnVisit(const wxTreeItemId& WXUNUSED(rItem))
     {
         m_nCount++;
-        return TRUE;
+        return true;
     }
 
     size_t GetCount(void) const { return m_nCount; }
@@ -306,7 +302,7 @@ bool wxTreeTraversal::DoTraverse (
 )
 {
     if (!OnVisit(rRoot))
-        return FALSE;
+        return false;
 
     return Traverse( rRoot
                     ,bRecursively
@@ -327,15 +323,15 @@ bool wxTreeTraversal::Traverse (
         //
         // Depth first traversal
         //
-        if (bRecursively && !Traverse(vChild, TRUE))
-            return FALSE;
+        if (bRecursively && !Traverse(vChild, true))
+            return false;
         if (!OnVisit(vChild))
-            return FALSE;
+            return false;
         vChild = m_pTree->GetNextChild( rRoot
                                        ,lCookie
                                       );
     }
-    return TRUE;
+    return true;
 } // end of wxTreeTraversal::Traverse
 
 // ----------------------------------------------------------------------------
@@ -346,9 +342,9 @@ void wxTreeCtrl::Init ()
 {
     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;
 
     //
@@ -382,7 +378,7 @@ bool wxTreeCtrl::Create (
                        ,rValidator
                        ,rsName
                       ))
-        return FALSE;
+        return false;
 
     DWORD                           dwStyle = WS_VISIBLE | WS_TABSTOP;
 
@@ -393,7 +389,7 @@ bool wxTreeCtrl::Create (
     if (!OS2CreateControl( "CONTAINER"
                           ,dwStyle
                          ))
-        return FALSE;
+        return false;
 
     //
     // Now set the display attributes to show a TREE/ICON view of the
@@ -426,7 +422,7 @@ bool wxTreeCtrl::Create (
             ,rSize.x
             ,rSize.y
            );
-    return TRUE;
+    return true;
 } // end of wxTreeCtrl::Create
 
 wxTreeCtrl::~wxTreeCtrl ()
@@ -440,7 +436,7 @@ wxTreeCtrl::~wxTreeCtrl ()
         {
             delete (wxTreeItemAttr *)pNode->Data();
         }
-        m_bHasAnyAttr = FALSE;
+        m_bHasAnyAttr = false;
     }
     DeleteTextCtrl();
 
@@ -474,9 +470,9 @@ bool wxTreeCtrl::DoGetItem (
     if (!pRecord)
     {
         wxLogLastError(wxT("Item not obtained"));
-        return FALSE;
+        return false;
     }
-    return TRUE;
+    return true;
 } // end of wxTreeCtrl::DoGetItem
 
 void wxTreeCtrl::DoSetItem (
@@ -544,6 +540,30 @@ wxImageList* wxTreeCtrl::GetImageList () const
     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;
@@ -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
-// compatability only
+// compatibility only
 //
 void wxTreeCtrl::SetAnyImageList (
   wxImageList*                      WXUNUSED(pImageList)
@@ -568,7 +588,7 @@ void wxTreeCtrl::SetImageList (
 {
     if (m_bOwnsImageListNormal)
         delete m_pImageListNormal;
-    m_bOwnsImageListNormal = FALSE;
+    m_bOwnsImageListNormal = false;
 } // end of wxTreeCtrl::SetImageList
 
 void wxTreeCtrl::SetStateImageList (
@@ -577,21 +597,21 @@ void wxTreeCtrl::SetStateImageList (
 {
     if (m_bOwnsImageListState)
         delete m_pImageListState;
-    m_bOwnsImageListState = FALSE;
+    m_bOwnsImageListState = false;
 } // 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)
 )
 {
-    m_bOwnsImageListState = TRUE;
+    m_bOwnsImageListState = true;
 } // end of wxTreeCtrl::AssignStateImageList
 
 size_t wxTreeCtrl::GetChildrenCount (
@@ -617,13 +637,13 @@ bool wxTreeCtrl::SetBackgroundColour (
     ULONG                           ulColor = wxColourToRGB(rColour);
 
     if ( !wxWindowBase::SetBackgroundColour(rColour) )
-        return FALSE;
+        return false;
     ::WinSetPresParam( GetHWND()
                       ,PP_BACKGROUNDCOLOR
                       ,sizeof(ULONG)
                       ,&ulColor
                      );
-    return TRUE;
+    return true;
 } // end of wxTreeCtrl::SetBackgroundColour
 
 bool wxTreeCtrl::SetForegroundColour (
@@ -633,13 +653,13 @@ bool wxTreeCtrl::SetForegroundColour (
     ULONG                           ulColor = wxColourToRGB(rColour);
 
     if (!wxWindowBase::SetForegroundColour(rColour))
-        return FALSE;
+        return false;
     ::WinSetPresParam( GetHWND()
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(ULONG)
                       ,&ulColor
                      );
-    return TRUE;
+    return true;
 } // end of wxTreeCtrl::SetForegroundColour
 
 // ----------------------------------------------------------------------------
@@ -881,7 +901,7 @@ bool wxTreeCtrl::HasIndirectData (
   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.
@@ -974,7 +994,7 @@ void wxTreeCtrl::SetItemTextColour (
 , const wxColour&                   rCol
 )
 {
-    m_bHasAnyAttr = TRUE;
+    m_bHasAnyAttr = true;
 
     long                            lId = (long)rItem.m_pItem;
     wxTreeItemAttr*                 pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);
@@ -993,7 +1013,7 @@ void wxTreeCtrl::SetItemBackgroundColour (
 , const wxColour&                   rCol
 )
 {
-    m_bHasAnyAttr = TRUE;
+    m_bHasAnyAttr = true;
 
     long                            lId = (long)rItem.m_pItem;
     wxTreeItemAttr*                 pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);
@@ -1012,7 +1032,7 @@ void wxTreeCtrl::SetItemFont (
 , const wxFont&                     rFont
 )
 {
-    m_bHasAnyAttr = TRUE;
+    m_bHasAnyAttr = true;
 
     long                            lId = (long)rItem.m_pItem;
     wxTreeItemAttr*                 pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);
@@ -1110,7 +1130,7 @@ bool wxTreeCtrl::IsBold (
   const wxTreeItemId&               rItem
 ) const
 {
-    return FALSE;
+    return false;
 } // end of wxTreeCtrl::IsBold
 
 // ----------------------------------------------------------------------------
@@ -1478,6 +1498,8 @@ wxTreeItemId wxTreeCtrl::DoInsertItem (
     return wxTreeItemId((long)pRecord->m_ulItemId);
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
 // for compatibility only
 wxTreeItemId wxTreeCtrl::InsertItem (
   const wxTreeItemId&               rParent
@@ -1496,6 +1518,8 @@ wxTreeItemId wxTreeCtrl::InsertItem (
                        );
 } // end of wxTreeCtrl::InsertItem
 
+#endif // WXWIN_COMPATIBILITY_2_4
+
 wxTreeItemId wxTreeCtrl::AddRoot (
   const wxString&                   rsText
 , int                               nImage
@@ -1736,6 +1760,8 @@ void wxTreeCtrl::Toggle (
             );
 } // end of wxTreeCtrl::Toggle
 
+#if WXWIN_COMPATIBILITY_2_4
+
 void wxTreeCtrl::ExpandItem (
   const wxTreeItemId&               rItem
 , int                               nAction
@@ -1746,6 +1772,8 @@ void wxTreeCtrl::ExpandItem (
             );
 } // end of wxTreeCtrl::ExpandItem
 
+#endif // WXWIN_COMPATIBILITY_2_4
+
 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]
-                         ,FALSE
+                         ,false
                         );
         }
     }
@@ -1923,12 +1951,12 @@ bool wxTreeCtrl::GetBoundingRect (
                       ,MPFROMP(&vRectRecord)
                       ,MPFROMP(&vQuery)
                      ))
-        return FALSE;
+        return false;
     rRect.SetLeft(vRectRecord.xLeft);
     rRect.SetTop(vRectRecord.yTop);
     rRect.SetRight(vRectRecord.xRight);
     rRect.SetBottom(vRectRecord.yBottom);
-    return TRUE;
+    return true;
 } // end of wxTreeCtrl::GetBoundingRect
 
 // ----------------------------------------------------------------------------
@@ -1989,7 +2017,7 @@ bool wxTreeCtrl::OS2Command (
 
         vEvent.SetEventObject( this );
         ProcessCommand(vEvent);
-        return TRUE;
+        return true;
     }
     else if (uCmd == CN_KILLFOCUS)
     {
@@ -1998,10 +2026,10 @@ bool wxTreeCtrl::OS2Command (
                                           );
         vEvent.SetEventObject( this );
         ProcessCommand(vEvent);
-        return TRUE;
+        return true;
     }
     else
-        return FALSE;
+        return false;
 } // end of wxTreeCtrl::OS2Command
 
 //
@@ -2013,7 +2041,7 @@ MRESULT wxTreeCtrl::OS2WindowProc (
 , WXLPARAM                          lParam
 )
 {
-    bool                            bProcessed = FALSE;
+    bool                            bProcessed = false;
     MRESULT                         mRc = 0;
     wxTreeEvent                     vEvent( wxEVT_NULL
                                            ,m_windowId
@@ -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;
-                        vEvent.m_editCancelled = FALSE;
+                        vEvent.m_editCancelled = false;
                     }
                     break;
 
@@ -2066,11 +2094,11 @@ MRESULT wxTreeCtrl::OS2WindowProc (
                         vEvent.m_label = pRecord->m_vRecord.pszTree;
                         if (pRecord->m_vRecord.pszTree == NULL)
                         {
-                            vEvent.m_editCancelled = TRUE;
+                            vEvent.m_editCancelled = true;
                         }
                         else
                         {
-                            vEvent.m_editCancelled = FALSE;
+                            vEvent.m_editCancelled = false;
                         }
                     }
                     break;