X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf8f10225c08bf5473fa35423f56e01f1819f971..6a3f00bd6660d0326904d774d6e7a48a13af1f6f:/src/generic/odcombo.cpp?ds=sidebyside diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp index 6425dd145d..353790fe19 100644 --- a/src/generic/odcombo.cpp +++ b/src/generic/odcombo.cpp @@ -163,7 +163,7 @@ wxCoord wxVListBoxComboPopup::OnMeasureItem(size_t n) const { wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; - wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)), + wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox), wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); wxCoord h = combo->OnMeasureItem(n); @@ -176,7 +176,7 @@ wxCoord wxVListBoxComboPopup::OnMeasureItemWidth(size_t n) const { wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; - wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)), + wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox), wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); return combo->OnMeasureItemWidth(n); @@ -189,7 +189,7 @@ void wxVListBoxComboPopup::OnDrawBg( wxDC& dc, { wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; - wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)), + wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox), wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); if ( IsCurrent((size_t)item) && !(flags & wxODCB_PAINTING_CONTROL) ) @@ -208,7 +208,7 @@ void wxVListBoxComboPopup::OnDrawItem( wxDC& dc, const wxRect& rect, int item, i { wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; - wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)), + wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox), wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); combo->OnDrawItem(dc,rect,item,flags); @@ -375,7 +375,7 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar // The m_combo->SetValue() call above sets m_value to the index of this // string. But if there are more identical string, the index is of the - // first occurence, which may be wrong, so set the index explicitly here, + // first occurrence, which may be wrong, so set the index explicitly here, // _after_ the SetValue() call. m_value = value;