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

more long/double to int conversion warnings from HP-UX logs fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-02-18 20:20:15 +00:00
parent 7d533797a0
commit 6cedba093a
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/event.h
View File

@@ -694,10 +694,10 @@ public:
#endif // WXWIN_COMPATIBILITY #endif // WXWIN_COMPATIBILITY
// Get X position // Get X position
long GetX() const { return m_x; } wxCoord GetX() const { return m_x; }
// Get Y position // Get Y position
long GetY() const { return m_y; } wxCoord GetY() const { return m_y; }
void CopyObject(wxObject& obj) const; void CopyObject(wxObject& obj) const;

16
src/generic/plot.cpp
View File

@@ -126,8 +126,8 @@ void wxPlotArea::OnMouse( wxMouseEvent &event )
view_x *= wxPLOT_SCROLL_STEP; view_x *= wxPLOT_SCROLL_STEP;
view_y *= wxPLOT_SCROLL_STEP; view_y *= wxPLOT_SCROLL_STEP;
int x = event.GetX(); wxCoord x = event.GetX();
int y = event.GetY(); wxCoord y = event.GetY();
x += view_x; x += view_x;
y += view_y; y += view_y;
@@ -141,7 +141,7 @@ void wxPlotArea::OnMouse( wxMouseEvent &event )
double end = curve->GetEndY(); double end = curve->GetEndY();
wxCoord offset_y = curve->GetOffsetY(); wxCoord offset_y = curve->GetOffsetY();
double dy = (end - curve->GetY( x/m_owner->GetZoom() )) / range; double dy = (end - curve->GetY( (wxInt32)(x/m_owner->GetZoom()) )) / range;
wxCoord curve_y = (wxCoord)(dy * double_client_height) - offset_y - 1; wxCoord curve_y = (wxCoord)(dy * double_client_height) - offset_y - 1;
if ((y-curve_y < 4) && (y-curve_y > -4)) if ((y-curve_y < 4) && (y-curve_y > -4))
@@ -214,7 +214,7 @@ void wxPlotArea::DrawCurve( wxDC *dc, wxPlotCurve *curve, int from, int to )
wxCoord y=0,last_y=0; wxCoord y=0,last_y=0;
for (int x = start_x; x < end_x; x++) for (int x = start_x; x < end_x; x++)
{ {
double dy = (end - curve->GetY( x/zoom )) / range; double dy = (end - curve->GetY( (wxInt32)(x/zoom) )) / range;
y = (wxCoord)(dy * double_client_height) - offset_y - 1; y = (wxCoord)(dy * double_client_height) - offset_y - 1;
if (x != start_x) if (x != start_x)
@@ -310,8 +310,8 @@ void wxPlotXAxisArea::OnMouse( wxMouseEvent &event )
view_x *= wxPLOT_SCROLL_STEP; view_x *= wxPLOT_SCROLL_STEP;
view_y *= wxPLOT_SCROLL_STEP; view_y *= wxPLOT_SCROLL_STEP;
int x = event.GetX(); wxCoord x = event.GetX();
int y = event.GetY(); wxCoord y = event.GetY();
x += view_x; x += view_x;
y += view_y; y += view_y;
@@ -760,7 +760,7 @@ void wxPlotWindow::SetZoom( double zoom )
} }
SetScrollbars( wxPLOT_SCROLL_STEP, wxPLOT_SCROLL_STEP, SetScrollbars( wxPLOT_SCROLL_STEP, wxPLOT_SCROLL_STEP,
(int)((max*m_xZoom)/wxPLOT_SCROLL_STEP)+1, 0, (int)((max*m_xZoom)/wxPLOT_SCROLL_STEP)+1, 0,
(int)view_x*zoom/old_zoom, 0, (int)(view_x*zoom/old_zoom), 0,
TRUE ); TRUE );
RedrawXAxis(); RedrawXAxis();
@@ -780,7 +780,7 @@ void wxPlotWindow::ResetScrollbar()
} }
SetScrollbars( wxPLOT_SCROLL_STEP, wxPLOT_SCROLL_STEP, SetScrollbars( wxPLOT_SCROLL_STEP, wxPLOT_SCROLL_STEP,
((max*m_xZoom)/wxPLOT_SCROLL_STEP)+1, 0 ); (int)(((max*m_xZoom)/wxPLOT_SCROLL_STEP)+1), 0 );
} }
void wxPlotWindow::RedrawXAxis() void wxPlotWindow::RedrawXAxis()

9
src/generic/treectrl.cpp
View File

@@ -1556,7 +1556,7 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
} }
dc.SetBackgroundMode(wxTRANSPARENT); dc.SetBackgroundMode(wxTRANSPARENT);
dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() dc.DrawText( item->GetText(), image_w + item->GetX(), (wxCoord)item->GetY()
+ ((total_h > text_h) ? (total_h - text_h)/2 : 0)); + ((total_h > text_h) ? (total_h - text_h)/2 : 0));
// restore normal font // restore normal font
@@ -2116,8 +2116,8 @@ void wxTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc ) void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
{ {
long text_w = 0; int text_w = 0;
long text_h = 0; int text_h = 0;
if (item->IsBold()) if (item->IsBold())
dc.SetFont(m_boldFont); dc.SetFont(m_boldFont);
@@ -2145,7 +2145,8 @@ void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
total_h += total_h/10; // otherwise 10% extra spacing total_h += total_h/10; // otherwise 10% extra spacing
item->SetHeight(total_h); item->SetHeight(total_h);
if (total_h>m_lineHeight) m_lineHeight=total_h; if (total_h>m_lineHeight)
m_lineHeight=total_h;
item->SetWidth(image_w+text_w+2); item->SetWidth(image_w+text_w+2);
} }