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

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

diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
index 91bc6fa638b90532c6f713dfd9b295ce19979b28..ce11ad1a53a8258cf04799d8df50c92bcc45018b 100644 (file)
--- a/src/osx/combobox_osx.cpp
+++ b/src/osx/combobox_osx.cpp
@@ -62,13 +62,13 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;

-        
-    if (style & wxCB_READONLY)
-        wxLogWarning("wxCB_READONLY style not supported by OS X Cocoa. Use wxChoice instead.");
-    
-    if (style & wxCB_SORT)
-        wxLogWarning("wxCB_SORT style not currently supported by OS X Cocoa.");
-        
+
+    wxASSERT_MSG( !(style & wxCB_READONLY),
+                  "wxCB_READONLY not supported, use wxChoice instead" );
+
+    wxASSERT_MSG( !(style & wxCB_SORT),
+                  "wxCB_SORT not currently supported by wxOSX/Cocoa");
+

     m_peer = wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );
     m_peer = wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );


@@ -123,19 +123,19 @@ 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 ;
 }
 
 void * wxComboBox::DoGetItemClientData(unsigned int n) const
 {
 
     m_datas[n] = (char*)clientData ;
 }
 
 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];
 }
 

-unsigned int wxComboBox::GetCount() const 
+unsigned int wxComboBox::GetCount() const

 {
     return GetComboPeer()->GetNumberOfItems();
 }
 {
     return GetComboPeer()->GetNumberOfItems();
 }


@@ -155,7 +155,7 @@ void wxComboBox::GetSelection(long *from, long *to) const
 {
     wxTextEntry::GetSelection(from, to);
 }
 {
     wxTextEntry::GetSelection(from, to);
 }

-    
+

 int wxComboBox::GetSelection() const
 {
     return GetComboPeer()->GetSelectedItem();
 int wxComboBox::GetSelection() const
 {
     return GetComboPeer()->GetSelectedItem();


@@ -173,9 +173,9 @@ 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)
-        wxLogWarning("wxComboBox::FindString on Mac doesn't currently support case insensitive search.");
-    
+    wxASSERT_MSG( "wxComboBox::FindString() doesn't currently support case "
+                  "insensitive search in wxOSX/Cocoa");
+

     return GetComboPeer()->FindString(s);
 }
 
     return GetComboPeer()->FindString(s);
 }