AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for long to wxCoord

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 1999-10-19 21:03:55 +00:00
parent d6d3a0217e
commit 7cdc2f1e42
4 changed files with 186 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
include/wx/os2/dc.h
View File

@ -95,12 +95,12 @@ public:
virtual void DestroyClippingRegion(); virtual void DestroyClippingRegion();
virtual long GetCharHeight() const; virtual wxCoord GetCharHeight() const;
virtual long GetCharWidth() const; virtual wxCoord GetCharWidth() const;
virtual void GetTextExtent(const wxString& string, virtual void DoGetTextExtent(const wxString& string,
long *x, long *y, wxCoord *x, wxCoord *y,
long *descent = NULL, wxCoord *descent = NULL,
long *externalLeading = NULL, wxCoord *externalLeading = NULL,
wxFont *theFont = NULL) const; wxFont *theFont = NULL) const;
virtual bool CanDrawBitmap() const; virtual bool CanDrawBitmap() const;
@ -112,8 +112,8 @@ public:
virtual void SetUserScale(double x, double y); virtual void SetUserScale(double x, double y);
virtual void SetSystemScale(double x, double y); virtual void SetSystemScale(double x, double y);
virtual void SetLogicalScale(double x, double y); virtual void SetLogicalScale(double x, double y);
virtual void SetLogicalOrigin(long x, long y); virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
virtual void SetDeviceOrigin(long x, long y); virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
virtual void SetLogicalFunction(int function); virtual void SetLogicalFunction(int function);
@ -135,45 +135,45 @@ public:
} }
protected: protected:
virtual void DoFloodFill(long x, long y, const wxColour& col, virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
int style = wxFLOOD_SURFACE); int style = wxFLOOD_SURFACE);
virtual bool DoGetPixel(long x, long y, wxColour *col) const; virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
virtual void DoDrawPoint(long x, long y); virtual void DoDrawPoint(wxCoord x, wxCoord y);
virtual void DoDrawLine(long x1, long y1, long x2, long y2); virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
virtual void DoDrawArc(long x1, long y1, virtual void DoDrawArc(wxCoord x1, wxCoord y1,
long x2, long y2, wxCoord x2, wxCoord y2,
long xc, long yc); wxCoord xc, wxCoord yc);
virtual void DoDrawEllipticArc(long x, long y, long w, long h, virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
double sa, double ea); double sa, double ea);
virtual void DoDrawRectangle(long x, long y, long width, long height); virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
virtual void DoDrawRoundedRectangle(long x, long y, virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
long width, long height, wxCoord width, wxCoord height,
double radius); double radius);
virtual void DoDrawEllipse(long x, long y, long width, long height); virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
virtual void DoCrossHair(long x, long y); virtual void DoCrossHair(wxCoord x, wxCoord y);
virtual void DoDrawIcon(const wxIcon& icon, long x, long y); virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
virtual void DoDrawBitmap(const wxBitmap &bmp, long x, long y, virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
bool useMask = FALSE); bool useMask = FALSE);
virtual void DoDrawText(const wxString& text, long x, long y); virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
virtual bool DoBlit(long xdest, long ydest, long width, long height, virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, long xsrc, long ysrc, wxDC *source, wxCoord xsrc, wxCoord ysrc,
int rop = wxCOPY, bool useMask = FALSE); int rop = wxCOPY, bool useMask = FALSE);
// this is gnarly - we can't even call this function DoSetClippingRegion() // this is gnarly - we can't even call this function DoSetClippingRegion()
// because of virtual function hiding // because of virtual function hiding
virtual void DoSetClippingRegionAsRegion(const wxRegion& region); virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
virtual void DoSetClippingRegion(long x, long y, virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
long width, long height); wxCoord width, wxCoord height);
virtual void DoGetClippingRegion(long *x, long *y, virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
long *width, long *height) wxCoord *width, wxCoord *height)
{ {
GetClippingBox(x, y, width, height); GetClippingBox(x, y, width, height);
} }
@ -182,9 +182,9 @@ protected:
virtual void DoGetSizeMM(int* width, int* height) const; virtual void DoGetSizeMM(int* width, int* height) const;
virtual void DoDrawLines(int n, wxPoint points[], virtual void DoDrawLines(int n, wxPoint points[],
long xoffset, long yoffset); wxCoord xoffset, wxCoord yoffset);
virtual void DoDrawPolygon(int n, wxPoint points[], virtual void DoDrawPolygon(int n, wxPoint points[],
long xoffset, long yoffset, wxCoord xoffset, wxCoord yoffset,
int fillStyle = wxODDEVEN_RULE); int fillStyle = wxODDEVEN_RULE);
#if wxUSE_SPLINES #if wxUSE_SPLINES

136
src/os2/dc.cpp
View File

@ -127,8 +127,8 @@ void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
// TODO // TODO
} }
void wxDC::DoSetClippingRegion( long x, long y void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y
,long width, long height ,wxCoord width, wxCoord height
) )
{ {
// TODO // TODO
@ -182,8 +182,8 @@ void wxDC::Clear()
// TODO // TODO
} }
void wxDC::DoFloodFill( long x void wxDC::DoFloodFill( wxCoord x
,long y ,wxCoord y
,const wxColour& col ,const wxColour& col
,int style ,int style
) )
@ -191,37 +191,37 @@ void wxDC::DoFloodFill( long x
// TODO // TODO
} }
bool wxDC::DoGetPixel(long x, long y, wxColour *col) const bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
{ {
// TODO // TODO
return(TRUE); return(TRUE);
} }
void wxDC::DoCrossHair(long x, long y) void wxDC::DoCrossHair(wxCoord x, wxCoord y)
{ {
// TODO // TODO
} }
void wxDC::DoDrawLine(long x1, long y1, long x2, long y2) void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
{ {
// TODO // TODO
} }
void wxDC::DoDrawArc( long x1, long y1 void wxDC::DoDrawArc( wxCoord x1, wxCoord y1
,long x2, long y2 ,wxCoord x2, wxCoord y2
,long xc, long yc ,wxCoord xc, wxCoord yc
) )
{ {
// TODO // TODO
} }
void wxDC::DoDrawPoint(long x, long y) void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
{ {
// TODO // TODO
} }
void wxDC::DoDrawPolygon(int n, wxPoint points[] void wxDC::DoDrawPolygon(int n, wxPoint points[]
,long xoffset, long yoffset ,wxCoord xoffset, wxCoord yoffset
,int fillStyle ,int fillStyle
) )
{ {
@ -229,34 +229,34 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[]
} }
void wxDC::DoDrawLines( int n, wxPoint points[] void wxDC::DoDrawLines( int n, wxPoint points[]
,long xoffset, long yoffset ,wxCoord xoffset, wxCoord yoffset
) )
{ {
// TODO // TODO
} }
void wxDC::DoDrawRectangle(long x, long y, long width, long height) void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{ {
// TODO // TODO
} }
void wxDC::DoDrawRoundedRectangle( long x, long y void wxDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y
,long width, long height ,wxCoord width, wxCoord height
,double radius ,double radius
) )
{ {
// TODO // TODO
} }
void wxDC::DoDrawEllipse(long x, long y, long width, long height) void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{ {
// TODO // TODO
} }
void wxDC::DoDrawEllipticArc( long x void wxDC::DoDrawEllipticArc( wxCoord x
,long y ,wxCoord y
,long w ,wxCoord w
,long h ,wxCoord h
,double sa ,double sa
,double ea ,double ea
) )
@ -264,20 +264,20 @@ void wxDC::DoDrawEllipticArc( long x
// TODO // TODO
} }
void wxDC::DoDrawIcon(const wxIcon& icon, long x, long y) void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
{ {
// TODO // TODO
} }
void wxDC::DoDrawBitmap( const wxBitmap &bmp void wxDC::DoDrawBitmap( const wxBitmap &bmp
,long x, long y ,wxCoord x, wxCoord y
,bool useMask ,bool useMask
) )
{ {
// TODO // TODO
} }
void wxDC::DoDrawText(const wxString& text, long x, long y) void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
{ {
// TODO // TODO
} }
@ -374,23 +374,23 @@ void wxDC::EndPage()
// text metrics // text metrics
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
long wxDC::GetCharHeight() const wxCoord wxDC::GetCharHeight() const
{ {
// TODO // TODO
return(1); return(1);
} }
long wxDC::GetCharWidth() const wxCoord wxDC::GetCharWidth() const
{ {
// TODO // TODO
return(1); return(1);
} }
void wxDC::GetTextExtent( const wxString& string void wxDC::DoGetTextExtent( const wxString& string
,long* x ,wxCoord* x
,long* y ,wxCoord* y
,long* decent ,wxCoord* decent
,long* externalLeading ,wxCoord* externalLeading
,wxFont* theFont ,wxFont* theFont
) const ) const
{ {
@ -426,12 +426,12 @@ void wxDC::SetSystemScale(double x, double y)
SetMapMode(m_mappingMode); SetMapMode(m_mappingMode);
} }
void wxDC::SetLogicalOrigin( long x, long y ) void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y )
{ {
// TODO: // TODO:
}; };
void wxDC::SetDeviceOrigin( long x, long y ) void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )
{ {
// TODO: // TODO:
}; };
@ -440,85 +440,85 @@ void wxDC::SetDeviceOrigin( long x, long y )
// coordinates transformations // coordinates transformations
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
long wxDCBase::DeviceToLogicalX(long x) const wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
{ {
long new_x = x - m_deviceOriginX; wxCoord new_x = x - m_deviceOriginX;
if (new_x > 0) if (new_x > 0)
return (long)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX; return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
else else
return (long)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX; return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
}; };
long wxDCBase::DeviceToLogicalXRel(long x) const wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
{ {
if (x > 0) if (x > 0)
return (long)((double)(x) / m_scaleX + 0.5); return (wxCoord)((double)(x) / m_scaleX + 0.5);
else else
return (long)((double)(x) / m_scaleX - 0.5); return (wxCoord)((double)(x) / m_scaleX - 0.5);
}; };
long wxDCBase::DeviceToLogicalY(long y) const wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
{ {
long new_y = y - m_deviceOriginY; wxCoord new_y = y - m_deviceOriginY;
if (new_y > 0) if (new_y > 0)
return (long)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY; return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
else else
return (long)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY; return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
}; };
long wxDCBase::DeviceToLogicalYRel(long y) const wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
{ {
if (y > 0) if (y > 0)
return (long)((double)(y) / m_scaleY + 0.5); return (wxCoord)((double)(y) / m_scaleY + 0.5);
else else
return (long)((double)(y) / m_scaleY - 0.5); return (wxCoord)((double)(y) / m_scaleY - 0.5);
}; };
long wxDCBase::LogicalToDeviceX(long x) const wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
{ {
long new_x = x - m_logicalOriginX; wxCoord new_x = x - m_logicalOriginX;
if (new_x > 0) if (new_x > 0)
return (long)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX; return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
else else
return (long)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX; return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
}; };
long wxDCBase::LogicalToDeviceXRel(long x) const wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
{ {
if (x > 0) if (x > 0)
return (long)((double)(x) * m_scaleX + 0.5); return (wxCoord)((double)(x) * m_scaleX + 0.5);
else else
return (long)((double)(x) * m_scaleX - 0.5); return (wxCoord)((double)(x) * m_scaleX - 0.5);
}; };
long wxDCBase::LogicalToDeviceY(long y) const wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
{ {
long new_y = y - m_logicalOriginY; wxCoord new_y = y - m_logicalOriginY;
if (new_y > 0) if (new_y > 0)
return (long)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY; return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
else else
return (long)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY; return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
}; };
long wxDCBase::LogicalToDeviceYRel(long y) const wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
{ {
if (y > 0) if (y > 0)
return (long)((double)(y) * m_scaleY + 0.5); return (wxCoord)((double)(y) * m_scaleY + 0.5);
else else
return (long)((double)(y) * m_scaleY - 0.5); return (wxCoord)((double)(y) * m_scaleY - 0.5);
}; };
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// bit blit // bit blit
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
bool wxDC::DoBlit( long xdest bool wxDC::DoBlit( wxCoord xdest
,long ydest ,wxCoord ydest
,long width ,wxCoord width
,long height ,wxCoord height
,wxDC *source ,wxDC *source
,long xsrc ,wxCoord xsrc
,long ysrc ,wxCoord ysrc
,int rop ,int rop
,bool useMask ,bool useMask
) )
@ -555,7 +555,7 @@ void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y,
float *descent, float *externalLeading, float *descent, float *externalLeading,
wxFont *theFont, bool use16bit) const wxFont *theFont, bool use16bit) const
{ {
long x1, y1, descent1, externalLeading1; wxCoord x1, y1, descent1, externalLeading1;
GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit); GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
*x = x1; *y = y1; *x = x1; *y = y1;
if (descent) if (descent)

78
src/os2/file.lst Normal file
View File

@ -0,0 +1,78 @@
List of files yet to be implemented. As you finish a file, delete it from the list
..\os2\$D\accel.obj \
..\os2\$D\app.obj \
..\os2\$D\bitmap.obj \
..\os2\$D\bmpbuttn.obj \
..\os2\$D\brush.obj \
..\os2\$D\button.obj \
..\os2\$D\checkbox.obj \
..\os2\$D\checklst.obj \
..\os2\$D\choice.obj \
..\os2\$D\clipbrd.obj \
..\os2\$D\colour.obj \
..\os2\$D\combobox.obj \
..\os2\$D\control.obj \
..\os2\$D\cursor.obj \
..\os2\$D\data.obj \
..\os2\$D\dc.obj \
..\os2\$D\dcclient.obj \
..\os2\$D\dcmemory.obj \
..\os2\$D\dcprint.obj \
..\os2\$D\dcscreen.obj \
..\os2\$D\dialog.obj \
..\os2\$D\dirdlg.obj \
..\os2\$D\dnd.obj \
..\os2\$D\filedlg.obj \
..\os2\$D\font.obj \
..\os2\$D\fontdlg.obj \
..\os2\$D\frame.obj \
..\os2\$D\gauge.obj \
..\os2\$D\gdiobj.obj \
..\os2\$D\gsocket.obj \
..\os2\$D\helpwin.obj \
..\os2\$D\icon.obj \
..\os2\$D\imaglist.obj \
..\os2\$D\iniconf.obj \
..\os2\$D\joystick.obj \
..\os2\$D\listbox.obj \
..\os2\$D\listctrl.obj \
..\os2\$D\main.obj \
..\os2\$D\mdi.obj \
..\os2\$D\menu.obj \
..\os2\$D\menuitem.obj \
..\os2\$D\metafile.obj \
..\os2\$D\minifram.obj \
..\os2\$D\msgdlg.obj \
..\os2\$D\nativdlg.obj \
..\os2\$D\notebook.obj \
..\os2\$D\ownerdrw.obj \
..\os2\$D\palette.obj \
..\os2\$D\pen.obj \
..\os2\$D\pnghand.obj \
..\os2\$D\print.obj \
..\os2\$D\radiobox.obj \
..\os2\$D\radiobut.obj \
..\os2\$D\region.obj \
..\os2\$D\scrolbar.obj \
..\os2\$D\settings.obj \
..\os2\$D\slider.obj \
..\os2\$D\spinbutt.obj \
..\os2\$D\spinctrl.obj \
..\os2\$D\statbmp.obj \
..\os2\$D\statbox.obj \
..\os2\$D\stattext.obj \
..\os2\$D\statbrpm.obj \
..\os2\$D\tabctrl.obj \
..\os2\$D\taskbar.obj \
..\os2\$D\textctrl.obj \
..\os2\$D\thread.obj \
..\os2\$D\timer.obj \
..\os2\$D\toolbar.obj \
..\os2\$D\tooltip.obj \
..\os2\$D\treectrl.obj \
..\os2\$D\utils.obj \
..\os2\$D\utilsexc.obj \
..\os2\$D\wave.obj \
..\os2\$D\window.obj

8
src/os2/utils.cpp
View File

@ -42,7 +42,9 @@
#include <os2.h> #include <os2.h>
#include<netdb.h> #include<netdb.h>
#define PURE_32 #define PURE_32
#include<upm.h> #include <upm.h>
#include <netcons.h>
#include <netbios.h>
// In the WIN.INI file // In the WIN.INI file
static const wxChar WX_SECTION[] = _T("wxWindows"); static const wxChar WX_SECTION[] = _T("wxWindows");
@ -66,8 +68,8 @@ bool wxGetHostName(wxChar *buf, int maxSize)
unsigned long ulBuffer; unsigned long ulBuffer;
unsigned long* pulTotalAvail; unsigned long* pulTotalAvail;
NetBios32GetInfo( server NetBios32GetInfo( (const unsigned char*)server
,computer ,(const unsigned char*)computer
,ulLevel ,ulLevel
,pbBuffer ,pbBuffer
,ulBuffer ,ulBuffer