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

Remove _() macros from assert messages

Browse Source 
We don't translate those, as they're meant for (presumably
English-speaking) developers only.
This commit is contained in:
Vadim Zeitlin
2020-07-19 00:19:00 +02:00
parent 130e11688b
commit b1e168b946
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dfb/overlay.cpp
View File

@@ -58,7 +58,7 @@ bool wxOverlayImpl::IsOk()
void wxOverlayImpl::Init(wxDC *dc, int x, int y, int width, int height) void wxOverlayImpl::Init(wxDC *dc, int x, int y, int width, int height)
{ {
wxCHECK_RET( dc, "NULL dc pointer" ); wxCHECK_RET( dc, "NULL dc pointer" );
wxASSERT_MSG( !IsOk() , _("You cannot Init an overlay twice") ); wxASSERT_MSG( !IsOk() , "You cannot Init an overlay twice" );
wxDFBDCImpl * const dcimpl = wxDynamicCast(dc->GetImpl(), wxDFBDCImpl); wxDFBDCImpl * const dcimpl = wxDynamicCast(dc->GetImpl(), wxDFBDCImpl);
wxCHECK_RET( dcimpl, "must have a DFB wxDC" ); wxCHECK_RET( dcimpl, "must have a DFB wxDC" );

8
src/osx/cocoa/overlay.mm
View File

@@ -181,7 +181,7 @@ void wxOverlayImpl::CreateOverlayWindow( wxDC* dc )
void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height ) void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )
{ {
wxASSERT_MSG( !IsOk() , _("You cannot Init an overlay twice") ); wxASSERT_MSG( !IsOk() , "You cannot Init an overlay twice" );
m_window = dc->GetWindow(); m_window = dc->GetWindow();
m_x = x ; m_x = x ;
@@ -190,7 +190,7 @@ void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )
m_height = height ; m_height = height ;
CreateOverlayWindow(dc); CreateOverlayWindow(dc);
wxASSERT_MSG(m_overlayWindow != NULL, _("Couldn't create the overlay window")); wxASSERT_MSG(m_overlayWindow != NULL, "Couldn't create the overlay window");
} }
void wxOverlayImpl::BeginDrawing( wxDC* dc) void wxOverlayImpl::BeginDrawing( wxDC* dc)
@@ -214,7 +214,7 @@ void wxOverlayImpl::BeginDrawing( wxDC* dc)
wxOSXOverlayWindow* wxoverlay = (wxOSXOverlayWindow*) m_overlayWindow; wxOSXOverlayWindow* wxoverlay = (wxOSXOverlayWindow*) m_overlayWindow;
NSBitmapImageRep* rep = wxoverlay.overlayView.bitmapImageRep; NSBitmapImageRep* rep = wxoverlay.overlayView.bitmapImageRep;
m_overlayContext = [[NSGraphicsContext graphicsContextWithBitmapImageRep:rep] CGContext]; m_overlayContext = [[NSGraphicsContext graphicsContextWithBitmapImageRep:rep] CGContext];
wxASSERT_MSG( m_overlayContext != NULL , _("Couldn't init the context on the overlay window") ); wxASSERT_MSG( m_overlayContext != NULL , "Couldn't init the context on the overlay window" );
wxGraphicsContext* ctx = wxGraphicsContext::CreateFromNative( m_overlayContext ); wxGraphicsContext* ctx = wxGraphicsContext::CreateFromNative( m_overlayContext );
ctx->Translate(0, ySize); ctx->Translate(0, ySize);
@@ -243,7 +243,7 @@ void wxOverlayImpl::EndDrawing( wxDC* dc)
void wxOverlayImpl::Clear(wxDC* dc) void wxOverlayImpl::Clear(wxDC* dc)
{ {
wxASSERT_MSG( IsOk() , _("You cannot Clear an overlay that is not inited") ); wxASSERT_MSG( IsOk() , "You cannot Clear an overlay that is not inited" );
dc->GetGraphicsContext()->ClearRectangle(m_x - 1, m_y - 1, m_width + 2, m_height + 2); dc->GetGraphicsContext()->ClearRectangle(m_x - 1, m_y - 1, m_width + 2, m_height + 2);
} }