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

Replace wxLogWarning()s in wxOSX wxComboBox code with asserts.

Browse Source 
This incidentally fixes compilation when not using PCH as wx/log.h was not
included but is also more correct as the messages meant for the programmer,
and not the user, should be given using asserts and not wxLog.

Also correct some asserts messages. In particular, don't mention the function
name in the message itself as it's already shown by the assert and using it in
the string itself isn't useful and simply introduces the risk of forgetting to
update it after refactoring, as happened here in r63105.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-01-24 09:13:40 +00:00
parent d1d1f8175d
commit 8e7262fca7
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osx/combobox_osx.cpp
View File

@@ -63,11 +63,11 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) ) if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
return false; return false;
if (style & wxCB_READONLY) wxASSERT_MSG( !(style & wxCB_READONLY),
wxLogWarning("wxCB_READONLY style not supported by OS X Cocoa. Use wxChoice instead."); "wxCB_READONLY not supported, use wxChoice instead" );
if (style & wxCB_SORT) wxASSERT_MSG( !(style & wxCB_SORT),
wxLogWarning("wxCB_SORT style not currently supported by OS X Cocoa."); "wxCB_SORT not currently supported by wxOSX/Cocoa");
m_peer = wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() ); m_peer = wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() );
@@ -123,14 +123,14 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData) void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
{ {
wxCHECK_RET( IsValid(n), wxT("wxChoice::DoSetItemClientData: invalid index") ); wxCHECK_RET( IsValid(n), "invalid index" );
m_datas[n] = (char*)clientData ; m_datas[n] = (char*)clientData ;
} }
void * wxComboBox::DoGetItemClientData(unsigned int n) const void * wxComboBox::DoGetItemClientData(unsigned int n) const
{ {
wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") ); wxCHECK_MSG( IsValid(n), NULL, "invalid index" );
return (void *)m_datas[n]; return (void *)m_datas[n];
} }
@@ -173,8 +173,8 @@ void wxComboBox::SetSelection(long from, long to)
int wxComboBox::FindString(const wxString& s, bool bCase) const int wxComboBox::FindString(const wxString& s, bool bCase) const
{ {
if (!bCase) wxASSERT_MSG( "wxComboBox::FindString() doesn't currently support case "
wxLogWarning("wxComboBox::FindString on Mac doesn't currently support case insensitive search."); "insensitive search in wxOSX/Cocoa");
return GetComboPeer()->FindString(s); return GetComboPeer()->FindString(s);
} }