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

Warning fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-07-24 14:07:50 +00:00
parent 623d5f8002
commit 4dd31ff527
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/generic/odcombo.cpp
View File

@@ -242,7 +242,7 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
} }
else if (unicode>0) else if (unicode>0)
{ {
keychar = unicode; keychar = unicode;
} }
if ( keycode == WXK_DOWN || keycode == WXK_RIGHT ) if ( keycode == WXK_DOWN || keycode == WXK_RIGHT )
@@ -279,12 +279,12 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
// now search through the values to see if this is found // now search through the values to see if this is found
int found = -1; int found = -1;
unsigned int length=m_partialCompletionString.Length(); unsigned int length=m_partialCompletionString.length();
int i; int i;
for (i=0; i<itemCount; i++) for (i=0; i<itemCount; i++)
{ {
wxString item=GetString(i); wxString item=GetString(i);
if (( item.Length() >=length) && (! m_partialCompletionString.CmpNoCase(item.Left(length)))) if (( item.length() >= length) && (! m_partialCompletionString.CmpNoCase(item.Left(length))))
{ {
found=i; found=i;
break; break;
@@ -1044,10 +1044,12 @@ void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc, const wxRect& rect, int it
if ( GetVListBoxComboPopup()->IsCurrent((size_t)item) || if ( GetVListBoxComboPopup()->IsCurrent((size_t)item) ||
(flags & wxODCB_PAINTING_CONTROL) ) (flags & wxODCB_PAINTING_CONTROL) )
{ {
DrawFocusBackground(dc, int focusFlag = wxCONTROL_SELECTED;
rect,
(flags&wxODCB_PAINTING_CONTROL?0:wxCONTROL_ISSUBMENU) | if ( flags & wxODCB_PAINTING_CONTROL != wxODCB_PAINTING_CONTROL )
wxCONTROL_SELECTED); focusFlag |= wxCONTROL_ISSUBMENU;
DrawFocusBackground(dc, rect, focusFlag );
} }
//else: do nothing for the normal items //else: do nothing for the normal items
} }