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

and the compilation fix for the warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-11-02 18:46:33 +00:00
parent b02da6b187
commit bf57d1adac
4 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/event.h
View File

@ -613,12 +613,12 @@ public:
*ypos = m_y;
}
void GetPosition(int *xpos, int *ypos) const
void GetPosition(long *xpos, long *ypos) const
{
if (xpos)
*xpos = (int)m_x;
*xpos = (long)m_x;
if (ypos)
*ypos = (int)m_y;
*ypos = (long)m_y;
}
// Find the position of the event
@ -694,10 +694,10 @@ public:
if (ypos) *ypos = m_y;
}
void GetPosition(int *xpos, int *ypos) const
void GetPosition(long *xpos, long *ypos) const
{
if (xpos) *xpos = (int)m_x;
if (ypos) *ypos = (int)m_y;
if (xpos) *xpos = (long)m_x;
if (ypos) *ypos = (long)m_y;
}
wxPoint GetPosition() const

2
src/common/tbarsmpl.cpp
View File

@ -113,7 +113,7 @@ void wxToolBarSimple::OnKillFocus (wxFocusEvent& WXUNUSED(event))
void wxToolBarSimple::OnMouseEvent ( wxMouseEvent & event )
{
long x, y;
wxCoord x, y;
event.Position(&x, &y);
wxToolBarTool *tool = FindToolForPosition(x, y);

36
src/gtk/region.cpp
View File

@ -31,8 +31,8 @@ class wxRegionRefData: public wxObjectRefData
{
public:
wxRegionRefData(void);
~wxRegionRefData(void);
wxRegionRefData();
~wxRegionRefData();
public:
@ -40,12 +40,12 @@ class wxRegionRefData: public wxObjectRefData
wxList m_rects;
};
wxRegionRefData::wxRegionRefData(void)
wxRegionRefData::wxRegionRefData()
{
m_region = (GdkRegion *) NULL;
}
wxRegionRefData::~wxRegionRefData(void)
wxRegionRefData::~wxRegionRefData()
{
if (m_region) gdk_region_destroy( m_region );
@ -113,13 +113,13 @@ wxRegion::wxRegion( const wxRect& rect )
}
}
wxRegion::wxRegion(void)
wxRegion::wxRegion()
{
m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new();
}
wxRegion::~wxRegion(void)
wxRegion::~wxRegion()
{
}
@ -133,7 +133,7 @@ bool wxRegion::operator != ( const wxRegion& region )
return m_refData != region.m_refData;
}
void wxRegion::Clear(void)
void wxRegion::Clear()
{
UnRef();
m_refData = new wxRegionRefData();
@ -302,7 +302,7 @@ void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const
}
}
wxRect wxRegion::GetBox(void) const
wxRect wxRegion::GetBox() const
{
long x = 0;
long y = 0;
@ -312,7 +312,7 @@ wxRect wxRegion::GetBox(void) const
return wxRect( x, y, w, h );
}
bool wxRegion::Empty(void) const
bool wxRegion::Empty() const
{
return gdk_region_empty( M_REGIONDATA->m_region );
}
@ -352,7 +352,7 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
return Contains( rect.x, rect.y, rect.width, rect.height );
}
GdkRegion *wxRegion::GetRegion(void) const
GdkRegion *wxRegion::GetRegion() const
{
return M_REGIONDATA->m_region;
}
@ -368,7 +368,7 @@ wxList *wxRegion::GetRectList() const
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
wxRegionIterator::wxRegionIterator(void)
wxRegionIterator::wxRegionIterator()
{
m_current = 0;
}
@ -385,17 +385,17 @@ void wxRegionIterator::Reset( const wxRegion& region )
m_current = 0;
}
wxRegionIterator::operator bool (void) const
wxRegionIterator::operator bool () const
{
return m_current < m_region.GetRectList()->Number();
}
bool wxRegionIterator::HaveRects(void) const
bool wxRegionIterator::HaveRects() const
{
return m_current < m_region.GetRectList()->Number();
}
void wxRegionIterator::operator ++ (void)
void wxRegionIterator::operator ++ ()
{
if (m_current < m_region.GetRectList()->Number()) ++m_current;
}
@ -405,7 +405,7 @@ void wxRegionIterator::operator ++ (int)
if (m_current < m_region.GetRectList()->Number()) ++m_current;
}
long wxRegionIterator::GetX(void) const
wxCoord wxRegionIterator::GetX() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
@ -413,7 +413,7 @@ long wxRegionIterator::GetX(void) const
return r->x;
}
long wxRegionIterator::GetY(void) const
wxCoord wxRegionIterator::GetY() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
@ -421,7 +421,7 @@ long wxRegionIterator::GetY(void) const
return r->y;
}
long wxRegionIterator::GetW(void) const
wxCoord wxRegionIterator::GetW() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
@ -429,7 +429,7 @@ long wxRegionIterator::GetW(void) const
return r->width;
}
long wxRegionIterator::GetH(void) const
wxCoord wxRegionIterator::GetH() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;

36
src/gtk1/region.cpp
View File

@ -31,8 +31,8 @@ class wxRegionRefData: public wxObjectRefData
{
public:
wxRegionRefData(void);
~wxRegionRefData(void);
wxRegionRefData();
~wxRegionRefData();
public:
@ -40,12 +40,12 @@ class wxRegionRefData: public wxObjectRefData
wxList m_rects;
};
wxRegionRefData::wxRegionRefData(void)
wxRegionRefData::wxRegionRefData()
{
m_region = (GdkRegion *) NULL;
}
wxRegionRefData::~wxRegionRefData(void)
wxRegionRefData::~wxRegionRefData()
{
if (m_region) gdk_region_destroy( m_region );
@ -113,13 +113,13 @@ wxRegion::wxRegion( const wxRect& rect )
}
}
wxRegion::wxRegion(void)
wxRegion::wxRegion()
{
m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new();
}
wxRegion::~wxRegion(void)
wxRegion::~wxRegion()
{
}
@ -133,7 +133,7 @@ bool wxRegion::operator != ( const wxRegion& region )
return m_refData != region.m_refData;
}
void wxRegion::Clear(void)
void wxRegion::Clear()
{
UnRef();
m_refData = new wxRegionRefData();
@ -302,7 +302,7 @@ void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const
}
}
wxRect wxRegion::GetBox(void) const
wxRect wxRegion::GetBox() const
{
long x = 0;
long y = 0;
@ -312,7 +312,7 @@ wxRect wxRegion::GetBox(void) const
return wxRect( x, y, w, h );
}
bool wxRegion::Empty(void) const
bool wxRegion::Empty() const
{
return gdk_region_empty( M_REGIONDATA->m_region );
}
@ -352,7 +352,7 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
return Contains( rect.x, rect.y, rect.width, rect.height );
}
GdkRegion *wxRegion::GetRegion(void) const
GdkRegion *wxRegion::GetRegion() const
{
return M_REGIONDATA->m_region;
}
@ -368,7 +368,7 @@ wxList *wxRegion::GetRectList() const
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
wxRegionIterator::wxRegionIterator(void)
wxRegionIterator::wxRegionIterator()
{
m_current = 0;
}
@ -385,17 +385,17 @@ void wxRegionIterator::Reset( const wxRegion& region )
m_current = 0;
}
wxRegionIterator::operator bool (void) const
wxRegionIterator::operator bool () const
{
return m_current < m_region.GetRectList()->Number();
}
bool wxRegionIterator::HaveRects(void) const
bool wxRegionIterator::HaveRects() const
{
return m_current < m_region.GetRectList()->Number();
}
void wxRegionIterator::operator ++ (void)
void wxRegionIterator::operator ++ ()
{
if (m_current < m_region.GetRectList()->Number()) ++m_current;
}
@ -405,7 +405,7 @@ void wxRegionIterator::operator ++ (int)
if (m_current < m_region.GetRectList()->Number()) ++m_current;
}
long wxRegionIterator::GetX(void) const
wxCoord wxRegionIterator::GetX() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
@ -413,7 +413,7 @@ long wxRegionIterator::GetX(void) const
return r->x;
}
long wxRegionIterator::GetY(void) const
wxCoord wxRegionIterator::GetY() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
@ -421,7 +421,7 @@ long wxRegionIterator::GetY(void) const
return r->y;
}
long wxRegionIterator::GetW(void) const
wxCoord wxRegionIterator::GetW() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
@ -429,7 +429,7 @@ long wxRegionIterator::GetW(void) const
return r->width;
}
long wxRegionIterator::GetH(void) const
wxCoord wxRegionIterator::GetH() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;