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

Warning fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-10-15 16:00:06 +00:00
parent a22d4c5cbe
commit 8253f2e063
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/dirctrlg.cpp
View File

@@ -1545,7 +1545,11 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
if (smask > 2) if (smask > 2)
ps[0] = ps[1] = ps[2] = mr; ps[0] = ps[1] = ps[2] = mr;
else else
ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2; {
ps[0] = (unsigned char)(sr >> 2);
ps[1] = (unsigned char)(sg >> 2);
ps[2] = (unsigned char)(sb >> 2);
}
ps += 3; ps += 3;
} }
p1 += size*2 * 3, p2 += size*2 * 3; p1 += size*2 * 3, p2 += size*2 * 3;

20
src/generic/grid.cpp
View File

@@ -1183,10 +1183,10 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
char tmpbuf[2]; char tmpbuf[2];
tmpbuf[0] = (char) keycode; tmpbuf[0] = (char) keycode;
tmpbuf[1] = '\0'; tmpbuf[1] = '\0';
bool is_decimal_point = wxString strbuf(tmpbuf, *wxConvCurrent);
( wxString(tmpbuf, *wxConvCurrent) == bool is_decimal_point =
wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, ( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
wxLOCALE_CAT_NUMBER) ); wxLOCALE_CAT_NUMBER) );
if ( (keycode < 128) && if ( (keycode < 128) &&
(wxIsdigit(keycode) || tolower(keycode) == 'e' || (wxIsdigit(keycode) || tolower(keycode) == 'e' ||
is_decimal_point || keycode == '+' || keycode == '-') ) is_decimal_point || keycode == '+' || keycode == '-') )
@@ -9546,26 +9546,30 @@ void wxGrid::SetColSize( int col, int width )
void wxGrid::SetColMinimalWidth( int col, int width ) void wxGrid::SetColMinimalWidth( int col, int width )
{ {
if (width > GetColMinimalAcceptableWidth()) { if (width > GetColMinimalAcceptableWidth()) {
m_colMinWidths[col] = width; wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)col;
m_colMinWidths[key] = width;
} }
} }
void wxGrid::SetRowMinimalHeight( int row, int width ) void wxGrid::SetRowMinimalHeight( int row, int width )
{ {
if (width > GetRowMinimalAcceptableHeight()) { if (width > GetRowMinimalAcceptableHeight()) {
m_rowMinHeights[row] = width; wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)row;
m_rowMinHeights[key] = width;
} }
} }
int wxGrid::GetColMinimalWidth(int col) const int wxGrid::GetColMinimalWidth(int col) const
{ {
wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(col); wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)col;
wxLongToLongHashMap::const_iterator it = m_colMinWidths.find(key);
return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth; return it != m_colMinWidths.end() ? (int)it->second : m_minAcceptableColWidth;
} }
int wxGrid::GetRowMinimalHeight(int row) const int wxGrid::GetRowMinimalHeight(int row) const
{ {
wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(row); wxLongToLongHashMap::const_key_type key = (wxLongToLongHashMap::const_key_type)row;
wxLongToLongHashMap::const_iterator it = m_rowMinHeights.find(key);
return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight; return it != m_rowMinHeights.end() ? (int)it->second : m_minAcceptableRowHeight;
} }

2
src/generic/logg.cpp
View File

@@ -252,7 +252,7 @@ void wxLogGui::Flush()
wxString appName = wxTheApp->GetAppName(); wxString appName = wxTheApp->GetAppName();
if ( !!appName ) if ( !!appName )
appName[0u] = wxToupper(appName[0u]); appName[0u] = (wxChar)wxToupper(appName[0u]);
long style; long style;
wxString titleFormat; wxString titleFormat;

6
src/generic/treectlg.cpp
View File

@@ -261,12 +261,12 @@ private:
// tree ctrl images for the normal, selected, expanded and // tree ctrl images for the normal, selected, expanded and
// expanded+selected states // expanded+selected states
short m_images[wxTreeItemIcon_Max]; int m_images[wxTreeItemIcon_Max];
wxCoord m_x; // (virtual) offset from top wxCoord m_x; // (virtual) offset from top
wxCoord m_y; // (virtual) offset from left wxCoord m_y; // (virtual) offset from left
short m_width; // width of this item int m_width; // width of this item
unsigned char m_height; // height of this item int m_height; // height of this item
// use bitfields to save size // use bitfields to save size
int m_isCollapsed :1; int m_isCollapsed :1;