show flags in the GameListCtrl on windows again. (what do you know, updating wxw had some benefit)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2708 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
99c7c11f35
commit
7df9aaa3e3
|
@ -343,14 +343,11 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
|
||||||
SetItem(item);
|
SetItem(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef __WXMSW__
|
|
||||||
// Country
|
// Country
|
||||||
{
|
{
|
||||||
// Can't do this in Windows - we use DrawSubItem instead, see below
|
|
||||||
wxListItem item;
|
wxListItem item;
|
||||||
item.m_itemId = ItemIndex;
|
item.m_itemId = ItemIndex;
|
||||||
item.SetColumn(COLUMN_COUNTRY);
|
item.SetColumn(COLUMN_COUNTRY);
|
||||||
//item.SetBackgroundColour(color);
|
|
||||||
DiscIO::IVolume::ECountry Country = rISOFile.GetCountry();
|
DiscIO::IVolume::ECountry Country = rISOFile.GetCountry();
|
||||||
|
|
||||||
if (size_t(Country) < m_FlagImageIndex.size())
|
if (size_t(Country) < m_FlagImageIndex.size())
|
||||||
|
@ -360,34 +357,10 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
|
||||||
|
|
||||||
SetItem(item);
|
SetItem(item);
|
||||||
}
|
}
|
||||||
#endif // __WXMSW__
|
|
||||||
|
|
||||||
// Item data
|
// Item data
|
||||||
SetItemData(_Index, ItemIndex);
|
SetItemData(_Index, ItemIndex);
|
||||||
}
|
}
|
||||||
#ifdef _WIN32
|
|
||||||
bool CGameListCtrl::MSWDrawSubItem(wxPaintDC& rPaintDC, int item, int subitem)
|
|
||||||
{
|
|
||||||
bool Result = false;
|
|
||||||
#ifdef __WXMSW__
|
|
||||||
switch (subitem)
|
|
||||||
{
|
|
||||||
case COLUMN_COUNTRY:
|
|
||||||
size_t Index = GetItemData(item);
|
|
||||||
|
|
||||||
if (Index < m_ISOFiles.size())
|
|
||||||
{
|
|
||||||
const GameListItem& rISO = m_ISOFiles[Index];
|
|
||||||
wxRect SubItemRect;
|
|
||||||
this->GetSubItemRect(item, subitem, SubItemRect);
|
|
||||||
m_imageListSmall->Draw(m_FlagImageIndex[rISO.GetCountry()], rPaintDC, SubItemRect.GetLeft(), SubItemRect.GetTop());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return(Result);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
wxColour blend50(const wxColour& c1, const wxColour& c2)
|
wxColour blend50(const wxColour& c1, const wxColour& c2)
|
||||||
{
|
{
|
||||||
|
|
|
@ -76,10 +76,6 @@ private:
|
||||||
void OnMultiCompressGCM(wxCommandEvent& event);
|
void OnMultiCompressGCM(wxCommandEvent& event);
|
||||||
void OnMultiDecompressGCM(wxCommandEvent& event);
|
void OnMultiDecompressGCM(wxCommandEvent& event);
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
virtual bool MSWDrawSubItem(wxPaintDC& rPaintDC, int item, int subitem);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void CompressSelection(bool _compress);
|
void CompressSelection(bool _compress);
|
||||||
void AutomaticColumnWidth();
|
void AutomaticColumnWidth();
|
||||||
void UnselectAll();
|
void UnselectAll();
|
||||||
|
|
Loading…
Reference in New Issue