From 311efa37594763170cfe7327f92f4dd3fae7dd64 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Wed, 23 Nov 2016 20:24:36 +0000 Subject: [PATCH] Fix compilation with wxWidgets 2.8.12 wxWidgets-2.8 wxCharBuffer does not have a length() member function. However, both 2.8 and 3.0 will have data() == NULL if the conversion failed, thus it is enough to check data() for the conversion result. --- .svn-revision | 2 +- src/libs/common/Path.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.svn-revision b/.svn-revision index 762fd055..ae2ecbd9 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -10980 +10981 diff --git a/src/libs/common/Path.cpp b/src/libs/common/Path.cpp index 5efefd03..28152a23 100644 --- a/src/libs/common/Path.cpp +++ b/src/libs/common/Path.cpp @@ -229,7 +229,7 @@ CPath::CPath(const wxString& filename) } wxCharBuffer fn = filename2char(filename); - if (fn.data() && fn.length()) { + if (fn.data()) { // Filename is valid in the current locale. This means that // it either originated from a (wx)system-call, or from a // user with a properly setup system. -- 2.11.4.GIT