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

TWIN32 compatibility added; wxMotif uses wxGTK's wxPostScriptDC;

Browse Source 
wxByte replaces byte (can conflict with windows.h)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-01-19 18:23:02 +00:00
parent 0d2a2b601b
commit 57c208c575
68 changed files with 575 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/dc.cpp
View File

@@ -255,7 +255,7 @@ void wxDC::SetPalette(const wxPalette& palette)
m_oldPalette = 0;
}
m_palette = m_palette;
m_palette = palette;
if (!m_palette.Ok())
{
@@ -380,7 +380,7 @@ void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
double radius = (double)sqrt(dx*dx+dy*dy) ;;
if (x1==x2 && x2==y2)
{
DrawEllipse(xc,yc,(double)(radius*2.0),(double)(radius*2)) ;
DrawEllipse(xc,yc,(long)(radius*2.0),(long)(radius*2.0)) ;
return ;
}
@@ -605,7 +605,7 @@ void wxDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
void wxDC::DrawIcon(const wxIcon& icon, long x, long y)
{
#if defined(__WIN32__) && !defined(__SC__)
#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
::DrawIconEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(),
icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL);
#else
@@ -677,7 +677,7 @@ void wxDC::SetFont(const wxFont& the_font)
if (m_font.Ok() && m_font.GetResourceHandle())
{
HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
if (f == NULL)
if (f == (HFONT) NULL)
{
wxDebugMsg("::SelectObject failed in wxDC::SetFont.");
}
@@ -894,10 +894,14 @@ bool wxDC::StartDoc(const wxString& message)
#else
#ifdef UNICODE
::StartDocW((HDC) m_hDC, &docinfo);
#else
#ifdef __TWIN32__
::StartDoc((HDC) m_hDC, &docinfo);
#else
::StartDocA((HDC) m_hDC, &docinfo);
#endif
#endif
#endif
#ifndef __WIN16__
if (ret <= 0)
@@ -1680,7 +1684,7 @@ static bool wx_spline_add_point(double x, double y)
static void wx_spline_draw_point_array(wxDC *dc)
{
dc->DrawLines(&wx_spline_point_list, (double)0.0, (double)0.0);
dc->DrawLines(&wx_spline_point_list, 0, 0);
wxNode *node = wx_spline_point_list.First();
while (node)
{