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

compilation fix for a patch which didn't compile...

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-07-25 15:52:40 +00:00
parent 09088d12d4
commit e6bf95736e
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/intl.cpp
View File

@@ -2505,7 +2505,7 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString,
wxString wxLocale::GetHeaderValue( const wxChar* szHeader, wxString wxLocale::GetHeaderValue( const wxChar* szHeader,
const wxChar* szDomain ) const const wxChar* szDomain ) const
{ {
if ( wxIsEmpty(Header) ) if ( wxIsEmpty(szHeader) )
return wxEmptyString; return wxEmptyString;
wxChar const * pszTrans = NULL; wxChar const * pszTrans = NULL;
@@ -2535,11 +2535,11 @@ wxString wxLocale::GetHeaderValue( const wxChar* szHeader,
if ( wxIsEmpty(pszTrans) ) if ( wxIsEmpty(pszTrans) )
return wxEmptyString; return wxEmptyString;
wxChar const * pszFound = wxStrstr(pszTrans, Header); wxChar const * pszFound = wxStrstr(pszTrans, szHeader);
if ( pszFound == NULL ) if ( pszFound == NULL )
return wxEmptyString; return wxEmptyString;
pszFound += wxStrlen(Header) + 2 /* ': ' */; pszFound += wxStrlen(szHeader) + 2 /* ': ' */;
// Every header is separated by \n // Every header is separated by \n

19
src/generic/listctrl.cpp
View File

@@ -4290,17 +4290,18 @@ long wxListMainWindow::FindItem(long start, long data)
long wxListMainWindow::FindItem( const wxPoint& pt ) long wxListMainWindow::FindItem( const wxPoint& pt )
{ {
wxPoint p; size_t topItem;
long topItem = GetTopItem(); GetVisibleLinesRange(&topItem, NULL);
GetItemPosition( GetItemCount()-1, p ); wxPoint p;
if( p.y == 0 ) GetItemPosition( GetItemCount()-1, p );
return topItem; if( p.y == 0 )
long id = (long) floor( pt.y*(GetItemCount()-topItem-1)/p.y+topItem ); return topItem;
if( id >= 0 && id < (long)GetItemCount() ) long id = (long) floor( pt.y*(GetItemCount()-topItem-1)/p.y+topItem );
return id; if( id >= 0 && id < (long)GetItemCount() )
return id;
return wxNOT_FOUND; return wxNOT_FOUND;
} }
long wxListMainWindow::HitTest( int x, int y, int &flags ) long wxListMainWindow::HitTest( int x, int y, int &flags )