Unicode compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -267,7 +267,7 @@ bool wxBitmap::LoadFile(const wxString &name, wxBitmapType type)
|
|||||||
wxImage image;
|
wxImage image;
|
||||||
if ( !image.LoadFile(name, type) || !image.Ok() )
|
if ( !image.LoadFile(name, type) || !image.Ok() )
|
||||||
{
|
{
|
||||||
wxLogError("no bitmap handler for type %d defined.", type);
|
wxLogError(_("No bitmap handler for type %d defined."), type);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -301,7 +301,7 @@ bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, const wxPal
|
|||||||
return image.SaveFile(filename, type);
|
return image.SaveFile(filename, type);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
wxLogError("no bitmap handler for type %d defined.", type);
|
wxLogError(_("No bitmap handler for type %d defined."), type);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -45,7 +45,7 @@ public:
|
|||||||
{
|
{
|
||||||
if ( style != wxSOLID && style != wxTRANSPARENT )
|
if ( style != wxSOLID && style != wxTRANSPARENT )
|
||||||
{
|
{
|
||||||
wxFAIL_MSG( _T("only wxSOLID and wxTRANSPARENT styles are supported") );
|
wxFAIL_MSG( wxT("only wxSOLID and wxTRANSPARENT styles are supported") );
|
||||||
style = wxSOLID;
|
style = wxSOLID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,7 +69,7 @@ wxBrush::wxBrush(const wxColour &colour, int style)
|
|||||||
|
|
||||||
wxBrush::wxBrush(const wxBitmap &stippleBitmap)
|
wxBrush::wxBrush(const wxBitmap &stippleBitmap)
|
||||||
{
|
{
|
||||||
wxFAIL_MSG( "brushes with stipple bitmaps not implemented" );
|
wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") );
|
||||||
|
|
||||||
m_refData = new wxBrushRefData(*wxBLACK);
|
m_refData = new wxBrushRefData(*wxBLACK);
|
||||||
}
|
}
|
||||||
@@ -109,7 +109,7 @@ wxColour& wxBrush::GetColour() const
|
|||||||
|
|
||||||
wxBitmap *wxBrush::GetStipple() const
|
wxBitmap *wxBrush::GetStipple() const
|
||||||
{
|
{
|
||||||
wxFAIL_MSG( "brushes with stipple bitmaps not implemented" );
|
wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") );
|
||||||
return &wxNullBitmap;
|
return &wxNullBitmap;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,7 +133,7 @@ void wxBrush::SetStyle(int style)
|
|||||||
|
|
||||||
void wxBrush::SetStipple(const wxBitmap& WXUNUSED(stipple))
|
void wxBrush::SetStipple(const wxBitmap& WXUNUSED(stipple))
|
||||||
{
|
{
|
||||||
wxFAIL_MSG( "brushes with stipple bitmaps not implemented" );
|
wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") );
|
||||||
}
|
}
|
||||||
|
|
||||||
wxObjectRefData *wxBrush::CreateRefData() const
|
wxObjectRefData *wxBrush::CreateRefData() const
|
||||||
|
Reference in New Issue
Block a user