From a5001e9361fe01a134b45fa5caf55477e8368d26 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 18 Jul 2007 10:15:42 +0000 Subject: [PATCH] don't use _T() for literals in wxDFB, it uses UTF-8 build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/dfb/bitmap.cpp | 18 ++++++++-------- src/dfb/dc.cpp | 44 +++++++++++++++++++-------------------- src/dfb/dcclient.cpp | 12 +++++------ src/dfb/evtloop.cpp | 10 ++++----- src/dfb/fontmgr.cpp | 42 ++++++++++++++++++------------------- src/dfb/nonownedwnd.cpp | 28 ++++++++++++------------- src/dfb/overlay.cpp | 2 +- src/dfb/pen.cpp | 28 ++++++++++++------------- src/dfb/region.cpp | 20 +++++++++--------- src/dfb/settings.cpp | 6 +++--- src/dfb/toplevel.cpp | 8 +++---- src/dfb/utils.cpp | 4 ++-- src/dfb/window.cpp | 46 ++++++++++++++++++++--------------------- src/dfb/wrapdfb.cpp | 4 ++-- 14 files changed, 136 insertions(+), 136 deletions(-) diff --git a/src/dfb/bitmap.cpp b/src/dfb/bitmap.cpp index e6a8b26dc9..0c245df509 100644 --- a/src/dfb/bitmap.cpp +++ b/src/dfb/bitmap.cpp @@ -64,7 +64,7 @@ static void CopySurfaceToImage(const wxIDirectFBSurfacePtr& surface, wxImage& image) { wxIDirectFBSurface::Locked locked(surface, DSLF_READ); - wxCHECK_RET( locked.ptr, _T("failed to lock surface") ); + wxCHECK_RET( locked.ptr, "failed to lock surface" ); const unsigned width = image.GetWidth(); const unsigned height = image.GetHeight(); @@ -191,10 +191,10 @@ CreateSurfaceWithFormat(int w, int h, DFBSurfacePixelFormat format) // Creates a surface that will use wxImage's pixel data (RGB only) static wxIDirectFBSurfacePtr CreateSurfaceForImage(const wxImage& image) { - wxCHECK_MSG( image.Ok(), NULL, _T("invalid image") ); + wxCHECK_MSG( image.Ok(), NULL, "invalid image" ); // FIXME_DFB: implement alpha handling by merging alpha buffer with RGB // into a temporary RGBA surface - wxCHECK_MSG( !image.HasAlpha(), NULL, _T("alpha channel not supported") ); + wxCHECK_MSG( !image.HasAlpha(), NULL, "alpha channel not supported" ); // NB: wxImage uses RGB order of bytes while DirectFB uses BGR, so we // cannot use preallocated surface that shares data with wxImage, we @@ -300,7 +300,7 @@ bool wxBitmap::Create(const wxIDirectFBSurfacePtr& surface) { UnRef(); - wxCHECK_MSG( surface, false, _T("invalid surface") ); + wxCHECK_MSG( surface, false, "invalid surface" ); m_refData = new wxBitmapRefData(); M_BITMAP->m_surface = surface; @@ -362,7 +362,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth) } // FIXME: implement mask creation from image's mask (or alpha channel?) - wxASSERT_MSG( !image.HasMask(), _T("image masks are ignored for now") ); + wxASSERT_MSG( !image.HasMask(), "image masks are ignored for now" ); } wxImage wxBitmap::ConvertToImage() const @@ -395,7 +395,7 @@ wxImage wxBitmap::ConvertToImage() const } // FIXME: implement mask setting in the image - wxASSERT_MSG( GetMask() == NULL, _T("bitmap masks are ignored for now") ); + wxASSERT_MSG( GetMask() == NULL, "bitmap masks are ignored for now" ); return img; } @@ -455,7 +455,7 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) { wxCHECK_RET( depth == 1, wxT("can only create mono bitmap from XBM data") ); - wxFAIL_MSG( _T("not implemented") ); + wxFAIL_MSG( "not implemented" ); } bool wxBitmap::IsOk() const @@ -606,14 +606,14 @@ void wxBitmap::SetHeight(int height) { AllocExclusive(); - wxFAIL_MSG( _T("SetHeight not implemented") ); + wxFAIL_MSG( "SetHeight not implemented" ); } void wxBitmap::SetWidth(int width) { AllocExclusive(); - wxFAIL_MSG( _T("SetWidth not implemented") ); + wxFAIL_MSG( "SetWidth not implemented" ); } void wxBitmap::SetDepth(int depth) diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp index a22b83bbc6..a78c2c8d5e 100644 --- a/src/dfb/dc.cpp +++ b/src/dfb/dc.cpp @@ -60,7 +60,7 @@ wxDC::wxDC(const wxIDirectFBSurfacePtr& surface) void wxDC::DFBInit(const wxIDirectFBSurfacePtr& surface) { m_ok = (surface != NULL); - wxCHECK_RET( surface != NULL, _T("invalid surface") ); + wxCHECK_RET( surface != NULL, "invalid surface" ); m_surface = surface; @@ -86,7 +86,7 @@ void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch) wxSize size(GetSize()); wxASSERT_MSG( !m_clipping, - _T("narrowing clipping region not implemented yet") ); + "narrowing clipping region not implemented yet" ); // NB: We intersect the clipping rectangle with surface's area here because // DirectFB will return an error if you try to set clipping rectangle @@ -161,9 +161,9 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y, bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const { - wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel")); + wxCHECK_MSG( col, false, "NULL colour parameter in wxDC::GetPixel"); - wxFAIL_MSG( _T("GetPixel not implemented") ); + wxFAIL_MSG( "GetPixel not implemented" ); return false; } @@ -171,7 +171,7 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y) { wxCHECK_RET( Ok(), wxT("invalid dc") ); - wxFAIL_MSG( _T("CrossHair not implemented") ); + wxFAIL_MSG( "CrossHair not implemented" ); } void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) @@ -220,7 +220,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, { wxCHECK_RET( Ok(), wxT("invalid dc") ); - wxFAIL_MSG( _T("DrawArc not implemented") ); + wxFAIL_MSG( "DrawArc not implemented" ); } void wxDC::DoDrawPoint(wxCoord x, wxCoord y) @@ -239,7 +239,7 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs { wxCHECK_RET( Ok(), wxT("invalid dc") ); - wxFAIL_MSG( _T("DrawPolygon not implemented") ); + wxFAIL_MSG( "DrawPolygon not implemented" ); } void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) @@ -247,7 +247,7 @@ void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset wxCHECK_RET( Ok(), wxT("invalid dc") ); // TODO: impl. using DirectDB's DrawLines - wxFAIL_MSG( _T("DrawLines not implemented") ); + wxFAIL_MSG( "DrawLines not implemented" ); } void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) @@ -294,21 +294,21 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h { wxCHECK_RET( Ok(), wxT("invalid dc") ); - wxFAIL_MSG( _T("DrawRoundedRectangle not implemented") ); + wxFAIL_MSG( "DrawRoundedRectangle not implemented" ); } void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { wxCHECK_RET( Ok(), wxT("invalid dc") ); - wxFAIL_MSG( _T("DrawElipse not implemented") ); + wxFAIL_MSG( "DrawElipse not implemented" ); } void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { wxCHECK_RET( Ok(), wxT("invalid dc") ); - wxFAIL_MSG( _T("DrawElipticArc not implemented") ); + wxFAIL_MSG( "DrawElipticArc not implemented" ); } void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) @@ -351,7 +351,7 @@ void wxDC::DoDrawRotatedText(const wxString& text, { wxCHECK_RET( Ok(), wxT("invalid dc") ); - wxFAIL_MSG( _T("DrawRotatedText not implemented") ); + wxFAIL_MSG( "DrawRotatedText not implemented" ); } // --------------------------------------------------------------------------- @@ -381,7 +381,7 @@ void wxDC::SetPalette(const wxPalette& WXUNUSED(palette)) { wxCHECK_RET( Ok(), wxT("invalid dc") ); - wxFAIL_MSG( _T("SetPalette not implemented") ); + wxFAIL_MSG( "SetPalette not implemented" ); } #endif // wxUSE_PALETTE @@ -429,7 +429,7 @@ void wxDC::SetLogicalFunction(int function) // NB: we could also support XOR, but for blitting only (via DSBLIT_XOR); // and possibly others via SetSrc/DstBlendFunction() wxASSERT_MSG( function == wxCOPY, - _T("only wxCOPY logical function supported") ); + "only wxCOPY logical function supported" ); m_logicalFunction = function; } @@ -567,12 +567,12 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, int rop, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask) { - wxCHECK_MSG( Ok(), false, _T("invalid dc") ); - wxCHECK_MSG( source, false, _T("invalid source dc") ); + wxCHECK_MSG( Ok(), false, "invalid dc" ); + wxCHECK_MSG( source, false, "invalid source dc" ); // NB: we could also support XOR here (via DSBLIT_XOR) // and possibly others via SetSrc/DstBlendFunction() - wxCHECK_MSG( rop == wxCOPY, false, _T("only wxCOPY function supported") ); + wxCHECK_MSG( rop == wxCOPY, false, "only wxCOPY function supported" ); // transform the source DC coords to the device ones xsrc = source->LogicalToDeviceX(xsrc); @@ -580,7 +580,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, // FIXME_DFB: use the mask origin when drawing transparently wxASSERT_MSG( xsrcMask == -1 && ysrcMask == -1, - _T("non-default source mask offset not implemented") ); + "non-default source mask offset not implemented" ); #if 0 if (xsrcMask == -1 && ysrcMask == -1) { @@ -640,13 +640,13 @@ void wxDC::DoDrawSubBitmap(const wxBitmap &bmp, // NB: we could also support XOR here (via DSBLIT_XOR) // and possibly others via SetSrc/DstBlendFunction() - wxCHECK_RET( rop == wxCOPY, _T("only wxCOPY function supported") ); + wxCHECK_RET( rop == wxCOPY, "only wxCOPY function supported" ); if ( bmp.GetDepth() == 1 ) { // Mono bitmaps are handled in special way -- all 1s are drawn in // foreground colours, all 0s in background colour. - wxFAIL_MSG( _T("drawing mono bitmaps not implemented") ); + wxFAIL_MSG( "drawing mono bitmaps not implemented" ); return; } @@ -656,7 +656,7 @@ void wxDC::DoDrawSubBitmap(const wxBitmap &bmp, // applicable because DirectFB doesn't implement ROPs; OTOH, // it has blitting modes that can be useful; finally, see // DFB's SetSrcBlendFunction() and SetSrcColorKey() - wxFAIL_MSG( _T("drawing bitmaps with masks not implemented") ); + wxFAIL_MSG( "drawing bitmaps with masks not implemented" ); return; } @@ -677,7 +677,7 @@ bool wxDC::DoBlitFromSurface(const wxIDirectFBSurfacePtr& src, src->GetSize(&srcsize.x, &srcsize.y); if ( !wxRect(srcx, srcy, w, h).Intersects(wxRect(srcsize)) ) { - wxLogDebug(_T("Blitting from area outside of the source surface, caller code needs fixing.")); + wxLogDebug("Blitting from area outside of the source surface, caller code needs fixing."); return false; } diff --git a/src/dfb/dcclient.cpp b/src/dfb/dcclient.cpp index a10dd02b9e..6514a4f599 100644 --- a/src/dfb/dcclient.cpp +++ b/src/dfb/dcclient.cpp @@ -32,7 +32,7 @@ #include "wx/dfb/private.h" -#define TRACE_PAINT _T("paint") +#define TRACE_PAINT "paint" // =========================================================================== // implementation @@ -77,7 +77,7 @@ static wxRect GetUncoveredWindowArea(wxWindow *win) static wxIDirectFBSurfacePtr CreateDummySurface(wxWindow *win, const wxRect *rect) { - wxLogTrace(TRACE_PAINT, _T("%p ('%s'): creating dummy DC surface"), + wxLogTrace(TRACE_PAINT, "%p ('%s'): creating dummy DC surface", win, win->GetName().c_str()); wxSize size(rect ? rect->GetSize() : win->GetSize()); @@ -105,7 +105,7 @@ wxWindowDC::wxWindowDC(wxWindow *win) void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect) { - wxCHECK_RET( win, _T("invalid window") ); + wxCHECK_RET( win, "invalid window" ); m_win = win; @@ -131,7 +131,7 @@ void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect) if ( win->GetTLW()->IsPainting() && !updateRegion.IsEmpty() ) { r.Intersect(updateRegion.AsRect()); - wxCHECK_RET( !r.IsEmpty(), _T("invalid painting rectangle") ); + wxCHECK_RET( !r.IsEmpty(), "invalid painting rectangle" ); // parent TLW will flip the entire surface when painting is done m_shouldFlip = false; @@ -184,7 +184,7 @@ void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect) return; wxLogTrace(TRACE_PAINT, - _T("%p ('%s'): creating DC for area [%i,%i,%i,%i], clipped to [%i,%i,%i,%i], origin [%i,%i]"), + "%p ('%s'): creating DC for area [%i,%i,%i,%i], clipped to [%i,%i,%i,%i], origin [%i,%i]", win, win->GetName().c_str(), rectOrig.x, rectOrig.y, rectOrig.GetRight(), rectOrig.GetBottom(), r.x, r.y, r.GetRight(), r.GetBottom(), @@ -234,7 +234,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) wxClientDC::wxClientDC(wxWindow *win) { - wxCHECK_RET( win, _T("invalid window") ); + wxCHECK_RET( win, "invalid window" ); wxRect rect = win->GetClientRect(); InitForWin(win, &rect); diff --git a/src/dfb/evtloop.cpp b/src/dfb/evtloop.cpp index 7c8f30ea80..9581c327f1 100644 --- a/src/dfb/evtloop.cpp +++ b/src/dfb/evtloop.cpp @@ -31,7 +31,7 @@ #include "wx/dfb/private.h" #include "wx/nonownedwnd.h" -#define TRACE_EVENTS _T("events") +#define TRACE_EVENTS "events" // =========================================================================== // implementation @@ -76,14 +76,14 @@ wxIDirectFBEventBufferPtr wxGUIEventLoop::GetDirectFBEventBuffer() bool wxGUIEventLoop::Pending() const { - wxCHECK_MSG( ms_buffer, false, _T("invalid event buffer") ); + wxCHECK_MSG( ms_buffer, false, "invalid event buffer" ); return ms_buffer->HasEvent(); } bool wxGUIEventLoop::Dispatch() { - wxCHECK_MSG( ms_buffer, false, _T("invalid event buffer") ); + wxCHECK_MSG( ms_buffer, false, "invalid event buffer" ); // NB: we don't block indefinitely waiting for an event, but instead // time out after a brief period in order to make sure that @@ -128,7 +128,7 @@ bool wxGUIEventLoop::Dispatch() void wxGUIEventLoop::WakeUp() { - wxCHECK_RET( ms_buffer, _T("invalid event buffer") ); + wxCHECK_RET( ms_buffer, "invalid event buffer" ); ms_buffer->WakeUp(); } @@ -179,7 +179,7 @@ void wxGUIEventLoop::HandleDFBEvent(const wxDFBEvent& event) #endif { wxLogTrace(TRACE_EVENTS, - _T("ignoring event of unsupported class %i"), + "ignoring event of unsupported class %i", (int)event.GetClass()); } } diff --git a/src/dfb/fontmgr.cpp b/src/dfb/fontmgr.cpp index 7abfabaacf..3913b995f8 100644 --- a/src/dfb/fontmgr.cpp +++ b/src/dfb/fontmgr.cpp @@ -66,7 +66,7 @@ wxFontInstance::wxFontInstance(float ptSize, bool aa, else m_font = wxIDirectFB::Get()->CreateFont(filename.fn_str(), &desc); - wxASSERT_MSG( m_font, _T("cannot create font instance") ); + wxASSERT_MSG( m_font, "cannot create font instance" ); } // ---------------------------------------------------------------------------- @@ -145,7 +145,7 @@ wxFontBundle::wxFontBundle(const wxString& name, void wxFontsManager::AddAllFonts() { wxString path; - if ( !wxGetEnv(_T("WXDFB_FONTPATH"), &path) ) + if ( !wxGetEnv("WXDFB_FONTPATH", &path) ) path = _T(wxINSTALL_PREFIX "/share/wx/fonts"); wxStringTokenizer tkn(path, wxPATH_SEP); @@ -155,12 +155,12 @@ void wxFontsManager::AddAllFonts() if ( !wxDir::Exists(dir) ) { - wxLogDebug(_T("font directory %s doesn't exist"), dir); + wxLogDebug("font directory %s doesn't exist", dir); continue; } wxArrayString indexFiles; - if ( !wxDir::GetAllFiles(dir, &indexFiles, _T("FontsIndex")) ) + if ( !wxDir::GetAllFiles(dir, &indexFiles, "FontsIndex") ) continue; for ( wxArrayString::const_iterator i = indexFiles.begin(); @@ -174,7 +174,7 @@ void wxFontsManager::AddAllFonts() { // We can fall back to the builtin default font if no other fonts are // defined: - wxLogTrace(_T("font"), + wxLogTrace("font", _("no fonts found in %s, using builtin font"), path); AddBundle @@ -204,7 +204,7 @@ void wxFontsManager::AddFontsFromDir(const wxString& indexFile) return; } - wxLogTrace(_T("font"), _T("adding fonts from %s"), dir.c_str()); + wxLogTrace("font", "adding fonts from %s", dir.c_str()); wxFileConfig cfg(wxEmptyString, wxEmptyString, indexFile, wxEmptyString, @@ -231,27 +231,27 @@ ReadFilePath(const wxString& name, const wxString& dir, wxFileConfig& cfg) if ( p.empty() || wxFileName(p).IsAbsolute() ) return p; - return dir + _T("/") + p; + return dir + "/" + p; } void wxFontsManager::AddFont(const wxString& dir, const wxString& name, wxFileConfig& cfg) { - wxLogTrace(_T("font"), _T("adding font '%s'"), name.c_str()); + wxLogTrace("font", "adding font '%s'", name.c_str()); - wxConfigPathChanger ch(&cfg, wxString::Format(_T("/%s/"), name.c_str())); + wxConfigPathChanger ch(&cfg, wxString::Format("/%s/", name.c_str())); AddBundle ( new wxFontBundle ( name, - ReadFilePath(_T("Regular"), dir, cfg), - ReadFilePath(_T("Italic"), dir, cfg), - ReadFilePath(_T("Bold"), dir, cfg), - ReadFilePath(_T("BoldItalic"), dir, cfg), - cfg.Read(_T("IsFixed"), (long)false) + ReadFilePath("Regular", dir, cfg), + ReadFilePath("Italic", dir, cfg), + ReadFilePath("Bold", dir, cfg), + ReadFilePath("BoldItalic", dir, cfg), + cfg.Read("IsFixed", (long)false) ) ); } @@ -260,7 +260,7 @@ void wxFontsManager::SetDefaultFonts(wxFileConfig& cfg) { wxString name; - if ( cfg.Read(_T("Default"), &name) ) + if ( cfg.Read("Default", &name) ) { m_defaultFacenames[wxFONTFAMILY_DECORATIVE] = m_defaultFacenames[wxFONTFAMILY_ROMAN] = @@ -270,16 +270,16 @@ void wxFontsManager::SetDefaultFonts(wxFileConfig& cfg) m_defaultFacenames[wxFONTFAMILY_TELETYPE] = name; } - if ( cfg.Read(_T("DefaultDecorative"), &name) ) + if ( cfg.Read("DefaultDecorative", &name) ) m_defaultFacenames[wxFONTFAMILY_DECORATIVE] = name; - if ( cfg.Read(_T("DefaultRoman"), &name) ) + if ( cfg.Read("DefaultRoman", &name) ) m_defaultFacenames[wxFONTFAMILY_ROMAN] = name; - if ( cfg.Read(_T("DefaultScript"), &name) ) + if ( cfg.Read("DefaultScript", &name) ) m_defaultFacenames[wxFONTFAMILY_SCRIPT] = name; - if ( cfg.Read(_T("DefaultSwiss"), &name) ) + if ( cfg.Read("DefaultSwiss", &name) ) m_defaultFacenames[wxFONTFAMILY_SWISS] = name; - if ( cfg.Read(_T("DefaultModern"), &name) ) + if ( cfg.Read("DefaultModern", &name) ) m_defaultFacenames[wxFONTFAMILY_MODERN] = name; - if ( cfg.Read(_T("DefaultTeletype"), &name) ) + if ( cfg.Read("DefaultTeletype", &name) ) m_defaultFacenames[wxFONTFAMILY_TELETYPE] = name; } diff --git a/src/dfb/nonownedwnd.cpp b/src/dfb/nonownedwnd.cpp index 58d59ebebc..3652a13ba4 100644 --- a/src/dfb/nonownedwnd.cpp +++ b/src/dfb/nonownedwnd.cpp @@ -21,8 +21,8 @@ #include "wx/evtloop.h" #include "wx/dfb/private.h" -#define TRACE_EVENTS _T("events") -#define TRACE_PAINT _T("paint") +#define TRACE_EVENTS "events" +#define TRACE_PAINT "paint" // ============================================================================ // globals @@ -101,14 +101,14 @@ bool wxNonOwnedWindow::Create(wxWindow *parent, long style, const wxString &name) { - wxCHECK_MSG( pos.x >= 0 && pos.y >= 0, false, _T("invalid position") ); - wxCHECK_MSG( size.x > 0 && size.y > 0, false, _T("invalid size") ); + wxCHECK_MSG( pos.x >= 0 && pos.y >= 0, false, "invalid position" ); + wxCHECK_MSG( size.x > 0 && size.y > 0, false, "invalid size" ); m_tlw = this; // create DirectFB window: wxIDirectFBDisplayLayerPtr layer(wxIDirectFB::Get()->GetDisplayLayer()); - wxCHECK_MSG( layer, false, _T("no display layer") ); + wxCHECK_MSG( layer, false, "no display layer" ); DFBWindowDescription desc; desc.flags = (DFBWindowDescriptionFlags) @@ -307,7 +307,7 @@ void wxNonOwnedWindow::HandleQueuedPaintRequests() continue; // nothing to refresh wxLogTrace(TRACE_PAINT, - _T("%p ('%s'): processing paint request [%i,%i,%i,%i]"), + "%p ('%s'): processing paint request [%i,%i,%i,%i]", this, GetName().c_str(), clipped.x, clipped.y, clipped.GetRight(), clipped.GetBottom()); @@ -346,7 +346,7 @@ void wxNonOwnedWindow::HandleQueuedPaintRequests() GetDfbSurface()->FlipToFront(rptr); wxLogTrace(TRACE_PAINT, - _T("%p ('%s'): processed %i paint requests, flipped surface: [%i,%i,%i,%i]"), + "%p ('%s'): processed %i paint requests, flipped surface: [%i,%i,%i,%i]", this, GetName().c_str(), requestsCount, paintedRect.x, paintedRect.y, @@ -362,7 +362,7 @@ void wxNonOwnedWindow::DoRefreshRect(const wxRect& rect) return; wxLogTrace(TRACE_PAINT, - _T("%p ('%s'): [TLW] refresh rect [%i,%i,%i,%i]"), + "%p ('%s'): [TLW] refresh rect [%i,%i,%i,%i]", this, GetName().c_str(), rect.x, rect.y, rect.GetRight(), rect.GetBottom()); @@ -402,9 +402,9 @@ struct InsideDFBFocusHandlerSetter void wxNonOwnedWindow::SetDfbFocus() { - wxCHECK_RET( IsShown(), _T("cannot set focus to hidden window") ); + wxCHECK_RET( IsShown(), "cannot set focus to hidden window" ); wxASSERT_MSG( FindFocus() && FindFocus()->GetTLW() == this, - _T("setting DirectFB focus to unexpected window") ); + "setting DirectFB focus to unexpected window" ); // Don't set DirectFB focus if we're called from HandleFocusEvent() on // this window, because we already have the focus in that case. Not only @@ -450,7 +450,7 @@ void wxNonOwnedWindow::HandleDFBWindowEvent(const wxDFBWindowEvent& event_) if ( gs_dfbWindowsMap.find(event.window_id) == gs_dfbWindowsMap.end() ) { wxLogTrace(TRACE_EVENTS, - _T("received event for unknown DirectFB window, ignoring")); + "received event for unknown DirectFB window, ignoring"); return; } @@ -465,12 +465,12 @@ void wxNonOwnedWindow::HandleDFBWindowEvent(const wxDFBWindowEvent& event_) if ( !recipient ) { wxLogTrace(TRACE_EVENTS, - _T("ignoring event: no recipient window")); + "ignoring event: no recipient window"); return; } wxCHECK_RET( recipient && recipient->GetTLW() == tlw, - _T("event recipient not in TLW which received the event") ); + "event recipient not in TLW which received the event" ); recipient->HandleKeyEvent(event_); break; @@ -486,7 +486,7 @@ void wxNonOwnedWindow::HandleDFBWindowEvent(const wxDFBWindowEvent& event_) case DWET_NONE: case DWET_ALL: - wxFAIL_MSG( _T("invalid event type") ); + wxFAIL_MSG( "invalid event type" ); break; default: diff --git a/src/dfb/overlay.cpp b/src/dfb/overlay.cpp index 6b7f4b2b30..80ee371efe 100644 --- a/src/dfb/overlay.cpp +++ b/src/dfb/overlay.cpp @@ -101,7 +101,7 @@ void wxOverlayImpl::EndDrawing(wxWindowDC *dc) void wxOverlayImpl::Clear(wxWindowDC *dc) { wxASSERT_MSG( IsOk(), - _T("You cannot Clear an overlay that is not initialized") ); + "You cannot Clear an overlay that is not initialized" ); m_isEmpty = true; } diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp index e2f1079d0a..799f99cf0c 100644 --- a/src/dfb/pen.cpp +++ b/src/dfb/pen.cpp @@ -42,7 +42,7 @@ public: { if ( style != wxSOLID && style != wxTRANSPARENT ) { - wxFAIL_MSG( _T("only wxSOLID and wxTRANSPARENT styles are supported") ); + wxFAIL_MSG( "only wxSOLID and wxTRANSPARENT styles are supported" ); style = wxSOLID; } @@ -61,14 +61,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) wxPen::wxPen(const wxColour &colour, int width, int style) { - wxASSERT_MSG( width <= 1, _T("only width=0,1 are supported") ); + wxASSERT_MSG( width <= 1, "only width=0,1 are supported" ); m_refData = new wxPenRefData(colour, style); } wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width)) { - wxFAIL_MSG( _T("stipple pens not supported") ); + wxFAIL_MSG( "stipple pens not supported" ); m_refData = new wxPenRefData(); } @@ -87,7 +87,7 @@ void wxPen::SetColour(const wxColour &colour) void wxPen::SetDashes(int WXUNUSED(number_of_dashes), const wxDash *WXUNUSED(dash)) { - wxFAIL_MSG( _T("SetDashes not implemented") ); + wxFAIL_MSG( "SetDashes not implemented" ); } void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue) @@ -98,12 +98,12 @@ void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue void wxPen::SetCap(int WXUNUSED(capStyle)) { - wxFAIL_MSG( _T("SetCap not implemented") ); + wxFAIL_MSG( "SetCap not implemented" ); } void wxPen::SetJoin(int WXUNUSED(joinStyle)) { - wxFAIL_MSG( _T("SetJoin not implemented") ); + wxFAIL_MSG( "SetJoin not implemented" ); } void wxPen::SetStyle(int style) @@ -114,17 +114,17 @@ void wxPen::SetStyle(int style) void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple)) { - wxFAIL_MSG( _T("SetStipple not implemented") ); + wxFAIL_MSG( "SetStipple not implemented" ); } void wxPen::SetWidth(int width) { - wxASSERT_MSG( width <= 1, _T("only width=0,1 are implemented") ); + wxASSERT_MSG( width <= 1, "only width=0,1 are implemented" ); } int wxPen::GetDashes(wxDash **ptr) const { - wxFAIL_MSG( _T("GetDashes not implemented") ); + wxFAIL_MSG( "GetDashes not implemented" ); *ptr = NULL; return 0; @@ -132,14 +132,14 @@ int wxPen::GetDashes(wxDash **ptr) const int wxPen::GetDashCount() const { - wxFAIL_MSG( _T("GetDashCount not implemented") ); + wxFAIL_MSG( "GetDashCount not implemented" ); return 0; } wxDash* wxPen::GetDash() const { - wxFAIL_MSG( _T("GetDash not implemented") ); + wxFAIL_MSG( "GetDash not implemented" ); return NULL; } @@ -148,7 +148,7 @@ int wxPen::GetCap() const { wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); - wxFAIL_MSG( _T("GetCap not implemented") ); + wxFAIL_MSG( "GetCap not implemented" ); return -1; } @@ -156,7 +156,7 @@ int wxPen::GetJoin() const { wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); - wxFAIL_MSG( _T("GetJoin not implemented") ); + wxFAIL_MSG( "GetJoin not implemented" ); return -1; } @@ -185,7 +185,7 @@ wxBitmap *wxPen::GetStipple() const { wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); - wxFAIL_MSG( _T("GetStipple not implemented") ); + wxFAIL_MSG( "GetStipple not implemented" ); return NULL; } diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp index a69c046869..f4bc68dcf9 100644 --- a/src/dfb/region.cpp +++ b/src/dfb/region.cpp @@ -142,20 +142,20 @@ bool wxRegion::DoUnionWithRect(const wxRect& rect) } else { - wxFAIL_MSG( _T("only rectangular regions are supported") ); + wxFAIL_MSG( "only rectangular regions are supported" ); return false; } } bool wxRegion::DoUnionWithRegion(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); + wxCHECK_MSG( region.Ok(), false, "invalid region" ); return DoUnionWithRect(M_REGION_OF(region)->m_rect); } bool wxRegion::DoIntersect(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); + wxCHECK_MSG( region.Ok(), false, "invalid region" ); AllocExclusive(); M_REGION->m_rect.Intersect(M_REGION_OF(region)->m_rect); @@ -164,8 +164,8 @@ bool wxRegion::DoIntersect(const wxRegion& region) bool wxRegion::DoSubtract(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); - wxCHECK_MSG( Ok(), false, _T("invalid region") ); + wxCHECK_MSG( region.Ok(), false, "invalid region" ); + wxCHECK_MSG( Ok(), false, "invalid region" ); const wxRect& rect = M_REGION_OF(region)->m_rect; @@ -183,15 +183,15 @@ bool wxRegion::DoSubtract(const wxRegion& region) } else { - wxFAIL_MSG( _T("only rectangular regions implemented") ); + wxFAIL_MSG( "only rectangular regions implemented" ); return false; } } bool wxRegion::DoXor(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); - wxFAIL_MSG( _T("Xor not implemented") ); + wxCHECK_MSG( region.Ok(), false, "invalid region" ); + wxFAIL_MSG( "Xor not implemented" ); return false; } @@ -202,7 +202,7 @@ bool wxRegion::DoXor(const wxRegion& region) wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const { - wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid region") ); + wxCHECK_MSG( Ok(), wxOutRegion, "invalid region" ); if (M_REGION->m_rect.Contains(x, y)) return wxInRegion; @@ -212,7 +212,7 @@ wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const { - wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid region") ); + wxCHECK_MSG( Ok(), wxOutRegion, "invalid region" ); // 1) is the rectangle entirely covered by the region? if (M_REGION->m_rect.Contains(rect)) diff --git a/src/dfb/settings.cpp b/src/dfb/settings.cpp index 8cd14600ba..2e1fe2058f 100644 --- a/src/dfb/settings.cpp +++ b/src/dfb/settings.cpp @@ -58,7 +58,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) } default: - wxFAIL_MSG( _T("unknown font type") ); + wxFAIL_MSG( "unknown font type" ); return wxNullFont; } } @@ -85,7 +85,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, #endif default: - wxFAIL_MSG( _T("unsupported metric") ); + wxFAIL_MSG( "unsupported metric" ); return -1; } } @@ -100,7 +100,7 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) return false; default: - wxFAIL_MSG( _T("unknown feature") ); + wxFAIL_MSG( "unknown feature" ); return false; } } diff --git a/src/dfb/toplevel.cpp b/src/dfb/toplevel.cpp index cb557cc2c3..cac71c9acb 100644 --- a/src/dfb/toplevel.cpp +++ b/src/dfb/toplevel.cpp @@ -19,7 +19,7 @@ #include "wx/dfb/private.h" -#define TRACE_EVENTS _T("events") +#define TRACE_EVENTS "events" // ============================================================================ // wxTopLevelWindowDFB @@ -179,9 +179,9 @@ void wxTopLevelWindowDFB::HandleFocusEvent(const wxDFBWindowEvent& event_) const bool activate = (dfbevent.type == DWET_GOTFOCUS); wxLogTrace(TRACE_EVENTS, - _T("toplevel window %p ('%s') %s focus"), + "toplevel window %p ('%s') %s focus", this, GetName(), - activate ? _T("got") : _T("lost")); + activate ? "got" : "lost"); wxActivateEvent event(wxEVT_ACTIVATE, activate, GetId()); event.SetEventObject(this); @@ -195,7 +195,7 @@ void wxTopLevelWindowDFB::HandleFocusEvent(const wxDFBWindowEvent& event_) if ( !focused || focused->GetTLW() != this ) { wxLogTrace(TRACE_EVENTS, - _T("setting wx focus to toplevel window %p ('%s')"), + "setting wx focus to toplevel window %p ('%s')", this, GetName()); if ( CanAcceptFocus() ) diff --git a/src/dfb/utils.cpp b/src/dfb/utils.cpp index 385616fb95..3e201ae40c 100644 --- a/src/dfb/utils.cpp +++ b/src/dfb/utils.cpp @@ -116,7 +116,7 @@ wxPoint wxGetMousePosition() bool wxGetKeyState(wxKeyCode key) { wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != WXK_MBUTTON, - _T("can't use wxGetKeyState() for mouse buttons")); + "can't use wxGetKeyState() for mouse buttons"); return false; // FIXME } @@ -131,6 +131,6 @@ void wxBell() int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) { - wxFAIL_MSG( _T("wxAddProcessCallback not implemented") ); + wxFAIL_MSG( "wxAddProcessCallback not implemented" ); return 0; } diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp index 9e33f696c7..40e8fddbee 100644 --- a/src/dfb/window.cpp +++ b/src/dfb/window.cpp @@ -37,8 +37,8 @@ #include "wx/dfb/private.h" #include "wx/private/overlay.h" -#define TRACE_EVENTS _T("events") -#define TRACE_PAINT _T("paint") +#define TRACE_EVENTS "events" +#define TRACE_PAINT "paint" // =========================================================================== // implementation @@ -138,10 +138,10 @@ bool wxWindowDFB::Create(wxWindow *parent, wxIDirectFBSurfacePtr wxWindowDFB::ObtainDfbSurface() const { - wxCHECK_MSG( m_parent, NULL, _T("parentless window?") ); + wxCHECK_MSG( m_parent, NULL, "parentless window?" ); wxIDirectFBSurfacePtr parentSurface(m_parent->GetDfbSurface()); - wxCHECK_MSG( parentSurface, NULL, _T("invalid parent surface") ); + wxCHECK_MSG( parentSurface, NULL, "invalid parent surface" ); wxRect r(GetRect()); AdjustForParentClientOrigin(r.x, r.y, 0); @@ -155,7 +155,7 @@ wxIDirectFBSurfacePtr wxWindowDFB::GetDfbSurface() if ( !m_surface ) { m_surface = ObtainDfbSurface(); - wxASSERT_MSG( m_surface, _T("invalid DirectFB surface") ); + wxASSERT_MSG( m_surface, "invalid DirectFB surface" ); } return m_surface; @@ -224,7 +224,7 @@ void wxWindowDFB::SetFocus() void wxWindowDFB::DFBKillFocus() { wxCHECK_RET( gs_focusedWindow == this, - _T("killing focus on window that doesn't have it") ); + "killing focus on window that doesn't have it" ); gs_focusedWindow = NULL; @@ -269,13 +269,13 @@ bool wxWindowDFB::Show(bool show) // Raise the window to the top of the Z order void wxWindowDFB::Raise() { - wxFAIL_MSG( _T("Raise() not implemented") ); + wxFAIL_MSG( "Raise() not implemented" ); } // Lower the window to the bottom of the Z order void wxWindowDFB::Lower() { - wxFAIL_MSG( _T("Lower() not implemented") ); + wxFAIL_MSG( "Lower() not implemented" ); } void wxWindowDFB::DoCaptureMouse() @@ -338,7 +338,7 @@ void wxWindowDFB::WarpPointer(int x, int y) if ( y >= h ) y = h-1; wxIDirectFBDisplayLayerPtr layer(wxIDirectFB::Get()->GetDisplayLayer()); - wxCHECK_RET( layer, _T("no display layer") ); + wxCHECK_RET( layer, "no display layer" ); layer->WarpCursor(x, y); } @@ -350,7 +350,7 @@ bool wxWindowDFB::Reparent(wxWindowBase *parent) return false; #warning "implement this" - wxFAIL_MSG( _T("reparenting not yet implemented") ); + wxFAIL_MSG( "reparenting not yet implemented" ); return true; } @@ -374,7 +374,7 @@ void wxWindowDFB::DoGetPosition(int *x, int *y) const static wxPoint GetScreenPosOfClientOrigin(const wxWindowDFB *win) { - wxCHECK_MSG( win, wxPoint(0, 0), _T("no window provided") ); + wxCHECK_MSG( win, wxPoint(0, 0), "no window provided" ); wxPoint pt(win->GetPosition() + win->GetClientAreaOrigin()); @@ -612,7 +612,7 @@ void wxWindowDFB::DoRefreshWindow() void wxWindowDFB::DoRefreshRect(const wxRect& rect) { wxWindow *parent = GetParent(); - wxCHECK_RET( parent, _T("no parent") ); + wxCHECK_RET( parent, "no parent" ); // don't overlap outside of the window (NB: 'rect' is in window coords): wxRect r(rect); @@ -621,7 +621,7 @@ void wxWindowDFB::DoRefreshRect(const wxRect& rect) return; wxLogTrace(TRACE_PAINT, - _T("%p ('%s'): refresh rect [%i,%i,%i,%i]"), + "%p ('%s'): refresh rect [%i,%i,%i,%i]", this, GetName().c_str(), rect.x, rect.y, rect.GetRight(), rect.GetBottom()); @@ -653,7 +653,7 @@ void wxWindowDFB::Freeze() void wxWindowDFB::Thaw() { - wxASSERT_MSG( IsFrozen(), _T("Thaw() without matching Freeze()") ); + wxASSERT_MSG( IsFrozen(), "Thaw() without matching Freeze()" ); if ( --m_frozenness == 0 ) { @@ -664,10 +664,10 @@ void wxWindowDFB::Thaw() void wxWindowDFB::PaintWindow(const wxRect& rect) { - wxCHECK_RET( !IsFrozen() && IsShown(), _T("shouldn't be called") ); + wxCHECK_RET( !IsFrozen() && IsShown(), "shouldn't be called" ); wxLogTrace(TRACE_PAINT, - _T("%p ('%s'): painting region [%i,%i,%i,%i]"), + "%p ('%s'): painting region [%i,%i,%i,%i]", this, GetName().c_str(), rect.x, rect.y, rect.GetRight(), rect.GetBottom()); @@ -695,7 +695,7 @@ void wxWindowDFB::PaintWindow(const wxRect& rect) } else { - wxLogTrace(TRACE_PAINT, _T("%p ('%s'): not sending wxNcPaintEvent"), + wxLogTrace(TRACE_PAINT, "%p ('%s'): not sending wxNcPaintEvent", this, GetName().c_str()); } @@ -708,7 +708,7 @@ void wxWindowDFB::PaintWindow(const wxRect& rect) } else { - wxLogTrace(TRACE_PAINT, _T("%p ('%s'): not sending wxPaintEvent"), + wxLogTrace(TRACE_PAINT, "%p ('%s'): not sending wxPaintEvent", this, GetName().c_str()); } @@ -793,7 +793,7 @@ void wxWindowDFB::AddOverlay(wxOverlayImpl *overlay) void wxWindowDFB::RemoveOverlay(wxOverlayImpl *overlay) { - wxCHECK_RET( m_overlays, _T("no overlays to remove") ); + wxCHECK_RET( m_overlays, "no overlays to remove" ); m_overlays->Remove(overlay); @@ -958,7 +958,7 @@ static long GetTranslatedKeyCode(DFBInputDeviceKeyIdentifier key_id) case DIKI_KEYDEF_END: case DIKI_NUMBER_OF_KEYS: - wxFAIL_MSG( _T("invalid key_id value") ); + wxFAIL_MSG( "invalid key_id value" ); return 0; } @@ -1006,8 +1006,8 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_) const DFBWindowEvent& e = event_; wxLogTrace(TRACE_EVENTS, - _T("handling key %s event for window %p ('%s')"), - e.type == DWET_KEYUP ? _T("up") : _T("down"), + "handling key %s event for window %p ('%s')", + e.type == DWET_KEYUP ? "up" : "down", this, GetName().c_str()); // fill in wxKeyEvent fields: @@ -1090,6 +1090,6 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt) wxWindow* wxFindWindowAtPoint(const wxPoint& pt) { - wxFAIL_MSG( _T("wxFindWindowAtPoint not implemented") ); + wxFAIL_MSG( "wxFindWindowAtPoint not implemented" ); return NULL; } diff --git a/src/dfb/wrapdfb.cpp b/src/dfb/wrapdfb.cpp index f81fdb316c..e05ad09541 100644 --- a/src/dfb/wrapdfb.cpp +++ b/src/dfb/wrapdfb.cpp @@ -36,7 +36,7 @@ bool wxDfbCheckReturn(DFBResult code) // these are programming errors, assert: #define DFB_ASSERT(code) \ case code: \ - wxFAIL_MSG( _T("DirectFB error: ") _T(#code) ); \ + wxFAIL_MSG( "DirectFB error: " _T(#code) ); \ return false \ DFB_ASSERT(DFB_DEAD); @@ -140,7 +140,7 @@ wxIDirectFBSurface::CreateCompatible(const wxSize& sz, int flags) return NULL; } - wxCHECK_MSG( size.x > 0 && size.y > 0, NULL, _T("invalid size") ); + wxCHECK_MSG( size.x > 0 && size.y > 0, NULL, "invalid size" ); DFBSurfaceDescription desc; desc.flags = (DFBSurfaceDescriptionFlags)( -- 2.47.2