Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix for !WXWIN_COMPATIBILITY_2_4.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-20 19:32:44 +00:00
parent ccd7d9e5eb
commit b5f6b52ab3
6 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/choice.h
View File

@@ -14,6 +14,8 @@
#pragma interface "choice.h" #pragma interface "choice.h"
#endif #endif
class WXDLLIMPEXP_BASE wxSortedArrayString;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxChoice // wxChoice
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
include/wx/gtk/listbox.h
View File

@@ -17,6 +17,8 @@
#include "wx/list.h" #include "wx/list.h"
class WXDLLIMPEXP_BASE wxSortedArrayString;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxListBox // wxListBox
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
include/wx/gtk1/choice.h
View File

@@ -14,6 +14,8 @@
#pragma interface "choice.h" #pragma interface "choice.h"
#endif #endif
class WXDLLIMPEXP_BASE wxSortedArrayString;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxChoice // wxChoice
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
include/wx/gtk1/listbox.h
View File

@@ -17,6 +17,8 @@
#include "wx/list.h" #include "wx/list.h"
class WXDLLIMPEXP_BASE wxSortedArrayString;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxListBox // wxListBox
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

3
src/html/helpfrm.cpp
View File

@@ -792,7 +792,8 @@ void wxHtmlHelpFrame::CreateContents()
else if (m_hfStyle & wxHF_ICONS_BOOK_CHAPTER) else if (m_hfStyle & wxHF_ICONS_BOOK_CHAPTER)
image = (it->m_Level == 1) ? IMG_Book : IMG_Folder; image = (it->m_Level == 1) ? IMG_Book : IMG_Folder;
m_ContentsBox->SetItemImage(roots[it->m_Level], image); 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; imaged[it->m_Level] = TRUE;
} }
} }

7
src/msw/treectrl.cpp
View File

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