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

Applied patch [ 1195797 ] Fixes to compile on Win64

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-05-22 12:10:55 +00:00
parent 921c65ed3d
commit 106d80ad37
8 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/arrimpl.cpp
View File

@@ -98,7 +98,7 @@ int name::Index(const T& Item, bool bFromEnd) const \
size_t ui = size() - 1; \
do { \
if ( (T*)base_array::operator[](ui) == &Item ) \
return ui; \
return wx_static_cast(int, ui); \
ui--; \
} \
while ( ui != 0 ); \
@@ -107,7 +107,7 @@ int name::Index(const T& Item, bool bFromEnd) const \
else { \
for( size_t ui = 0; ui < size(); ui++ ) { \
if( (T*)base_array::operator[](ui) == &Item ) \
return ui; \
return wx_static_cast(int, ui); \
} \
} \
\

4
include/wx/hashmap.h
View File

@@ -341,7 +341,7 @@ protected: \
/* returns NULL if not found */ \
Node** GetNodePtr( const const_key_type& key ) const \
{ \
unsigned long hash = m_hasher( key ); \
unsigned long hash = wx_static_cast(unsigned long, m_hasher( key )); \
Node** node = &m_table[hash % m_tableBuckets]; \
\
while( *node ) \
@@ -358,7 +358,7 @@ protected: \
/* expressing it in terms of GetNodePtr is 5-8% slower :-( */ \
Node* GetNode( const const_key_type& key ) const \
{ \
unsigned long hash = m_hasher( key ); \
unsigned long hash = wx_static_cast(unsigned long, m_hasher( key )); \
Node* node = m_table[hash % m_tableBuckets]; \
\
while( node ) \

2
include/wx/listbase.h
View File

@@ -373,7 +373,7 @@ public:
const wxString& GetLabel() const { return m_item.m_text; }
const wxString& GetText() const { return m_item.m_text; }
int GetImage() const { return m_item.m_image; }
long GetData() const { return m_item.m_data; }
long GetData() const { return wx_static_cast(long, m_item.m_data); }
long GetMask() const { return m_item.m_mask; }
const wxListItem& GetItem() const { return m_item; }