This is the way to go (well, close enough).

Unicodified lots of asserts.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-13 17:55:13 +00:00
parent 9cc7a35d9c
commit 62bd5cf059
6 changed files with 50 additions and 54 deletions

View File

@@ -171,14 +171,14 @@ void wxBitmapButton::SetDefault()
void wxBitmapButton::SetLabel( const wxString &label )
{
wxCHECK_RET( m_widget != NULL, "invalid button" );
wxCHECK_RET( m_widget != NULL, _T("invalid button") );
wxControl::SetLabel( label );
}
wxString wxBitmapButton::GetLabel() const
{
wxCHECK_MSG( m_widget != NULL, "", "invalid button" );
wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid button") );
return wxControl::GetLabel();
}
@@ -189,7 +189,7 @@ void wxBitmapButton::ApplyWidgetStyle()
void wxBitmapButton::SetBitmap()
{
wxCHECK_RET( m_widget != NULL, "invalid button" );
wxCHECK_RET( m_widget != NULL, _T("invalid button") );
wxBitmap the_one;
@@ -224,7 +224,7 @@ void wxBitmapButton::SetBitmap()
void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap )
{
wxCHECK_RET( m_widget != NULL, "invalid button" );
wxCHECK_RET( m_widget != NULL, _T("invalid button") );
if ( ! m_disabled.Ok() ) return;
m_disabled = bitmap;
@@ -234,7 +234,7 @@ void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap )
void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap )
{
wxCHECK_RET( m_widget != NULL, "invalid button" );
wxCHECK_RET( m_widget != NULL, _T("invalid button") );
if ( ! m_focus.Ok() ) return;
m_focus = bitmap;
@@ -244,7 +244,7 @@ void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap )
void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
{
wxCHECK_RET( m_widget != NULL, "invalid button" );
wxCHECK_RET( m_widget != NULL, _T("invalid button") );
if (!m_bitmap.Ok()) return;
m_bitmap = bitmap;
@@ -254,7 +254,7 @@ void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap )
{
wxCHECK_RET( m_widget != NULL, "invalid button" );
wxCHECK_RET( m_widget != NULL, _T("invalid button") );
if ( ! m_selected.Ok() ) return;
m_selected = bitmap;