From 963ad140d0bc0a86df7cab700076a8d6192fc64c Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 8 Jun 2005 14:32:16 +0000 Subject: [PATCH] Second part of '[ 1216148 ] cleanup: unused variables and declarations'. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/string.h | 8 +------- src/common/filefn.cpp | 5 ----- src/common/imagtiff.cpp | 5 ----- src/common/intl.cpp | 1 - 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/include/wx/string.h b/include/wx/string.h index f55ac3032b..d39b0c9188 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -1185,7 +1185,7 @@ public: { return (wxString&)wxStringBase::assign(first, last); } // string comparison -#if !defined(HAVE_STD_STRING_COMPARE) +#if !defined(HAVE_STD_STRING_COMPARE) int compare(const wxStringBase& str) const; // comparison with a substring int compare(size_t nStart, size_t nLen, const wxStringBase& str) const; @@ -1463,12 +1463,6 @@ inline bool operator!=(const wxCharBuffer& s1, const wxString& s2) { return (s2.Cmp((const char *)s1) != 0); } #endif // wxUSE_UNICODE/!wxUSE_UNICODE -wxString WXDLLIMPEXP_BASE operator+(const wxString& string1, const wxString& string2); -wxString WXDLLIMPEXP_BASE operator+(const wxString& string, wxChar ch); -wxString WXDLLIMPEXP_BASE operator+(wxChar ch, const wxString& string); -wxString WXDLLIMPEXP_BASE operator+(const wxString& string, const wxChar *psz); -wxString WXDLLIMPEXP_BASE operator+(const wxChar *psz, const wxString& string); - #if wxUSE_UNICODE inline wxString operator+(const wxString& string, const wxWCharBuffer& buf) { return string + (const wchar_t *)buf; } diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index ed73e4bd70..e7b88ffe93 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -56,11 +56,6 @@ #include "wx/log.h" -// No, Cygwin doesn't appear to have fnmatch.h after all. -#if defined(HAVE_FNMATCH_H) - #include "fnmatch.h" -#endif - #ifdef __WINDOWS__ #include "wx/msw/private.h" #include "wx/msw/mslu.h" diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index 71da4fdfb3..5fab2afced 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -394,8 +394,6 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,TIFFDefaultStripSize(tif, (uint32) -1)); - uint8 bitmask; - unsigned char *ptr = image->GetData(); for ( int row = 0; row < image->GetHeight(); row++ ) { @@ -411,7 +409,6 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo for ( int column = 0; column < linebytes; column++ ) { uint8 reverse = 0; - bitmask = 1; for ( int bp = 0; bp < 8; bp++ ) { if ( ptr[column*24 + bp*3] > 0 ) @@ -419,8 +416,6 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo // check only red as this is sufficient reverse = reverse | 128 >> bp; } - - bitmask <<= 1; } buf[column] = reverse; diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 240b838f0b..7d449cea28 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -496,7 +496,6 @@ public: ~wxPluralFormsCalculator() {} void init(wxPluralFormsToken::Number nplurals, wxPluralFormsNode* plural); - wxString getString() const; private: wxPluralFormsToken::Number m_nplurals; -- 2.45.2