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

Second part of '[ 1216148 ] cleanup: unused variables and declarations'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-06-08 14:32:16 +00:00
parent ec4b529041
commit 963ad140d0
4 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/string.h
View File

@@ -1185,7 +1185,7 @@ public:
{ return (wxString&)wxStringBase::assign(first, last); } { return (wxString&)wxStringBase::assign(first, last); }
// string comparison // string comparison
#if !defined(HAVE_STD_STRING_COMPARE) #if !defined(HAVE_STD_STRING_COMPARE)
int compare(const wxStringBase& str) const; int compare(const wxStringBase& str) const;
// comparison with a substring // comparison with a substring
int compare(size_t nStart, size_t nLen, const wxStringBase& str) const; 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); } { return (s2.Cmp((const char *)s1) != 0); }
#endif // wxUSE_UNICODE/!wxUSE_UNICODE #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 #if wxUSE_UNICODE
inline wxString operator+(const wxString& string, const wxWCharBuffer& buf) inline wxString operator+(const wxString& string, const wxWCharBuffer& buf)
{ return string + (const wchar_t *)buf; } { return string + (const wchar_t *)buf; }

5
src/common/filefn.cpp
View File

@@ -56,11 +56,6 @@
#include "wx/log.h" #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__ #ifdef __WINDOWS__
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include "wx/msw/mslu.h" #include "wx/msw/mslu.h"

5
src/common/imagtiff.cpp
View File

@@ -394,8 +394,6 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,TIFFDefaultStripSize(tif, (uint32) -1)); TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,TIFFDefaultStripSize(tif, (uint32) -1));
uint8 bitmask;
unsigned char *ptr = image->GetData(); unsigned char *ptr = image->GetData();
for ( int row = 0; row < image->GetHeight(); row++ ) 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++ ) for ( int column = 0; column < linebytes; column++ )
{ {
uint8 reverse = 0; uint8 reverse = 0;
bitmask = 1;
for ( int bp = 0; bp < 8; bp++ ) for ( int bp = 0; bp < 8; bp++ )
{ {
if ( ptr[column*24 + bp*3] > 0 ) 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 // check only red as this is sufficient
reverse = reverse | 128 >> bp; reverse = reverse | 128 >> bp;
} }
bitmask <<= 1;
} }
buf[column] = reverse; buf[column] = reverse;

1
src/common/intl.cpp
View File

@@ -496,7 +496,6 @@ public:
~wxPluralFormsCalculator() {} ~wxPluralFormsCalculator() {}
void init(wxPluralFormsToken::Number nplurals, wxPluralFormsNode* plural); void init(wxPluralFormsToken::Number nplurals, wxPluralFormsNode* plural);
wxString getString() const;
private: private:
wxPluralFormsToken::Number m_nplurals; wxPluralFormsToken::Number m_nplurals;