replaced T() makro with wxT() due to namespace probs, _T() exists, too
fixed compilation problems, mainly in html code compiles and links fine on Solaris, runs with samples and Mahogany git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -93,7 +93,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
|
||||
// a device context
|
||||
if (bitmap.GetSelectedInto() && (bitmap.GetSelectedInto() != this))
|
||||
{
|
||||
wxFatalError(T("Error in wxMemoryDC::SelectObject\nBitmap is selected in another wxMemoryDC.\nDelete the first wxMemoryDC or use SelectObject(NULL)"));
|
||||
wxFatalError(wxT("Error in wxMemoryDC::SelectObject\nBitmap is selected in another wxMemoryDC.\nDelete the first wxMemoryDC or use SelectObject(NULL)"));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
|
||||
|
||||
if (bm == ERROR)
|
||||
{
|
||||
wxFatalError(T("Error in wxMemoryDC::SelectObject\nBitmap may not be loaded, or may be selected in another wxMemoryDC.\nDelete the first wxMemoryDC to deselect bitmap."));
|
||||
wxFatalError(wxT("Error in wxMemoryDC::SelectObject\nBitmap may not be loaded, or may be selected in another wxMemoryDC.\nDelete the first wxMemoryDC to deselect bitmap."));
|
||||
}
|
||||
else if (!m_oldBitmap)
|
||||
m_oldBitmap = (WXHBITMAP) bm;
|
||||
|
||||
Reference in New Issue
Block a user