unused parameter warning fixes for --disable-all-features build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
66d0513058
commit
8d22935dcb
@ -192,7 +192,9 @@ wxSizer *wxDialogBase::CreateButtonSizer(long flags)
|
||||
{
|
||||
sizer = CreateStdDialogButtonSizer(flags);
|
||||
}
|
||||
#endif // wxUSE_BUTTON
|
||||
#else // !wxUSE_BUTTON
|
||||
wxUnusedVar(flags);
|
||||
#endif // wxUSE_BUTTON/!wxUSE_BUTTON
|
||||
|
||||
#endif // __SMARTPHONE__/!__SMARTPHONE__
|
||||
|
||||
|
@ -133,6 +133,8 @@ bool wxFrameBase::IsOneOfBars(const wxWindow *win) const
|
||||
return true;
|
||||
#endif // wxUSE_TOOLBAR
|
||||
|
||||
wxUnusedVar(win);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -212,6 +214,8 @@ bool wxFrameBase::ProcessCommand(int id)
|
||||
GetEventHandler()->ProcessEvent(commandEvent);
|
||||
return true;
|
||||
#else // !wxUSE_MENUS
|
||||
wxUnusedVar(id);
|
||||
|
||||
return false;
|
||||
#endif // wxUSE_MENUS/!wxUSE_MENUS
|
||||
}
|
||||
|
@ -1242,13 +1242,19 @@ wxFindWindowByName (const wxString& name, wxWindow * parent)
|
||||
|
||||
// Returns menu item id or wxNOT_FOUND if none.
|
||||
int
|
||||
wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
|
||||
wxFindMenuItemId(wxFrame *frame,
|
||||
const wxString& menuString,
|
||||
const wxString& itemString)
|
||||
{
|
||||
#if wxUSE_MENUS
|
||||
wxMenuBar *menuBar = frame->GetMenuBar ();
|
||||
if ( menuBar )
|
||||
return menuBar->FindMenuItem (menuString, itemString);
|
||||
#endif // wxUSE_MENUS
|
||||
#else // !wxUSE_MENUS
|
||||
wxUnusedVar(frame);
|
||||
wxUnusedVar(menuString);
|
||||
wxUnusedVar(itemString);
|
||||
#endif // wxUSE_MENUS/!wxUSE_MENUS
|
||||
|
||||
return wxNOT_FOUND;
|
||||
}
|
||||
|
@ -701,6 +701,9 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett
|
||||
wxImage image = ConvertToImage();
|
||||
return image.Ok() && image.SaveFile(name, type);
|
||||
#else // !wxUSE_IMAGE
|
||||
wxUnusedVar(name);
|
||||
wxUnusedVar(type);
|
||||
|
||||
return false;
|
||||
#endif // wxUSE_IMAGE
|
||||
}
|
||||
|
@ -469,6 +469,11 @@ bool wxGTKWindowImplDC::DoFloodFill(wxCoord x, wxCoord y,
|
||||
|
||||
return wxDoFloodFill( GetOwner(), x, y, col, style);
|
||||
#else
|
||||
wxUnusedVar(x);
|
||||
wxUnusedVar(y);
|
||||
wxUnusedVar(col);
|
||||
wxUnusedVar(style);
|
||||
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
@ -488,6 +493,10 @@ bool wxGTKWindowImplDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) cons
|
||||
col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
|
||||
return true;
|
||||
#else // !wxUSE_IMAGE
|
||||
wxUnusedVar(x1);
|
||||
wxUnusedVar(y1);
|
||||
wxUnusedVar(col);
|
||||
|
||||
return false;
|
||||
#endif // wxUSE_IMAGE/!wxUSE_IMAGE
|
||||
}
|
||||
@ -1736,7 +1745,12 @@ void wxGTKWindowImplDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCo
|
||||
// update the bounding box
|
||||
CalcBoundingBox(x + minX, y + minY);
|
||||
CalcBoundingBox(x + maxX, y + maxY);
|
||||
#endif // wxUSE_IMAGE
|
||||
#else // !wxUSE_IMAGE
|
||||
wxUnusedVar(text);
|
||||
wxUnusedVar(x);
|
||||
wxUnusedVar(y);
|
||||
wxUnusedVar(angle);
|
||||
#endif // wxUSE_IMAGE/!wxUSE_IMAGE
|
||||
}
|
||||
|
||||
void wxGTKWindowImplDC::DoGetTextExtent(const wxString &string,
|
||||
|
@ -316,9 +316,11 @@ bool wxNativeFontInfo::FromString(const wxString& s)
|
||||
|
||||
description = pango_font_description_from_string(wxPANGO_CONV(str));
|
||||
|
||||
#if wxUSE_FONTENUM
|
||||
// ensure a valid facename is selected
|
||||
if (!wxFontEnumerator::IsValidFacename(GetFaceName()))
|
||||
SetFaceName(wxNORMAL_FONT->GetFaceName());
|
||||
#endif // wxUSE_FONTENUM
|
||||
|
||||
return true;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user