wxGTK compiles and links again.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
parent
8e1d4f96f5
commit
64698f9af8
@ -873,6 +873,7 @@ DEFAULT_wxUSE_RESOURCES=1
|
||||
DEFAULT_wxUSE_CLIPBOARD=1
|
||||
DEFAULT_wxUSE_TOOLTIPS=1
|
||||
DEFAULT_wxUSE_DRAG_AND_DROP=1
|
||||
DEFAULT_wxUSE_SPLINE=1
|
||||
|
||||
DEFAULT_wxUSE_MDI_ARCHITECTURE=1
|
||||
DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1
|
||||
@ -1066,6 +1067,10 @@ AC_OVERRIDES(dnd,dnd,
|
||||
**--with-dnd use Drag'n'Drop classes,
|
||||
wxUSE_DRAG_AND_DROP)
|
||||
|
||||
AC_OVERRIDES(spline,spline,
|
||||
**--with-spline use Spline drawing code,
|
||||
wxUSE_SPLINE)
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl user options for architectures
|
||||
dnl ----------------------------------------------------------------
|
||||
@ -1614,6 +1619,10 @@ if test "$wxUSE_DRAG_AND_DROP" = 1 ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SPLINE" = 1 ; then
|
||||
AC_DEFINE_UNQUOTED(wxUSE_SPLINE,$wxUSE_SPLINE)
|
||||
fi
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl No effect yet
|
||||
dnl ----------------------------------------------------------------
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface "dcbase.h"
|
||||
#pragma implementation "dcbase.h"
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -542,7 +543,9 @@ protected:
|
||||
if ( y ) *y = m_deviceOriginY;
|
||||
}
|
||||
|
||||
#if wxUSE_SPLINES
|
||||
virtual void DoDrawSpline(wxList *points) = 0;
|
||||
#endif
|
||||
|
||||
protected:
|
||||
// flags
|
||||
|
||||
@ -62,38 +62,30 @@ public:
|
||||
virtual void BeginDrawing() {}
|
||||
virtual void EndDrawing() {}
|
||||
|
||||
void FloodFill(long x1, long y1, const wxColour &col, int style=wxFLOOD_SURFACE) ;
|
||||
bool GetPixel(long x1, long y1, wxColour *col) const;
|
||||
void DoFloodFill(long x1, long y1, const wxColour &col, int style=wxFLOOD_SURFACE );
|
||||
bool DoGetPixel(long x1, long y1, wxColour *col) const;
|
||||
|
||||
void DrawLine(long x1, long y1, long x2, long y2);
|
||||
void CrossHair(long x, long y) ;
|
||||
void DrawArc(long x1,long y1,long x2,long y2,long xc,long yc);
|
||||
void DrawEllipticArc(long x,long y,long w,long h,double sa,double ea);
|
||||
void DrawPoint(long x, long y);
|
||||
// Avoid compiler warning
|
||||
void DrawPoint(wxPoint& point) { wxDC::DrawPoint(point); }
|
||||
void DrawLines(int n, wxPoint points[], long xoffset = 0, long yoffset = 0);
|
||||
// Avoid compiler warning
|
||||
void DrawLines(wxList *lines, long xoffset = 0, long yoffset = 0)
|
||||
{ wxDC::DrawLines(lines, xoffset, yoffset); }
|
||||
void DrawPolygon(int n, wxPoint points[], long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE);
|
||||
// Avoid compiler warning
|
||||
void DrawPolygon(wxList *lines, long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE)
|
||||
{ wxDC::DrawPolygon(lines, xoffset, yoffset, fillStyle); }
|
||||
void DrawRectangle(long x, long y, long width, long height);
|
||||
void DrawRoundedRectangle(long x, long y, long width, long height, double radius = 20);
|
||||
void DrawEllipse(long x, long y, long width, long height);
|
||||
void DoDrawLine(long x1, long y1, long x2, long y2);
|
||||
void DoCrossHair(long x, long y) ;
|
||||
void DoDrawArc(long x1,long y1,long x2,long y2,long xc,long yc);
|
||||
void DoDrawEllipticArc(long x,long y,long w,long h,double sa,double ea);
|
||||
void DoDrawPoint(long x, long y);
|
||||
void DoDrawLines(int n, wxPoint points[], long xoffset = 0, long yoffset = 0);
|
||||
void DoDrawPolygon(int n, wxPoint points[], long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE);
|
||||
void DoDrawRectangle(long x, long y, long width, long height);
|
||||
void DoDrawRoundedRectangle(long x, long y, long width, long height, double radius = 20);
|
||||
void DoDrawEllipse(long x, long y, long width, long height);
|
||||
|
||||
void DrawSpline(wxList *points);
|
||||
void DoDrawSpline(wxList *points);
|
||||
|
||||
bool Blit(long xdest, long ydest, long width, long height,
|
||||
bool DoBlit(long xdest, long ydest, long width, long height,
|
||||
wxDC *source, long xsrc, long ysrc, int rop = wxCOPY, bool useMask = FALSE);
|
||||
inline bool CanDrawBitmap(void) const { return TRUE; }
|
||||
|
||||
void DrawIcon( const wxIcon& icon, long x, long y );
|
||||
void DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask=FALSE );
|
||||
void DoDrawIcon( const wxIcon& icon, long x, long y );
|
||||
void DoDrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask=FALSE );
|
||||
|
||||
void DrawText(const wxString& text, long x, long y, bool use16 = FALSE);
|
||||
void DoDrawText(const wxString& text, long x, long y );
|
||||
|
||||
void Clear();
|
||||
void SetFont( const wxFont& font );
|
||||
@ -105,19 +97,21 @@ public:
|
||||
void SetClippingRegion(long x, long y, long width, long height);
|
||||
void SetClippingRegion( const wxRegion ®ion );
|
||||
void DestroyClippingRegion();
|
||||
|
||||
void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) {}
|
||||
|
||||
bool StartDoc(const wxString& message);
|
||||
void EndDoc();
|
||||
void StartPage();
|
||||
void EndPage();
|
||||
|
||||
long GetCharHeight();
|
||||
long GetCharWidth();
|
||||
long GetCharHeight() const;
|
||||
long GetCharWidth() const;
|
||||
inline bool CanGetTextExtent(void) const { return FALSE; }
|
||||
void GetTextExtent(const wxString& string, long *x, long *y,
|
||||
long *descent = (long *) NULL,
|
||||
long *externalLeading = (long *) NULL,
|
||||
wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE);
|
||||
wxFont *theFont = (wxFont *) NULL ) const;
|
||||
|
||||
void GetSize(int* width, int* height) const;
|
||||
void GetSizeMM(int *width, int *height) const;
|
||||
@ -135,6 +129,8 @@ public:
|
||||
|
||||
inline wxPrintData& GetPrintData() { return m_printData; }
|
||||
inline void SetPrintData(const wxPrintData& data) { m_printData = data; }
|
||||
|
||||
int GetDepth() const { return 24; }
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
@ -212,6 +212,10 @@
|
||||
* Use dnd
|
||||
*/
|
||||
#define wxUSE_DRAG_AND_DROP 0
|
||||
/*
|
||||
* Use spline
|
||||
*/
|
||||
#define wxUSE_SPLINE 0
|
||||
/*
|
||||
* Use wxLibrary class
|
||||
*/
|
||||
|
||||
@ -417,23 +417,23 @@ void wxPostScriptDC::Clear()
|
||||
wxFAIL_MSG( _T("wxPostScriptDC::Clear not implemented.") );
|
||||
}
|
||||
|
||||
void wxPostScriptDC::FloodFill (long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
|
||||
void wxPostScriptDC::DoFloodFill (long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
|
||||
{
|
||||
wxFAIL_MSG( _T("wxPostScriptDC::FloodFill not implemented.") );
|
||||
}
|
||||
|
||||
bool wxPostScriptDC::GetPixel (long WXUNUSED(x), long WXUNUSED(y), wxColour * WXUNUSED(col)) const
|
||||
bool wxPostScriptDC::DoGetPixel (long WXUNUSED(x), long WXUNUSED(y), wxColour * WXUNUSED(col)) const
|
||||
{
|
||||
wxFAIL_MSG( _T("wxPostScriptDC::GetPixel not implemented.") );
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void wxPostScriptDC::CrossHair (long WXUNUSED(x), long WXUNUSED(y))
|
||||
void wxPostScriptDC::DoCrossHair (long WXUNUSED(x), long WXUNUSED(y))
|
||||
{
|
||||
wxFAIL_MSG( _T("wxPostScriptDC::CrossHair not implemented.") );
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawLine (long x1, long y1, long x2, long y2)
|
||||
void wxPostScriptDC::DoDrawLine (long x1, long y1, long x2, long y2)
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -452,7 +452,7 @@ void wxPostScriptDC::DrawLine (long x1, long y1, long x2, long y2)
|
||||
|
||||
#define RAD2DEG 57.29577951308
|
||||
|
||||
void wxPostScriptDC::DrawArc (long x1, long y1, long x2, long y2, long xc, long yc)
|
||||
void wxPostScriptDC::DoDrawArc (long x1, long y1, long x2, long y2, long xc, long yc)
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -515,7 +515,7 @@ void wxPostScriptDC::DrawArc (long x1, long y1, long x2, long y2, long xc, long
|
||||
CalcBoundingBox( xc+radius, yc+radius );
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
|
||||
void wxPostScriptDC::DoDrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -557,7 +557,7 @@ void wxPostScriptDC::DrawEllipticArc(long x,long y,long w,long h,double sa,doubl
|
||||
}
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawPoint (long x, long y)
|
||||
void wxPostScriptDC::DoDrawPoint (long x, long y)
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -573,7 +573,7 @@ void wxPostScriptDC::DrawPoint (long x, long y)
|
||||
CalcBoundingBox( x, y );
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawPolygon (int n, wxPoint points[], long xoffset, long yoffset, int WXUNUSED(fillStyle))
|
||||
void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], long xoffset, long yoffset, int WXUNUSED(fillStyle))
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -623,7 +623,7 @@ void wxPostScriptDC::DrawPolygon (int n, wxPoint points[], long xoffset, long yo
|
||||
}
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawLines (int n, wxPoint points[], long xoffset, long yoffset)
|
||||
void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], long xoffset, long yoffset)
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -653,7 +653,7 @@ void wxPostScriptDC::DrawLines (int n, wxPoint points[], long xoffset, long yoff
|
||||
*m_pstream << "stroke\n";
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawRectangle (long x, long y, long width, long height)
|
||||
void wxPostScriptDC::DoDrawRectangle (long x, long y, long width, long height)
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -690,7 +690,7 @@ void wxPostScriptDC::DrawRectangle (long x, long y, long width, long height)
|
||||
}
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawRoundedRectangle (long x, long y, long width, long height, double radius)
|
||||
void wxPostScriptDC::DoDrawRoundedRectangle (long x, long y, long width, long height, double radius)
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -751,7 +751,7 @@ void wxPostScriptDC::DrawRoundedRectangle (long x, long y, long width, long heig
|
||||
}
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawEllipse (long x, long y, long width, long height)
|
||||
void wxPostScriptDC::DoDrawEllipse (long x, long y, long width, long height)
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -782,12 +782,12 @@ void wxPostScriptDC::DrawEllipse (long x, long y, long width, long height)
|
||||
}
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawIcon( const wxIcon& icon, long x, long y )
|
||||
void wxPostScriptDC::DoDrawIcon( const wxIcon& icon, long x, long y )
|
||||
{
|
||||
DrawBitmap( icon, x, y, TRUE );
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool WXUNUSED(useMask) )
|
||||
void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, long x, long y, bool WXUNUSED(useMask) )
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -1047,7 +1047,7 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush )
|
||||
}
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawText( const wxString& text, long x, long y, bool WXUNUSED(use16bit) )
|
||||
void wxPostScriptDC::DoDrawText( const wxString& text, long x, long y )
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -1143,7 +1143,7 @@ void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function))
|
||||
wxFAIL_MSG( _T("wxPostScriptDC::SetLogicalFunction not implemented.") );
|
||||
}
|
||||
|
||||
void wxPostScriptDC::DrawSpline( wxList *points )
|
||||
void wxPostScriptDC::DoDrawSpline( wxList *points )
|
||||
{
|
||||
wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") );
|
||||
|
||||
@ -1199,7 +1199,7 @@ void wxPostScriptDC::DrawSpline( wxList *points )
|
||||
*m_pstream << XLOG2DEV((long)c) << " " << YLOG2DEV((long)d) << " lineto stroke\n";
|
||||
}
|
||||
|
||||
long wxPostScriptDC::GetCharWidth ()
|
||||
long wxPostScriptDC::GetCharWidth() const
|
||||
{
|
||||
// Chris Breeze: reasonable approximation using wxMODERN/Courier
|
||||
return (long) (GetCharHeight() * 72.0 / 120.0);
|
||||
@ -1529,7 +1529,7 @@ void wxPostScriptDC::EndPage ()
|
||||
*m_pstream << "showpage\n";
|
||||
}
|
||||
|
||||
bool wxPostScriptDC::Blit( long xdest, long ydest,
|
||||
bool wxPostScriptDC::DoBlit( long xdest, long ydest,
|
||||
long fwidth, long fheight,
|
||||
wxDC *source,
|
||||
long xsrc, long ysrc,
|
||||
@ -1554,7 +1554,7 @@ bool wxPostScriptDC::Blit( long xdest, long ydest,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
long wxPostScriptDC::GetCharHeight()
|
||||
long wxPostScriptDC::GetCharHeight() const
|
||||
{
|
||||
if (m_font.Ok())
|
||||
return m_font.GetPointSize();
|
||||
@ -1563,8 +1563,7 @@ long wxPostScriptDC::GetCharHeight()
|
||||
}
|
||||
|
||||
void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y,
|
||||
long *descent, long *externalLeading, wxFont *theFont,
|
||||
bool WXUNUSED(use16) )
|
||||
long *descent, long *externalLeading, wxFont *theFont ) const
|
||||
{
|
||||
wxFont *fontToUse = theFont;
|
||||
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/generic/imaglist.h"
|
||||
#include "wx/icon.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxImageList
|
||||
|
||||
Loading…
Reference in New Issue
Block a user