Old API deprecated. Source cleaning.

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

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 82dcaa849d7d6de73f55933917293ba92773180d..b4093ccb2550c5339f1192931a9901c2d341c2c3 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -358,10 +358,8 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_4
     // deprecated functions: use Set/GetItemImage directly
 
 #if WXWIN_COMPATIBILITY_2_4
     // deprecated functions: use Set/GetItemImage directly

-    int GetItemSelectedImage(const wxTreeItemId& item) const
-        { return GetItemImage(item, wxTreeItemIcon_Selected); }
-    void SetItemSelectedImage(const wxTreeItemId& item, int image)
-        { SetItemImage(item, image, wxTreeItemIcon_Selected); }
+    wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
+    wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );

 
     // use the versions taking wxTreeItemIdValue cookies (note that
     // GetNextChild() is not inside wxDEPRECATED on purpose, as otherwise we
 
     // use the versions taking wxTreeItemIdValue cookies (note that
     // GetNextChild() is not inside wxDEPRECATED on purpose, as otherwise we


@@ -449,7 +447,7 @@ protected:
     // incremental search data
     wxString             m_findPrefix;
     wxTimer             *m_findTimer;
     // incremental search data
     wxString             m_findPrefix;
     wxTimer             *m_findTimer;

-    
+

     bool                 m_dropEffectAboveItem;
 
     // the common part of all ctors
     bool                 m_dropEffectAboveItem;
 
     // the common part of all ctors

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 95d587a5d04ec3ce6bafb89c0f81f6aaf9e03389..21f4d1b74413c50a7a9abaa72c7363a23f2be70c 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -395,14 +395,12 @@ public:
                             long insertAfter = wxTREE_INSERT_LAST) );
 
         // use Set/GetImageList and Set/GetStateImageList
                             long insertAfter = wxTREE_INSERT_LAST) );
 
         // use Set/GetImageList and Set/GetStateImageList

-    wxImageList *GetImageList(int) const { return GetImageList(); }
-    void SetImageList(wxImageList *imageList, int) { SetImageList(imageList); }
+    wxDEPRECATED( wxImageList *GetImageList(int) const );
+    wxDEPRECATED( void SetImageList(wxImageList *imageList, int) );

 
     // use Set/GetItemImage directly
 
     // use Set/GetItemImage directly

-    int GetItemSelectedImage(const wxTreeItemId& item) const
-        { return GetItemImage(item, wxTreeItemIcon_Selected); }
-    void SetItemSelectedImage(const wxTreeItemId& item, int image)
-        { SetItemImage(item, image, wxTreeItemIcon_Selected); }
+    wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
+    wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );

 
     // use the versions taking wxTreeItemIdValue cookies
     wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item,
 
     // use the versions taking wxTreeItemIdValue cookies
     wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item,

diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h
index d7f7db8bdb2bb66ccc4e8dcd02ce2feb969b6f93..7c5e19b717a7d9d62426c97eae175de1576c669b 100644 (file)
--- a/include/wx/os2/treectrl.h
+++ b/include/wx/os2/treectrl.h
@@ -556,18 +556,15 @@ public:
     //
     // Use Set/GetImageList and Set/GetStateImageList
     //
     //
     // Use Set/GetImageList and Set/GetStateImageList
     //

-    wxImageList* GetImageList(int nVal) const
-        { return GetImageList(); }
-    void SetImageList(wxImageList* pImageList, int nVal)
-        { SetImageList(pImageList); }
+    wxDEPRECATED( wxImageList* GetImageList(int nVal) const );
+    wxDEPRECATED( void SetImageList(wxImageList* pImageList, int nVal) );

 
     //
     // Use Set/GetItemImage directly
     //
 
     //
     // Use Set/GetItemImage directly
     //

-    int GetItemSelectedImage(const wxTreeItemId& rItem) const
-        { return GetItemImage(rItem, wxTreeItemIcon_Selected); }
-    void SetItemSelectedImage(const wxTreeItemId& rItem, int nImage)
-        { SetItemImage(rItem, nImage, wxTreeItemIcon_Selected); }
+    wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& rItem) const );
+    wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& rItem, int nImage) );
+

     //
     // For this enumeration function you must pass in a "cookie" parameter
     // which is opaque for the application but is necessary for the library
     //
     // For this enumeration function you must pass in a "cookie" parameter
     // which is opaque for the application but is necessary for the library

diff --git a/include/wx/url.h b/include/wx/url.h
index 61c22330373753c00b52f89356fb63e3f8d46c8f..18143b786c8f46da7eedf7608e0b09a9954eb40a 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -71,9 +71,9 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_4
     //Use the proper wxURI accessors instead
 
 #if WXWIN_COMPATIBILITY_2_4
     //Use the proper wxURI accessors instead

-    wxString GetProtocolName() const { return m_scheme; }
-    wxString GetHostName() const     { return m_server; }
-    wxString GetPath() const         { return m_path; }
+    wxDEPRECATED( wxString GetProtocolName() const );
+    wxDEPRECATED( wxString GetHostName() const );
+    wxDEPRECATED( wxString GetPath() const );

 
     //Use wxURI instead - this does not work that well
     wxDEPRECATED( static wxString ConvertToValidURI(
 
     //Use wxURI instead - this does not work that well
     wxDEPRECATED( static wxString ConvertToValidURI(

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index 0d137f5bc1681834564f9a7a84edff3a2e60bdda..abc46f49b92603ed0bc862bff722fdbe2dde2b80 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -1237,6 +1237,21 @@ bool wxURI::IsDigit(const wxChar& c)
 
 #include "wx/url.h"
 
 
 #include "wx/url.h"
 

+wxString wxURL::GetProtocolName() const
+{
+    return m_scheme;
+}
+
+wxString wxURL::GetHostName() const
+{
+    return m_server;
+}
+
+wxString wxURL::GetPath() const
+{
+    return m_path;
+}
+

 //Note that this old code really doesn't convert to a URI that well and looks
 //more like a dirty hack than anything else...
 
 //Note that this old code really doesn't convert to a URI that well and looks
 //more like a dirty hack than anything else...
 

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index ed8f47b512e3ee998c23bc6a2a02afafc108c364..432f8f71d33c99f1e4ac58de0e8514fc56b74a05 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -3088,7 +3088,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             // remember the old cursor because we will change it while
             // dragging
             m_oldCursor = m_cursor;
             // remember the old cursor because we will change it while
             // dragging
             m_oldCursor = m_cursor;

-            
+

             // in a single selection control, hide the selection temporarily
             if ( !(GetWindowStyleFlag() & wxTR_MULTIPLE) )
             {
             // in a single selection control, hide the selection temporarily
             if ( !(GetWindowStyleFlag() & wxTR_MULTIPLE) )
             {


@@ -3563,6 +3563,20 @@ wxGenericTreeCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 #endif
 }
 
 #endif
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+
+int wxGenericTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+{
+    return GetItemImage(item, wxTreeItemIcon_Selected);
+}
+
+void wxGenericTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
+{
+    SetItemImage(item, image, wxTreeItemIcon_Selected);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+

 #if WXWIN_COMPATIBILITY_2_2
 
 wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const
 #if WXWIN_COMPATIBILITY_2_2
 
 wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 5ae8799053b8962f0e945a574b0c8092f0774127..2a2bb3b124d954c622a037ff3cf422a662557259 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1719,6 +1719,26 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
                         image, selImage, NULL);
 }
 
                         image, selImage, NULL);
 }
 

+wxImageList *wxTreeCtrl::GetImageList(int) const
+{
+    return GetImageList();
+}
+
+void wxTreeCtrl::SetImageList(wxImageList *imageList, int)
+{
+    SetImageList(imageList);
+}
+
+int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+{
+    return GetItemImage(item, wxTreeItemIcon_Selected);
+}
+
+void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
+{
+    SetItemImage(item, image, wxTreeItemIcon_Selected);
+}
+

 #endif // WXWIN_COMPATIBILITY_2_4
 
 wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
 #endif // WXWIN_COMPATIBILITY_2_4
 
 wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,


@@ -1900,10 +1920,12 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
 }
 
 #if WXWIN_COMPATIBILITY_2_4
 }
 
 #if WXWIN_COMPATIBILITY_2_4

+

 void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {
     DoExpand(item, action);
 }
 void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {
     DoExpand(item, action);
 }

+

 #endif
 
 void wxTreeCtrl::Unselect()
 #endif
 
 void wxTreeCtrl::Unselect()

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


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

-        m_bHasAnyAttr = FALSE;
+        m_bHasAnyAttr = false;

     }
     DeleteTextCtrl();
 
     }
     DeleteTextCtrl();
 


@@ -544,6 +544,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;


@@ -568,7 +592,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 +601,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 +998,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 +1017,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 +1036,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 +1502,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 +1522,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 +1764,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 +1776,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 +1799,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 +2083,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 +2098,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;