getting rid of warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
5115c51a82
commit
7af79c94e6
@ -76,7 +76,6 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
|
|||||||
|
|
||||||
int x = 0 ;
|
int x = 0 ;
|
||||||
|
|
||||||
int i = 0 ;
|
|
||||||
bool linedrawn = true;
|
bool linedrawn = true;
|
||||||
while( paragraph.Length() > 0 )
|
while( paragraph.Length() > 0 )
|
||||||
{
|
{
|
||||||
@ -157,7 +156,7 @@ void wxStaticText::OnDraw( wxDC &dc )
|
|||||||
}
|
}
|
||||||
|
|
||||||
wxString paragraph;
|
wxString paragraph;
|
||||||
int i = 0 ;
|
size_t i = 0 ;
|
||||||
wxString text = m_label;
|
wxString text = m_label;
|
||||||
int y = 0 ;
|
int y = 0 ;
|
||||||
while (i < text.Length())
|
while (i < text.Length())
|
||||||
|
@ -202,7 +202,7 @@ bool wxToolBar::Realize()
|
|||||||
while (node)
|
while (node)
|
||||||
{
|
{
|
||||||
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
|
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
|
||||||
wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
|
// wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
|
||||||
|
|
||||||
if( !tool->IsSeparator() )
|
if( !tool->IsSeparator() )
|
||||||
{
|
{
|
||||||
@ -328,7 +328,7 @@ wxSize wxToolBar::GetToolSize() const
|
|||||||
|
|
||||||
void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
|
void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
|
||||||
{
|
{
|
||||||
int index = 0 ;
|
size_t index = 0 ;
|
||||||
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
||||||
{
|
{
|
||||||
if ( m_macToolHandles[index] == (void*) control )
|
if ( m_macToolHandles[index] == (void*) control )
|
||||||
@ -394,7 +394,7 @@ void wxToolBar::MacSuperChangedPosition()
|
|||||||
while (node)
|
while (node)
|
||||||
{
|
{
|
||||||
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
|
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
|
||||||
wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
|
// wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
|
||||||
|
|
||||||
if( !tool->IsSeparator() )
|
if( !tool->IsSeparator() )
|
||||||
{
|
{
|
||||||
@ -479,7 +479,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
|
|||||||
MacClientToRootWindow( &x , &y ) ;
|
MacClientToRootWindow( &x , &y ) ;
|
||||||
Point pt = { y ,x } ;
|
Point pt = { y ,x } ;
|
||||||
|
|
||||||
int index = 0 ;
|
size_t index = 0 ;
|
||||||
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
||||||
{
|
{
|
||||||
if ( m_macToolHandles[index] )
|
if ( m_macToolHandles[index] )
|
||||||
@ -566,7 +566,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
|
|||||||
dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
|
dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
|
||||||
UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
|
UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
|
||||||
{
|
{
|
||||||
int index = 0 ;
|
size_t index = 0 ;
|
||||||
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
||||||
{
|
{
|
||||||
if ( m_macToolHandles[index] )
|
if ( m_macToolHandles[index] )
|
||||||
|
@ -76,7 +76,6 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
|
|||||||
|
|
||||||
int x = 0 ;
|
int x = 0 ;
|
||||||
|
|
||||||
int i = 0 ;
|
|
||||||
bool linedrawn = true;
|
bool linedrawn = true;
|
||||||
while( paragraph.Length() > 0 )
|
while( paragraph.Length() > 0 )
|
||||||
{
|
{
|
||||||
@ -157,7 +156,7 @@ void wxStaticText::OnDraw( wxDC &dc )
|
|||||||
}
|
}
|
||||||
|
|
||||||
wxString paragraph;
|
wxString paragraph;
|
||||||
int i = 0 ;
|
size_t i = 0 ;
|
||||||
wxString text = m_label;
|
wxString text = m_label;
|
||||||
int y = 0 ;
|
int y = 0 ;
|
||||||
while (i < text.Length())
|
while (i < text.Length())
|
||||||
|
@ -202,7 +202,7 @@ bool wxToolBar::Realize()
|
|||||||
while (node)
|
while (node)
|
||||||
{
|
{
|
||||||
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
|
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
|
||||||
wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
|
// wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
|
||||||
|
|
||||||
if( !tool->IsSeparator() )
|
if( !tool->IsSeparator() )
|
||||||
{
|
{
|
||||||
@ -328,7 +328,7 @@ wxSize wxToolBar::GetToolSize() const
|
|||||||
|
|
||||||
void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
|
void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
|
||||||
{
|
{
|
||||||
int index = 0 ;
|
size_t index = 0 ;
|
||||||
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
||||||
{
|
{
|
||||||
if ( m_macToolHandles[index] == (void*) control )
|
if ( m_macToolHandles[index] == (void*) control )
|
||||||
@ -394,7 +394,7 @@ void wxToolBar::MacSuperChangedPosition()
|
|||||||
while (node)
|
while (node)
|
||||||
{
|
{
|
||||||
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
|
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
|
||||||
wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
|
// wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
|
||||||
|
|
||||||
if( !tool->IsSeparator() )
|
if( !tool->IsSeparator() )
|
||||||
{
|
{
|
||||||
@ -479,7 +479,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
|
|||||||
MacClientToRootWindow( &x , &y ) ;
|
MacClientToRootWindow( &x , &y ) ;
|
||||||
Point pt = { y ,x } ;
|
Point pt = { y ,x } ;
|
||||||
|
|
||||||
int index = 0 ;
|
size_t index = 0 ;
|
||||||
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
||||||
{
|
{
|
||||||
if ( m_macToolHandles[index] )
|
if ( m_macToolHandles[index] )
|
||||||
@ -566,7 +566,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
|
|||||||
dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
|
dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
|
||||||
UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
|
UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
|
||||||
{
|
{
|
||||||
int index = 0 ;
|
size_t index = 0 ;
|
||||||
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
|
||||||
{
|
{
|
||||||
if ( m_macToolHandles[index] )
|
if ( m_macToolHandles[index] )
|
||||||
|
Loading…
Reference in New Issue
Block a user