Compilation fix for !WXWIN_COMPATIBILITY_2_4.

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 95a7154bcbb289b14bd59304bf338c4efb50ad2b..19a4defb5a5426ebd4d0b47b21e1dcde91665594 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -14,6 +14,8 @@
     #pragma interface "choice.h"
 #endif
 
+class WXDLLIMPEXP_BASE wxSortedArrayString;
+
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------

diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index f9632f26b17c50229e19fd8ee7c7bf0ab1a741ca..1976ebf2a2ede0ade9af8bb2495d0a256865bc91 100644 (file)
--- a/include/wx/gtk/listbox.h
+++ b/include/wx/gtk/listbox.h
@@ -17,6 +17,8 @@
 
 #include "wx/list.h"
 
+class WXDLLIMPEXP_BASE wxSortedArrayString;
+
 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 95a7154bcbb289b14bd59304bf338c4efb50ad2b..19a4defb5a5426ebd4d0b47b21e1dcde91665594 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -14,6 +14,8 @@
     #pragma interface "choice.h"
 #endif
 
+class WXDLLIMPEXP_BASE wxSortedArrayString;
+
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------

diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index f9632f26b17c50229e19fd8ee7c7bf0ab1a741ca..1976ebf2a2ede0ade9af8bb2495d0a256865bc91 100644 (file)
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -17,6 +17,8 @@
 
 #include "wx/list.h"
 
+class WXDLLIMPEXP_BASE wxSortedArrayString;
+
 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index e4e1a2e6813636b65dd90e9d2575db4da712f326..123aa56c7b988788e1420fccd6bfa323908ad288 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -792,7 +792,8 @@ void wxHtmlHelpFrame::CreateContents()
             else if (m_hfStyle & wxHF_ICONS_BOOK_CHAPTER)
                 image = (it->m_Level == 1) ? IMG_Book : IMG_Folder;
             m_ContentsBox->SetItemImage(roots[it->m_Level], image);
-            m_ContentsBox->SetItemSelectedImage(roots[it->m_Level], image);
+            m_ContentsBox->SetItemImage(roots[it->m_Level], image,
+                                        wxTreeItemIcon_Selected);
             imaged[it->m_Level] = TRUE;
         }
     }

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index a9ab74859356067adb0264ff50585f2d37c23540..f64ea0651cd290856d61564686018d0dde566902 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1015,7 +1015,8 @@ void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
         case wxTreeItemIcon_Normal:
             {
                 const int imageNormalOld = GetItemImage(item);
-                const int imageSelOld = GetItemSelectedImage(item);
+                const int imageSelOld =
+                    GetItemImage(item, wxTreeItemIcon_Selected);
 
                 // always set the normal image
                 imageNormal = image;
@@ -1040,7 +1041,7 @@ void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
                 // the wxTreeItemIndirectData GetItemXXXImage() will use it to
                 // get the images
                 imageNormal = GetItemImage(item);
-                imageSel = GetItemSelectedImage(item);
+                imageSel = GetItemImage(item, wxTreeItemIcon_Selected);
 
                 // if it doesn't have it yet, add it
                 wxTreeItemIndirectData *data = new
@@ -1772,10 +1773,12 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
     DoExpand(item, TVE_TOGGLE);
 }
 
+#if WXWIN_COMPATIBILITY_2_4
 void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {
     DoExpand(item, action);
 }
+#endif
 
 void wxTreeCtrl::Unselect()
 {