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

removed the warnings from HP-UX build log

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-07-26 16:09:16 +00:00
parent e1f35294c9
commit a6f8c30c69
7 changed files with 188 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/fontmap.cpp
View File

@@ -403,6 +403,15 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
// if didn't find it there, try to reckognise it ourselves // if didn't find it there, try to reckognise it ourselves
if ( encoding == wxFONTENCODING_SYSTEM ) if ( encoding == wxFONTENCODING_SYSTEM )
{ {
// discard the optional quotes
if ( !!cs )
{
if ( cs[0u] == _T('"') && cs.Last() == _T('"') )
{
cs = wxString(cs.c_str(), cs.length() - 1);
}
}
cs.MakeUpper(); cs.MakeUpper();
if ( !cs || cs == wxT("US-ASCII") ) if ( !cs || cs == wxT("US-ASCII") )

8
src/common/hash.cpp
View File

@@ -104,7 +104,7 @@ void wxHashTableBase::DeleteContents(bool flag)
wxNodeBase *wxHashTableBase::GetNode(long key, long value) const wxNodeBase *wxHashTableBase::GetNode(long key, long value) const
{ {
size_t slot = (size_t)abs(key % (long)m_hashSize); size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
wxNodeBase *node; wxNodeBase *node;
if ( m_hashTable[slot] ) if ( m_hashTable[slot] )
@@ -161,7 +161,7 @@ void wxHashTableLong::Put(long key, long value)
{ {
wxCHECK_RET( m_hashSize, _T("must call Create() first") ); wxCHECK_RET( m_hashSize, _T("must call Create() first") );
size_t slot = (size_t)abs(key % (long)m_hashSize); size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
if ( !m_keys[slot] ) if ( !m_keys[slot] )
{ {
@@ -179,7 +179,7 @@ long wxHashTableLong::Get(long key) const
{ {
wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") ); wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
size_t slot = (size_t)abs(key % (long)m_hashSize); size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
wxArrayLong *keys = m_keys[slot]; wxArrayLong *keys = m_keys[slot];
if ( keys ) if ( keys )
@@ -201,7 +201,7 @@ long wxHashTableLong::Delete(long key)
{ {
wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") ); wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
size_t slot = (size_t)abs(key % (long)m_hashSize); size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
wxArrayLong *keys = m_keys[slot]; wxArrayLong *keys = m_keys[slot];
if ( keys ) if ( keys )

2
src/common/image.cpp
View File

@@ -314,7 +314,7 @@ wxImage wxImage::Mirror( bool horizontally ) const
for (long i = 0; i < height; i++) for (long i = 0; i < height; i++)
{ {
target_data = data + 3*width*(height-1-i); target_data = data + 3*width*(height-1-i);
memcpy( target_data, source_data, 3*width ); memcpy( target_data, source_data, (size_t)3*width );
source_data += 3*width; source_data += 3*width;
} }
} }

236
src/common/sizer.cpp
View File

@@ -298,11 +298,11 @@ bool wxSizer::Remove( wxWindow *window )
while (node) while (node)
{ {
wxSizerItem *item = (wxSizerItem*)node->Data(); wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetWindow() == window) if (item->GetWindow() == window)
{ {
m_children.DeleteNode( node ); m_children.DeleteNode( node );
return TRUE; return TRUE;
} }
node = node->Next(); node = node->Next();
} }
@@ -317,11 +317,11 @@ bool wxSizer::Remove( wxSizer *sizer )
while (node) while (node)
{ {
wxSizerItem *item = (wxSizerItem*)node->Data(); wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetSizer() == sizer) if (item->GetSizer() == sizer)
{ {
m_children.DeleteNode( node ); m_children.DeleteNode( node );
return TRUE; return TRUE;
} }
node = node->Next(); node = node->Next();
} }
@@ -396,11 +396,11 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
while (node) while (node)
{ {
wxSizerItem *item = (wxSizerItem*)node->Data(); wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetWindow() == window) if (item->GetWindow() == window)
{ {
item->SetInitSize( width, height ); item->SetInitSize( width, height );
return TRUE; return TRUE;
} }
node = node->Next(); node = node->Next();
} }
@@ -408,15 +408,15 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
while (node) while (node)
{ {
wxSizerItem *item = (wxSizerItem*)node->Data(); wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetSizer()) if (item->GetSizer())
{ {
/* It's a sizer, so lets search recursively. */ /* It's a sizer, so lets search recursively. */
if (item->GetSizer()->DoSetItemMinSize( window, width, height )) if (item->GetSizer()->DoSetItemMinSize( window, width, height ))
{ {
/* A child sizer found the requested windw, exit. */ /* A child sizer found the requested windw, exit. */
return TRUE; return TRUE;
} }
} }
node = node->Next(); node = node->Next();
} }
@@ -431,11 +431,11 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
while (node) while (node)
{ {
wxSizerItem *item = (wxSizerItem*)node->Data(); wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetSizer() == sizer) if (item->GetSizer() == sizer)
{ {
item->GetSizer()->DoSetMinSize( width, height ); item->GetSizer()->DoSetMinSize( width, height );
return TRUE; return TRUE;
} }
node = node->Next(); node = node->Next();
} }
@@ -443,15 +443,15 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
while (node) while (node)
{ {
wxSizerItem *item = (wxSizerItem*)node->Data(); wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetSizer()) if (item->GetSizer())
{ {
/* It's a sizer, so lets search recursively. */ /* It's a sizer, so lets search recursively. */
if (item->GetSizer()->DoSetItemMinSize( sizer, width, height )) if (item->GetSizer()->DoSetItemMinSize( sizer, width, height ))
{ {
/* A child sizer found the requested windw, exit. */ /* A child sizer found the requested windw, exit. */
return TRUE; return TRUE;
} }
} }
node = node->Next(); node = node->Next();
} }
@@ -516,8 +516,8 @@ void wxGridSizer::RecalcSizes()
wxSize sz( GetSize() ); wxSize sz( GetSize() );
wxPoint pt( GetPosition() ); wxPoint pt( GetPosition() );
int w = (sz.x - (ncols - 1) * m_hgap) / ncols; int w = (sz.x - (ncols - 1) * m_hgap) / ncols;
int h = (sz.y - (nrows - 1) * m_vgap) / nrows; int h = (sz.y - (nrows - 1) * m_vgap) / nrows;
int x = pt.x; int x = pt.x;
for (int c = 0; c < ncols; c++) for (int c = 0; c < ncols; c++)
@@ -770,7 +770,7 @@ void wxFlexGridSizer::AddGrowableRow( size_t idx )
m_growableRows.Add( idx ); m_growableRows.Add( idx );
} }
void wxFlexGridSizer::RemoveGrowableRow( size_t idx ) void wxFlexGridSizer::RemoveGrowableRow( size_t WXUNUSED(idx) )
{ {
} }
@@ -779,7 +779,7 @@ void wxFlexGridSizer::AddGrowableCol( size_t idx )
m_growableCols.Add( idx ); m_growableCols.Add( idx );
} }
void wxFlexGridSizer::RemoveGrowableCol( size_t idx ) void wxFlexGridSizer::RemoveGrowableCol( size_t WXUNUSED(idx) )
{ {
} }
@@ -805,12 +805,12 @@ void wxBoxSizer::RecalcSizes()
{ {
delta = (m_size.x - m_fixedWidth) / m_stretchable; delta = (m_size.x - m_fixedWidth) / m_stretchable;
extra = (m_size.x - m_fixedWidth) % m_stretchable; extra = (m_size.x - m_fixedWidth) % m_stretchable;
} }
else else
{ {
delta = (m_size.y - m_fixedHeight) / m_stretchable; delta = (m_size.y - m_fixedHeight) / m_stretchable;
extra = (m_size.y - m_fixedHeight) % m_stretchable; extra = (m_size.y - m_fixedHeight) % m_stretchable;
} }
} }
wxPoint pt( m_position ); wxPoint pt( m_position );
@@ -820,64 +820,64 @@ void wxBoxSizer::RecalcSizes()
{ {
wxSizerItem *item = (wxSizerItem*) node->Data(); wxSizerItem *item = (wxSizerItem*) node->Data();
int weight = 1; int weight = 1;
if (item->GetOption()) if (item->GetOption())
weight = item->GetOption(); weight = item->GetOption();
wxSize size( item->CalcMin() ); wxSize size( item->CalcMin() );
if (m_orient == wxVERTICAL) if (m_orient == wxVERTICAL)
{ {
wxCoord height = size.y; wxCoord height = size.y;
if (item->GetOption()) if (item->GetOption())
{ {
height = (delta * weight) + extra; height = (delta * weight) + extra;
extra = 0; // only the first item will get the remainder as extra size extra = 0; // only the first item will get the remainder as extra size
} }
wxPoint child_pos( pt ); wxPoint child_pos( pt );
wxSize child_size( wxSize( size.x, height) ); wxSize child_size( wxSize( size.x, height) );
if (item->GetFlag() & (wxEXPAND | wxSHAPED)) if (item->GetFlag() & (wxEXPAND | wxSHAPED))
child_size.x = m_size.x; child_size.x = m_size.x;
else if (item->GetFlag() & wxALIGN_RIGHT) else if (item->GetFlag() & wxALIGN_RIGHT)
child_pos.x += m_size.x - size.x; child_pos.x += m_size.x - size.x;
else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL)) else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL))
// XXX wxCENTER is added for backward compatibility; // XXX wxCENTER is added for backward compatibility;
// wxALIGN_CENTER should be used in new code // wxALIGN_CENTER should be used in new code
child_pos.x += (m_size.x - size.x) / 2; child_pos.x += (m_size.x - size.x) / 2;
item->SetDimension( child_pos, child_size ); item->SetDimension( child_pos, child_size );
pt.y += height; pt.y += height;
} }
else else
{ {
wxCoord width = size.x; wxCoord width = size.x;
if (item->GetOption()) if (item->GetOption())
{ {
width = (delta * weight) + extra; width = (delta * weight) + extra;
extra = 0; // only the first item will get the remainder as extra size extra = 0; // only the first item will get the remainder as extra size
} }
wxPoint child_pos( pt ); wxPoint child_pos( pt );
wxSize child_size( wxSize(width, size.y) ); wxSize child_size( wxSize(width, size.y) );
if (item->GetFlag() & (wxEXPAND | wxSHAPED)) if (item->GetFlag() & (wxEXPAND | wxSHAPED))
child_size.y = m_size.y; child_size.y = m_size.y;
else if (item->GetFlag() & wxALIGN_BOTTOM) else if (item->GetFlag() & wxALIGN_BOTTOM)
child_pos.y += m_size.y - size.y; child_pos.y += m_size.y - size.y;
else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL)) else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL))
// XXX wxCENTER is added for backward compatibility; // XXX wxCENTER is added for backward compatibility;
// wxALIGN_CENTER should be used in new code // wxALIGN_CENTER should be used in new code
child_pos.y += (m_size.y - size.y) / 2; child_pos.y += (m_size.y - size.y) / 2;
item->SetDimension( child_pos, child_size ); item->SetDimension( child_pos, child_size );
pt.x += width; pt.x += width;
} }
node = node->Next(); node = node->Next();
} }
} }
@@ -897,42 +897,42 @@ wxSize wxBoxSizer::CalcMin()
{ {
wxSizerItem *item = (wxSizerItem*) node->Data(); wxSizerItem *item = (wxSizerItem*) node->Data();
int weight = 1; int weight = 1;
if (item->GetOption()) if (item->GetOption())
weight = item->GetOption(); weight = item->GetOption();
wxSize size( item->CalcMin() ); wxSize size( item->CalcMin() );
if (m_orient == wxHORIZONTAL) if (m_orient == wxHORIZONTAL)
{ {
m_minWidth += (size.x * weight); m_minWidth += (size.x * weight);
m_minHeight = wxMax( m_minHeight, size.y ); m_minHeight = wxMax( m_minHeight, size.y );
} }
else else
{ {
m_minHeight += (size.y * weight); m_minHeight += (size.y * weight);
m_minWidth = wxMax( m_minWidth, size.x ); m_minWidth = wxMax( m_minWidth, size.x );
} }
if (item->GetOption()) if (item->GetOption())
{ {
m_stretchable += weight; m_stretchable += weight;
} }
else else
{ {
if (m_orient == wxVERTICAL) if (m_orient == wxVERTICAL)
{ {
m_fixedHeight += size.y; m_fixedHeight += size.y;
m_fixedWidth = wxMax( m_fixedWidth, size.x ); m_fixedWidth = wxMax( m_fixedWidth, size.x );
} }
else else
{ {
m_fixedWidth += size.x; m_fixedWidth += size.x;
m_fixedHeight = wxMax( m_fixedHeight, size.y ); m_fixedHeight = wxMax( m_fixedHeight, size.y );
} }
} }
node = node->Next(); node = node->Next();
} }
return wxSize( m_minWidth, m_minHeight ); return wxSize( m_minWidth, m_minHeight );
@@ -1037,17 +1037,17 @@ wxSize wxNotebookSizer::CalcMin()
while (node) while (node)
{ {
wxWindow *item = node->GetData(); wxWindow *item = node->GetData();
wxSizer *itemsizer = item->GetSizer(); wxSizer *itemsizer = item->GetSizer();
if (itemsizer) if (itemsizer)
{ {
wxSize subsize( itemsizer->CalcMin() ); wxSize subsize( itemsizer->CalcMin() );
if (subsize.x > maxX) maxX = subsize.x; if (subsize.x > maxX) maxX = subsize.x;
if (subsize.y > maxY) maxY = subsize.y; if (subsize.y > maxY) maxY = subsize.y;
} }
node = node->GetNext(); node = node->GetNext();
} }
return wxSize( borderX + maxX, borderY + maxY ); return wxSize( borderX + maxX, borderY + maxY );

9
src/generic/dcpsg.cpp
View File

@@ -1329,7 +1329,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
// FIXME only correct for 90 degrees // FIXME only correct for 90 degrees
fprintf(m_pstream, "%d %d moveto\n", fprintf(m_pstream, "%d %d moveto\n",
XLOG2DEV((wxCoord)(x + size)), YLOG2DEV(by) ); XLOG2DEV((wxCoord)(x + size)), YLOG2DEV((wxCoord)by) );
char buffer[100]; char buffer[100];
sprintf(buffer, "%.8f rotate\n", angle); sprintf(buffer, "%.8f rotate\n", angle);
@@ -2125,9 +2125,9 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
// VS: dirty, but is there any better solution? // VS: dirty, but is there any better solution?
double *pt; double *pt;
pt = (double*) &m_underlinePosition; pt = (double*) &m_underlinePosition;
*pt = YLOG2DEVREL(UnderlinePosition * fontToUse->GetPointSize()) / 1000.0f; *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f;
pt = (double*) &m_underlineThickness; pt = (double*) &m_underlineThickness;
*pt = YLOG2DEVREL(UnderlineThickness * fontToUse->GetPointSize()) / 1000.0f; *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontToUse->GetPointSize())) / 1000.0f;
} }
@@ -2494,7 +2494,8 @@ void wxPrintSetupData::operator=(const wxPrintData& data)
SetPrinterCommand(data.GetPrinterCommand()); SetPrinterCommand(data.GetPrinterCommand());
SetPrintPreviewCommand(data.GetPreviewCommand()); SetPrintPreviewCommand(data.GetPreviewCommand());
SetPrinterOptions(data.GetPrinterOptions()); SetPrinterOptions(data.GetPrinterOptions());
SetPrinterTranslation(data.GetPrinterTranslateX(), data.GetPrinterTranslateY()); SetPrinterTranslation((wxCoord)data.GetPrinterTranslateX(),
(wxCoord)data.GetPrinterTranslateY());
SetPrinterScaling(data.GetPrinterScaleX(), data.GetPrinterScaleY()); SetPrinterScaling(data.GetPrinterScaleX(), data.GetPrinterScaleY());
SetPrinterOrientation(data.GetOrientation()); SetPrinterOrientation(data.GetOrientation());
SetPrinterMode((int) data.GetPrintMode()); SetPrinterMode((int) data.GetPrintMode());

4
src/generic/listctrl.cpp
View File

@@ -2879,7 +2879,7 @@ long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(p
long pos = start; long pos = start;
wxString tmp = str; wxString tmp = str;
if (pos < 0) pos = 0; if (pos < 0) pos = 0;
for (size_t i = pos; i < m_lines.GetCount(); i++) for (size_t i = (size_t)pos; i < m_lines.GetCount(); i++)
{ {
wxListLineData *line = &m_lines[i]; wxListLineData *line = &m_lines[i];
wxString s = ""; wxString s = "";
@@ -2894,7 +2894,7 @@ long wxListMainWindow::FindItem(long start, long data)
{ {
long pos = start; long pos = start;
if (pos < 0) pos = 0; if (pos < 0) pos = 0;
for (size_t i = pos; i < m_lines.GetCount(); i++) for (size_t i = (size_t)pos; i < m_lines.GetCount(); i++)
{ {
wxListLineData *line = &m_lines[i]; wxListLineData *line = &m_lines[i];
wxListItem item; wxListItem item;

2
src/generic/treectrl.cpp
View File

@@ -1660,7 +1660,7 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
} }
dc.SetBackgroundMode(wxTRANSPARENT); dc.SetBackgroundMode(wxTRANSPARENT);
int extraH = (total_h > text_h) ? (total_h - text_h)/2 : 0; long extraH = (total_h > text_h) ? (total_h - text_h)/2 : 0;
dc.DrawText( item->GetText(), dc.DrawText( item->GetText(),
(wxCoord)(image_w + item->GetX()), (wxCoord)(image_w + item->GetX()),
(wxCoord)(item->GetY() + extraH)); (wxCoord)(item->GetY() + extraH));