unused param warning suppressed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -285,7 +285,7 @@ public:
|
|||||||
bool GetExtensions(wxArrayString& extensions);
|
bool GetExtensions(wxArrayString& extensions);
|
||||||
bool GetMimeType(wxString *mimeType) const
|
bool GetMimeType(wxString *mimeType) const
|
||||||
{ *mimeType = m_manager->m_aTypes[m_index]; return TRUE; }
|
{ *mimeType = m_manager->m_aTypes[m_index]; return TRUE; }
|
||||||
bool GetIcon(wxIcon *icon) const
|
bool GetIcon(wxIcon * WXUNUSED(icon)) const
|
||||||
{ return FALSE; } // @@ maybe with Gnome/KDE integration...
|
{ return FALSE; } // @@ maybe with Gnome/KDE integration...
|
||||||
bool GetDescription(wxString *desc) const
|
bool GetDescription(wxString *desc) const
|
||||||
{ *desc = m_manager->m_aDescriptions[m_index]; return TRUE; }
|
{ *desc = m_manager->m_aDescriptions[m_index]; return TRUE; }
|
||||||
|
@@ -89,7 +89,7 @@ wxToolBarTool::wxToolBarTool(int theIndex,
|
|||||||
m_longHelpString = helpS2;
|
m_longHelpString = helpS2;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxToolBarTool::~wxToolBarTool(void)
|
wxToolBarTool::~wxToolBarTool()
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
if (m_deleteSecondBitmap && m_bitmap2)
|
if (m_deleteSecondBitmap && m_bitmap2)
|
||||||
@@ -153,7 +153,9 @@ bool wxToolBarBase::OnLeftClick(int toolIndex, bool toggleDown)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Call when right button down.
|
// Call when right button down.
|
||||||
void wxToolBarBase::OnRightClick(int toolIndex, long x, long y)
|
void wxToolBarBase::OnRightClick(int toolIndex,
|
||||||
|
long WXUNUSED(x),
|
||||||
|
long WXUNUSED(y))
|
||||||
{
|
{
|
||||||
wxCommandEvent event(wxEVT_COMMAND_TOOL_RCLICKED, toolIndex);
|
wxCommandEvent event(wxEVT_COMMAND_TOOL_RCLICKED, toolIndex);
|
||||||
event.SetEventObject(this);
|
event.SetEventObject(this);
|
||||||
@@ -219,7 +221,7 @@ void wxToolBarBase::AddSeparator ()
|
|||||||
m_tools.Append(-1, tool);
|
m_tools.Append(-1, tool);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxToolBarBase::ClearTools(void)
|
void wxToolBarBase::ClearTools()
|
||||||
{
|
{
|
||||||
m_pressedTool = m_currentTool = -1;
|
m_pressedTool = m_currentTool = -1;
|
||||||
wxNode *node = m_tools.First();
|
wxNode *node = m_tools.First();
|
||||||
@@ -244,7 +246,8 @@ void wxToolBarBase::EnableTool(int index, bool enable)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxToolBarBase::ToggleTool(int index, bool toggle)
|
void wxToolBarBase::ToggleTool(int WXUNUSED(index),
|
||||||
|
bool WXUNUSED(toggle))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -387,11 +390,11 @@ void wxToolBarBase::SetToolSeparation(int separation)
|
|||||||
m_toolSeparation = separation;
|
m_toolSeparation = separation;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxToolBarBase::Command(wxCommandEvent& event)
|
void wxToolBarBase::Command(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxToolBarBase::Layout(void)
|
void wxToolBarBase::Layout()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -589,7 +592,7 @@ int wxToolBarBase::CalcScrollInc(wxScrollEvent& event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Adjust the scrollbars - new version.
|
// Adjust the scrollbars - new version.
|
||||||
void wxToolBarBase::AdjustScrollbars(void)
|
void wxToolBarBase::AdjustScrollbars()
|
||||||
{
|
{
|
||||||
int w, h;
|
int w, h;
|
||||||
GetClientSize(&w, &h);
|
GetClientSize(&w, &h);
|
||||||
@@ -634,7 +637,7 @@ void wxToolBarBase::AdjustScrollbars(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Default OnSize resets scrollbars, if any
|
// Default OnSize resets scrollbars, if any
|
||||||
void wxToolBarBase::OnSize(wxSizeEvent& event)
|
void wxToolBarBase::OnSize(wxSizeEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
#if wxUSE_CONSTRAINTS
|
#if wxUSE_CONSTRAINTS
|
||||||
if (GetAutoLayout())
|
if (GetAutoLayout())
|
||||||
@@ -717,7 +720,7 @@ void wxToolBarBase::ViewStart (int *x, int *y) const
|
|||||||
*y = m_yScrollPosition;
|
*y = m_yScrollPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxToolBarBase::OnIdle(wxIdleEvent& event)
|
void wxToolBarBase::OnIdle(wxIdleEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
#ifndef __WXGTK__
|
#ifndef __WXGTK__
|
||||||
wxWindow::OnIdle(event);
|
wxWindow::OnIdle(event);
|
||||||
@@ -727,7 +730,7 @@ void wxToolBarBase::OnIdle(wxIdleEvent& event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
|
// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
|
||||||
void wxToolBarBase::DoToolbarUpdates(void)
|
void wxToolBarBase::DoToolbarUpdates()
|
||||||
{
|
{
|
||||||
wxNode* node = GetTools().First();
|
wxNode* node = GetTools().First();
|
||||||
while (node)
|
while (node)
|
||||||
|
Reference in New Issue
Block a user