From b1e168b946d649b4242e5eb9219e99a0405acd8e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 19 Jul 2020 00:19:00 +0200 Subject: [PATCH] Remove _() macros from assert messages We don't translate those, as they're meant for (presumably English-speaking) developers only. --- src/dfb/overlay.cpp | 2 +- src/osx/cocoa/overlay.mm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dfb/overlay.cpp b/src/dfb/overlay.cpp index d264ecf4b8..27400ec151 100644 --- a/src/dfb/overlay.cpp +++ b/src/dfb/overlay.cpp @@ -58,7 +58,7 @@ bool wxOverlayImpl::IsOk() void wxOverlayImpl::Init(wxDC *dc, int x, int y, int width, int height) { 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); wxCHECK_RET( dcimpl, "must have a DFB wxDC" ); diff --git a/src/osx/cocoa/overlay.mm b/src/osx/cocoa/overlay.mm index 8eda13c50e..6114d31e0a 100644 --- a/src/osx/cocoa/overlay.mm +++ b/src/osx/cocoa/overlay.mm @@ -181,7 +181,7 @@ void wxOverlayImpl::CreateOverlayWindow( wxDC* dc ) 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_x = x ; @@ -190,7 +190,7 @@ void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height ) m_height = height ; 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) @@ -214,7 +214,7 @@ void wxOverlayImpl::BeginDrawing( wxDC* dc) wxOSXOverlayWindow* wxoverlay = (wxOSXOverlayWindow*) m_overlayWindow; NSBitmapImageRep* rep = wxoverlay.overlayView.bitmapImageRep; 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 ); ctx->Translate(0, ySize); @@ -243,7 +243,7 @@ void wxOverlayImpl::EndDrawing( 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); }