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

unused parameter warnings suppressed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-09-18 16:34:02 +00:00
parent 7d5af6fa6b
commit 284b4c8866
4 changed files with 282 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/bitmap.cpp
View File

@@ -51,12 +51,13 @@ wxMask::~wxMask()
if (m_bitmap) gdk_bitmap_unref( m_bitmap ); if (m_bitmap) gdk_bitmap_unref( m_bitmap );
} }
bool wxMask::Create( const wxBitmap& bitmap, const wxColour& colour ) bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
const wxColour& WXUNUSED(colour) )
{ {
if (m_bitmap) if (m_bitmap)
{ {
gdk_bitmap_unref( m_bitmap ); gdk_bitmap_unref( m_bitmap );
m_bitmap = (GdkBitmap*) NULL; m_bitmap = (GdkBitmap*) NULL;
} }
wxFAIL_MSG( _T("TODO") ); wxFAIL_MSG( _T("TODO") );
@@ -64,12 +65,13 @@ bool wxMask::Create( const wxBitmap& bitmap, const wxColour& colour )
return FALSE; return FALSE;
} }
bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) ) bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
int WXUNUSED(paletteIndex) )
{ {
if (m_bitmap) if (m_bitmap)
{ {
gdk_bitmap_unref( m_bitmap ); gdk_bitmap_unref( m_bitmap );
m_bitmap = (GdkBitmap*) NULL; m_bitmap = (GdkBitmap*) NULL;
} }
wxFAIL_MSG( _T("not implemented") ); wxFAIL_MSG( _T("not implemented") );
@@ -82,7 +84,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
if (m_bitmap) if (m_bitmap)
{ {
gdk_bitmap_unref( m_bitmap ); gdk_bitmap_unref( m_bitmap );
m_bitmap = (GdkBitmap*) NULL; m_bitmap = (GdkBitmap*) NULL;
} }
if (!bitmap.Ok()) return FALSE; if (!bitmap.Ok()) return FALSE;
@@ -333,7 +335,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal
if (type == wxBITMAP_TYPE_PNG) if (type == wxBITMAP_TYPE_PNG)
{ {
wxImage image( *this ); wxImage image( *this );
if (image.Ok()) return image.SaveFile( name, type ); if (image.Ok()) return image.SaveFile( name, type );
} }
return FALSE; return FALSE;

92
src/gtk/font.cpp
View File

@@ -305,13 +305,13 @@ void wxFont::Unshare()
{ {
if (!m_refData) if (!m_refData)
{ {
m_refData = new wxFontRefData(); m_refData = new wxFontRefData();
} }
else else
{ {
wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData); wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
UnRef(); UnRef();
m_refData = ref; m_refData = ref;
} }
} }
@@ -418,7 +418,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight, static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight,
bool underlined, const wxString &facename ) bool WXUNUSED(underlined), const wxString &facename )
{ {
wxChar *xfamily = (wxChar*) NULL; wxChar *xfamily = (wxChar*) NULL;
wxChar *xstyle = (wxChar*) NULL; wxChar *xstyle = (wxChar*) NULL;
@@ -430,8 +430,8 @@ static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight
case wxROMAN: xfamily = _T("times"); break; case wxROMAN: xfamily = _T("times"); break;
case wxMODERN: xfamily = _T("courier"); break; case wxMODERN: xfamily = _T("courier"); break;
case wxSWISS: xfamily = _T("helvetica"); break; case wxSWISS: xfamily = _T("helvetica"); break;
case wxTELETYPE: xfamily = _T("lucidatypewriter"); break; case wxTELETYPE: xfamily = _T("lucidatypewriter"); break;
case wxSCRIPT: xfamily = _T("utopia"); break; case wxSCRIPT: xfamily = _T("utopia"); break;
default: xfamily = _T("*"); default: xfamily = _T("*");
} }
@@ -440,10 +440,10 @@ static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight
wxSprintf( wxBuffer, _T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), facename.c_str() ); wxSprintf( wxBuffer, _T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), facename.c_str() );
GdkFont *test = gdk_font_load( wxConvCurrent->cWX2MB(wxBuffer) ); GdkFont *test = gdk_font_load( wxConvCurrent->cWX2MB(wxBuffer) );
if (test) if (test)
{ {
gdk_font_unref( test ); gdk_font_unref( test );
xfamily = WXSTRINGCAST facename; xfamily = WXSTRINGCAST facename;
} }
} }
switch (style) switch (style)
@@ -468,7 +468,7 @@ static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight
} }
static GdkFont *wxLoadQueryNearestFont( int point_size, int family, int style, int weight, static GdkFont *wxLoadQueryNearestFont( int point_size, int family, int style, int weight,
bool underlined, const wxString &facename ) bool underlined, const wxString &facename )
{ {
GdkFont *font = wxLoadQueryFont( point_size, family, style, weight, underlined, facename ); GdkFont *font = wxLoadQueryFont( point_size, family, style, weight, underlined, facename );
@@ -668,12 +668,12 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
{ {
strcpy(resource, prefix); strcpy(resource, prefix);
for (j = 0; j < count; j++) for (j = 0; j < count; j++)
{ {
// upon failure to find a matching fontname // upon failure to find a matching fontname
// in the default fonts above, we substitute more // in the default fonts above, we substitute more
// and more values by _ so that at last ScreenMyFontBoldNormal // and more values by _ so that at last ScreenMyFontBoldNormal
// would turn into Screen___ and this will then get // would turn into Screen___ and this will then get
// converted to -${ScreenDefaultBase}${ScreenStdSuffix} // converted to -${ScreenDefaultBase}${ScreenStdSuffix}
if (!(i & (1 << j))) if (!(i & (1 << j)))
strcat(resource, names[j]); strcat(resource, names[j]);
@@ -684,12 +684,12 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
// we previously search the Xt-resources here // we previously search the Xt-resources here
if (!internal) if (!internal)
{ {
defaults = font_defaults; defaults = font_defaults;
while (*defaults) while (*defaults)
{ {
if (!strcmp(*defaults, resource)) if (!strcmp(*defaults, resource))
{ {
internal = defaults[1]; internal = defaults[1];
break; break;
} }
@@ -701,22 +701,22 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
if (internal) if (internal)
{ {
if ((strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0) && if ((strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0) &&
(strcmp(names[0], "Default") != 0)) (strcmp(names[0], "Default") != 0))
{ {
// we did not find any font name in the standard list. // we did not find any font name in the standard list.
// this can (hopefully does) mean that someone supplied // this can (hopefully does) mean that someone supplied
// the facename in the wxFont constructor so we insert // the facename in the wxFont constructor so we insert
// it here // it here
strcpy( resource,"-*-" ); // any producer strcpy( resource,"-*-" ); // any producer
strcat( resource, names[0] ); // facename strcat( resource, names[0] ); // facename
strcat( resource, "${ScreenStdSuffix}" ); // add size params later on strcat( resource, "${ScreenStdSuffix}" ); // add size params later on
*v = copystring(resource); *v = copystring(resource);
} }
else else
{ {
*v = copystring(internal); *v = copystring(internal);
} }
} }
} }
@@ -727,7 +727,7 @@ wxSuffixMap::~wxSuffixMap()
for (k = 0; k < wxNUM_WEIGHTS; ++k) for (k = 0; k < wxNUM_WEIGHTS; ++k)
for (j = 0; j < wxNUM_STYLES; ++j) for (j = 0; j < wxNUM_STYLES; ++j)
if (map[k][j]) if (map[k][j])
{ {
delete[] map[k][j]; delete[] map[k][j];
map[k][j] = (char *) NULL; map[k][j] = (char *) NULL;
} }
@@ -743,16 +743,16 @@ void wxSuffixMap::Initialize(const char *resname, const char *devresname)
for (k = 0; k < wxNUM_WEIGHTS; k++) for (k = 0; k < wxNUM_WEIGHTS; k++)
{ {
switch (k) switch (k)
{ {
case wxWEIGHT_NORMAL: weight = "Medium"; break; case wxWEIGHT_NORMAL: weight = "Medium"; break;
case wxWEIGHT_LIGHT: weight = "Light"; break; case wxWEIGHT_LIGHT: weight = "Light"; break;
case wxWEIGHT_BOLD: case wxWEIGHT_BOLD:
default: weight = "Bold"; default: weight = "Bold";
} }
for (j = 0; j < wxNUM_STYLES; j++) for (j = 0; j < wxNUM_STYLES; j++)
{ {
switch (j) switch (j)
{ {
case wxSTYLE_NORMAL: style = "Straight"; break; case wxSTYLE_NORMAL: style = "Straight"; break;
case wxSTYLE_ITALIC: style = "Italic"; break; case wxSTYLE_ITALIC: style = "Italic"; break;
case wxSTYLE_SLANT: case wxSTYLE_SLANT:
@@ -770,15 +770,15 @@ found:
len = (v ? strlen(v) : 0); len = (v ? strlen(v) : 0);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
if (v[i] == '$' && ((v[i+1] == '[') || (v[i+1] == '{'))) if (v[i] == '$' && ((v[i+1] == '[') || (v[i+1] == '{')))
{ {
startpos = i; startpos = i;
closer = (v[i+1] == '[') ? ']' : '}'; closer = (v[i+1] == '[') ? ']' : '}';
++i; ++i;
} }
else if (v[i] == closer) else if (v[i] == closer)
{ {
int newstrlen; int newstrlen;
const char *r = (char *) NULL; bool delete_r = FALSE; const char *r = (char *) NULL; bool delete_r = FALSE;
char *name; char *name;
@@ -787,7 +787,7 @@ found:
v[i] = 0; v[i] = 0;
if (closer == '}') if (closer == '}')
{ {
int i, count, len; int i, count, len;
char **names; char **names;
@@ -801,7 +801,7 @@ found:
names[0] = name; names[0] = name;
for (i = 0, count = 1; i < len; i++) for (i = 0, count = 1; i < len; i++)
if (name[i] == ',') if (name[i] == ',')
{ {
names[count++] = name + i + 1; names[count++] = name + i + 1;
name[i] = 0; name[i] = 0;
} }
@@ -811,7 +811,7 @@ found:
delete[] names; delete[] names;
if (!r) if (!r)
{ {
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
if (!name[i]) if (!name[i])
name[i] = ','; name[i] = ',';

14
src/gtk1/bitmap.cpp
View File

@@ -51,12 +51,13 @@ wxMask::~wxMask()
if (m_bitmap) gdk_bitmap_unref( m_bitmap ); if (m_bitmap) gdk_bitmap_unref( m_bitmap );
} }
bool wxMask::Create( const wxBitmap& bitmap, const wxColour& colour ) bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
const wxColour& WXUNUSED(colour) )
{ {
if (m_bitmap) if (m_bitmap)
{ {
gdk_bitmap_unref( m_bitmap ); gdk_bitmap_unref( m_bitmap );
m_bitmap = (GdkBitmap*) NULL; m_bitmap = (GdkBitmap*) NULL;
} }
wxFAIL_MSG( _T("TODO") ); wxFAIL_MSG( _T("TODO") );
@@ -64,12 +65,13 @@ bool wxMask::Create( const wxBitmap& bitmap, const wxColour& colour )
return FALSE; return FALSE;
} }
bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) ) bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
int WXUNUSED(paletteIndex) )
{ {
if (m_bitmap) if (m_bitmap)
{ {
gdk_bitmap_unref( m_bitmap ); gdk_bitmap_unref( m_bitmap );
m_bitmap = (GdkBitmap*) NULL; m_bitmap = (GdkBitmap*) NULL;
} }
wxFAIL_MSG( _T("not implemented") ); wxFAIL_MSG( _T("not implemented") );
@@ -82,7 +84,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
if (m_bitmap) if (m_bitmap)
{ {
gdk_bitmap_unref( m_bitmap ); gdk_bitmap_unref( m_bitmap );
m_bitmap = (GdkBitmap*) NULL; m_bitmap = (GdkBitmap*) NULL;
} }
if (!bitmap.Ok()) return FALSE; if (!bitmap.Ok()) return FALSE;
@@ -333,7 +335,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal
if (type == wxBITMAP_TYPE_PNG) if (type == wxBITMAP_TYPE_PNG)
{ {
wxImage image( *this ); wxImage image( *this );
if (image.Ok()) return image.SaveFile( name, type ); if (image.Ok()) return image.SaveFile( name, type );
} }
return FALSE; return FALSE;

92
src/gtk1/font.cpp
View File

@@ -305,13 +305,13 @@ void wxFont::Unshare()
{ {
if (!m_refData) if (!m_refData)
{ {
m_refData = new wxFontRefData(); m_refData = new wxFontRefData();
} }
else else
{ {
wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData); wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
UnRef(); UnRef();
m_refData = ref; m_refData = ref;
} }
} }
@@ -418,7 +418,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight, static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight,
bool underlined, const wxString &facename ) bool WXUNUSED(underlined), const wxString &facename )
{ {
wxChar *xfamily = (wxChar*) NULL; wxChar *xfamily = (wxChar*) NULL;
wxChar *xstyle = (wxChar*) NULL; wxChar *xstyle = (wxChar*) NULL;
@@ -430,8 +430,8 @@ static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight
case wxROMAN: xfamily = _T("times"); break; case wxROMAN: xfamily = _T("times"); break;
case wxMODERN: xfamily = _T("courier"); break; case wxMODERN: xfamily = _T("courier"); break;
case wxSWISS: xfamily = _T("helvetica"); break; case wxSWISS: xfamily = _T("helvetica"); break;
case wxTELETYPE: xfamily = _T("lucidatypewriter"); break; case wxTELETYPE: xfamily = _T("lucidatypewriter"); break;
case wxSCRIPT: xfamily = _T("utopia"); break; case wxSCRIPT: xfamily = _T("utopia"); break;
default: xfamily = _T("*"); default: xfamily = _T("*");
} }
@@ -440,10 +440,10 @@ static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight
wxSprintf( wxBuffer, _T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), facename.c_str() ); wxSprintf( wxBuffer, _T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), facename.c_str() );
GdkFont *test = gdk_font_load( wxConvCurrent->cWX2MB(wxBuffer) ); GdkFont *test = gdk_font_load( wxConvCurrent->cWX2MB(wxBuffer) );
if (test) if (test)
{ {
gdk_font_unref( test ); gdk_font_unref( test );
xfamily = WXSTRINGCAST facename; xfamily = WXSTRINGCAST facename;
} }
} }
switch (style) switch (style)
@@ -468,7 +468,7 @@ static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight
} }
static GdkFont *wxLoadQueryNearestFont( int point_size, int family, int style, int weight, static GdkFont *wxLoadQueryNearestFont( int point_size, int family, int style, int weight,
bool underlined, const wxString &facename ) bool underlined, const wxString &facename )
{ {
GdkFont *font = wxLoadQueryFont( point_size, family, style, weight, underlined, facename ); GdkFont *font = wxLoadQueryFont( point_size, family, style, weight, underlined, facename );
@@ -668,12 +668,12 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
{ {
strcpy(resource, prefix); strcpy(resource, prefix);
for (j = 0; j < count; j++) for (j = 0; j < count; j++)
{ {
// upon failure to find a matching fontname // upon failure to find a matching fontname
// in the default fonts above, we substitute more // in the default fonts above, we substitute more
// and more values by _ so that at last ScreenMyFontBoldNormal // and more values by _ so that at last ScreenMyFontBoldNormal
// would turn into Screen___ and this will then get // would turn into Screen___ and this will then get
// converted to -${ScreenDefaultBase}${ScreenStdSuffix} // converted to -${ScreenDefaultBase}${ScreenStdSuffix}
if (!(i & (1 << j))) if (!(i & (1 << j)))
strcat(resource, names[j]); strcat(resource, names[j]);
@@ -684,12 +684,12 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
// we previously search the Xt-resources here // we previously search the Xt-resources here
if (!internal) if (!internal)
{ {
defaults = font_defaults; defaults = font_defaults;
while (*defaults) while (*defaults)
{ {
if (!strcmp(*defaults, resource)) if (!strcmp(*defaults, resource))
{ {
internal = defaults[1]; internal = defaults[1];
break; break;
} }
@@ -701,22 +701,22 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
if (internal) if (internal)
{ {
if ((strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0) && if ((strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0) &&
(strcmp(names[0], "Default") != 0)) (strcmp(names[0], "Default") != 0))
{ {
// we did not find any font name in the standard list. // we did not find any font name in the standard list.
// this can (hopefully does) mean that someone supplied // this can (hopefully does) mean that someone supplied
// the facename in the wxFont constructor so we insert // the facename in the wxFont constructor so we insert
// it here // it here
strcpy( resource,"-*-" ); // any producer strcpy( resource,"-*-" ); // any producer
strcat( resource, names[0] ); // facename strcat( resource, names[0] ); // facename
strcat( resource, "${ScreenStdSuffix}" ); // add size params later on strcat( resource, "${ScreenStdSuffix}" ); // add size params later on
*v = copystring(resource); *v = copystring(resource);
} }
else else
{ {
*v = copystring(internal); *v = copystring(internal);
} }
} }
} }
@@ -727,7 +727,7 @@ wxSuffixMap::~wxSuffixMap()
for (k = 0; k < wxNUM_WEIGHTS; ++k) for (k = 0; k < wxNUM_WEIGHTS; ++k)
for (j = 0; j < wxNUM_STYLES; ++j) for (j = 0; j < wxNUM_STYLES; ++j)
if (map[k][j]) if (map[k][j])
{ {
delete[] map[k][j]; delete[] map[k][j];
map[k][j] = (char *) NULL; map[k][j] = (char *) NULL;
} }
@@ -743,16 +743,16 @@ void wxSuffixMap::Initialize(const char *resname, const char *devresname)
for (k = 0; k < wxNUM_WEIGHTS; k++) for (k = 0; k < wxNUM_WEIGHTS; k++)
{ {
switch (k) switch (k)
{ {
case wxWEIGHT_NORMAL: weight = "Medium"; break; case wxWEIGHT_NORMAL: weight = "Medium"; break;
case wxWEIGHT_LIGHT: weight = "Light"; break; case wxWEIGHT_LIGHT: weight = "Light"; break;
case wxWEIGHT_BOLD: case wxWEIGHT_BOLD:
default: weight = "Bold"; default: weight = "Bold";
} }
for (j = 0; j < wxNUM_STYLES; j++) for (j = 0; j < wxNUM_STYLES; j++)
{ {
switch (j) switch (j)
{ {
case wxSTYLE_NORMAL: style = "Straight"; break; case wxSTYLE_NORMAL: style = "Straight"; break;
case wxSTYLE_ITALIC: style = "Italic"; break; case wxSTYLE_ITALIC: style = "Italic"; break;
case wxSTYLE_SLANT: case wxSTYLE_SLANT:
@@ -770,15 +770,15 @@ found:
len = (v ? strlen(v) : 0); len = (v ? strlen(v) : 0);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
if (v[i] == '$' && ((v[i+1] == '[') || (v[i+1] == '{'))) if (v[i] == '$' && ((v[i+1] == '[') || (v[i+1] == '{')))
{ {
startpos = i; startpos = i;
closer = (v[i+1] == '[') ? ']' : '}'; closer = (v[i+1] == '[') ? ']' : '}';
++i; ++i;
} }
else if (v[i] == closer) else if (v[i] == closer)
{ {
int newstrlen; int newstrlen;
const char *r = (char *) NULL; bool delete_r = FALSE; const char *r = (char *) NULL; bool delete_r = FALSE;
char *name; char *name;
@@ -787,7 +787,7 @@ found:
v[i] = 0; v[i] = 0;
if (closer == '}') if (closer == '}')
{ {
int i, count, len; int i, count, len;
char **names; char **names;
@@ -801,7 +801,7 @@ found:
names[0] = name; names[0] = name;
for (i = 0, count = 1; i < len; i++) for (i = 0, count = 1; i < len; i++)
if (name[i] == ',') if (name[i] == ',')
{ {
names[count++] = name + i + 1; names[count++] = name + i + 1;
name[i] = 0; name[i] = 0;
} }
@@ -811,7 +811,7 @@ found:
delete[] names; delete[] names;
if (!r) if (!r)
{ {
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
if (!name[i]) if (!name[i])
name[i] = ','; name[i] = ',';