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

wxWindow::ReParent()

Browse Source 
wxDC::SetClippingRegio( region)
  lots if wxDC inline with wxPoint


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-03 15:14:45 +00:00
parent 1cff61deed
commit 463c1fa1a9
19 changed files with 640 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
include/wx/gtk/dc.h
View File

@@ -67,14 +67,42 @@ class wxDC: public wxObject
virtual bool Ok(void) const;
virtual void FloodFill( long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE ) = 0;
virtual bool GetPixel( long x1, long y1, wxColour *col ) const = 0;
virtual void FloodFill( long x, long y, const wxColour& col, int style=wxFLOOD_SURFACE ) = 0;
inline void FloodFill(const wxPoint& pt, const wxColour& col, int style=wxFLOOD_SURFACE)
{
FloodFill(pt.x, pt.y, col, style);
}
virtual bool GetPixel( long x, long y, wxColour *col ) const = 0;
inline bool GetPixel(const wxPoint& pt, wxColour *col) const
{
return GetPixel(pt.x, pt.y, col);
}
virtual void DrawLine( long x1, long y1, long x2, long y2 ) = 0;
inline void DrawLine(const wxPoint& pt1, const wxPoint& pt2)
{
DrawLine(pt1.x, pt1.y, pt2.x, pt2.y);
}
virtual void CrossHair( long x, long y ) = 0;
inline void CrossHair(const wxPoint& pt)
{
CrossHair(pt.x, pt.y);
}
virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc );
inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)
{
DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y);
}
virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea ) = 0;
virtual void DrawEllipticArc (const wxPoint& pt, const wxSize& sz, double sa, double ea)
{
DrawEllipticArc(pt.x, pt.y, sz.x, sz.y, sa, ea);
}
virtual void DrawPoint( long x, long y ) = 0;
inline void DrawPoint(const wxPoint& pt)
{
DrawPoint(pt.x, pt.y);
}
virtual void DrawPoint( wxPoint& point );
virtual void DrawLines( int n, wxPoint points[], long xoffset = 0, long yoffset = 0 ) = 0;
@@ -85,27 +113,76 @@ class wxDC: public wxObject
int fillStyle=wxODDEVEN_RULE );
virtual void DrawRectangle( long x, long y, long width, long height ) = 0;
inline void DrawRectangle(const wxPoint& pt, const wxSize& sz)
{
DrawRectangle(pt.x, pt.y, sz.x, sz.y);
}
inline void DrawRectangle(const wxRect& rect)
{
DrawRectangle(rect.x, rect.y, rect.width, rect.height);
}
virtual void DrawRoundedRectangle( long x, long y, long width, long height, double radius = 20.0 ) = 0;
inline void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz, double radius = 20.0)
{
DrawRoundedRectangle(pt.x, pt.y, sz.x, sz.y, radius);
}
inline void DrawRoundedRectangle(const wxRect& rect, double radius = 20.0)
{
DrawRoundedRectangle(rect.x, rect.y, rect.width, rect.height, radius);
}
virtual void DrawEllipse( long x, long y, long width, long height ) = 0;
inline void DrawEllipse(const wxPoint& pt, const wxSize& sz)
{
DrawEllipse(pt.x, pt.y, sz.x, sz.y);
}
inline void DrawEllipse(const wxRect& rect)
{
DrawEllipse(rect.x, rect.y, rect.width, rect.height);
}
virtual void DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 );
virtual void DrawSpline( wxList *points ) = 0;
virtual void DrawSpline( int n, wxPoint points[] );
virtual bool CanDrawBitmap(void) const = 0;
virtual void DrawIcon( const wxIcon &icon, long x, long y )
{ DrawIcon( icon, x, y, TRUE ); }
virtual void DrawIcon( const wxIcon &icon, long x, long y, bool useMask );
void DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask=FALSE )
{ DrawIcon( *((wxIcon*)(&bmp)), x, y, useMask ); }
virtual bool Blit( long xdest, long ydest, long width, long height,
wxDC *source, long xsrc, long ysrc, int logical_func = wxCOPY, bool useMask=FALSE ) = 0;
virtual void DrawIcon( const wxIcon &icon, long x, long y ) = 0;
inline void DrawIcon( const wxIcon& icon, const wxPoint& pt )
{
DrawIcon(icon, pt.x, pt.y);
}
virtual void DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask=FALSE ) = 0;
inline void DrawBitmap( const wxBitmap& bitmap, const wxPoint& pt, bool useMask=FALSE )
{
DrawBitmap(bitmap, pt.x, pt.y, useMask );
}
virtual bool Blit( long xdest, long ydest,
long width, long height,
wxDC *source,
long xsrc, long ysrc,
int logical_func=wxCOPY,
bool useMask=FALSE ) = 0;
inline bool Blit( const wxPoint& destPt,
const wxSize& sz,
wxDC *source,
const wxPoint& srcPt,
int rop = wxCOPY,
bool useMask=FALSE)
{
return Blit(destPt.x, destPt.y, sz.x, sz.y, source, srcPt.x, srcPt.y, rop, useMask);
}
virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ) = 0;
inline void DrawText(const wxString& text, const wxPoint& pt, bool use16bit = FALSE )
{
DrawText(text, pt.x, pt.y, use16bit);
}
virtual bool CanGetTextExtent(void) const = 0;
virtual void GetTextExtent( const wxString &string, long *width, long *height,
long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE ) = 0;
virtual void GetTextExtent( const wxString &string,
long *width, long *height,
long *descent = (long *) NULL,
long *externalLeading = (long *) NULL,
wxFont *theFont = (wxFont *) NULL,
bool use16 = FALSE ) = 0;
virtual long GetCharWidth(void) = 0;
virtual long GetCharHeight(void) = 0;
@@ -138,9 +215,10 @@ class wxDC: public wxObject
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
// the first two must be overridden and called
virtual void SetClippingRegion( long x, long y, long width, long height );
virtual void DestroyClippingRegion(void);
virtual void SetClippingRegion( long x, long y, long width, long height );
virtual void GetClippingBox( long *x, long *y, long *width, long *height ) const;
virtual void SetClippingRegion( const wxRegion &region ) = 0;
virtual inline long MinX(void) const { return m_minX; }
virtual inline long MaxX(void) const { return m_maxX; }
@@ -183,7 +261,7 @@ class wxDC: public wxObject
virtual long LogicalToDeviceXRel(long x) const;
virtual long LogicalToDeviceYRel(long y) const;
public:
// implementation
void CalcBoundingBox( long x, long y );
void ComputeScaleAndOrigin(void);
@@ -279,7 +357,7 @@ class wxDC: public wxObject
// not sure what for, but what is a mm on a screen you don't know the size of?
double m_mm_to_pix_x,m_mm_to_pix_y;
long m_deviceOriginX,m_deviceOriginY; // Sum of the two above.
long m_deviceOriginX,m_deviceOriginY;
long m_logicalOriginX,m_logicalOriginY; // User defined.

6
include/wx/gtk/dcclient.h
View File

@@ -40,7 +40,7 @@ public:
~wxWindowDC(void);
virtual void FloodFill( long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE );
virtual void FloodFill( long x, long y, const wxColour& col, int style=wxFLOOD_SURFACE );
virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
virtual void DrawLine( long x1, long y1, long x2, long y2 );
@@ -61,7 +61,8 @@ public:
virtual void DrawEllipse( long x, long y, long width, long height );
virtual bool CanDrawBitmap(void) const;
virtual void DrawIcon( const wxIcon &icon, long x, long y, bool useMask=FALSE );
virtual void DrawIcon( const wxIcon &icon, long x, long y );
virtual void DrawBitmap( const wxBitmap &bitmap, long x, long y, bool useMask=FALSE );
virtual bool Blit( long xdest, long ydest, long width, long height,
wxDC *source, long xsrc, long ysrc, int logical_func = wxCOPY, bool useMask=FALSE );
@@ -87,6 +88,7 @@ public:
virtual void SetClippingRegion( long x, long y, long width, long height );
virtual void DestroyClippingRegion(void);
virtual void SetClippingRegion( const wxRegion &region );
virtual void DrawSpline( wxList *points );

1
include/wx/gtk/window.h
View File

@@ -165,6 +165,7 @@ public:
{ return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
void SetParent( wxWindow *p )
{ m_parent = p; }
virtual wxWindow *ReParent( wxWindow *newParent );
wxEvtHandler *GetEventHandler();
void SetEventHandler( wxEvtHandler *handler );

108
include/wx/gtk1/dc.h
View File

@@ -67,14 +67,42 @@ class wxDC: public wxObject
virtual bool Ok(void) const;
virtual void FloodFill( long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE ) = 0;
virtual bool GetPixel( long x1, long y1, wxColour *col ) const = 0;
virtual void FloodFill( long x, long y, const wxColour& col, int style=wxFLOOD_SURFACE ) = 0;
inline void FloodFill(const wxPoint& pt, const wxColour& col, int style=wxFLOOD_SURFACE)
{
FloodFill(pt.x, pt.y, col, style);
}
virtual bool GetPixel( long x, long y, wxColour *col ) const = 0;
inline bool GetPixel(const wxPoint& pt, wxColour *col) const
{
return GetPixel(pt.x, pt.y, col);
}
virtual void DrawLine( long x1, long y1, long x2, long y2 ) = 0;
inline void DrawLine(const wxPoint& pt1, const wxPoint& pt2)
{
DrawLine(pt1.x, pt1.y, pt2.x, pt2.y);
}
virtual void CrossHair( long x, long y ) = 0;
inline void CrossHair(const wxPoint& pt)
{
CrossHair(pt.x, pt.y);
}
virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc );
inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)
{
DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y);
}
virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea ) = 0;
virtual void DrawEllipticArc (const wxPoint& pt, const wxSize& sz, double sa, double ea)
{
DrawEllipticArc(pt.x, pt.y, sz.x, sz.y, sa, ea);
}
virtual void DrawPoint( long x, long y ) = 0;
inline void DrawPoint(const wxPoint& pt)
{
DrawPoint(pt.x, pt.y);
}
virtual void DrawPoint( wxPoint& point );
virtual void DrawLines( int n, wxPoint points[], long xoffset = 0, long yoffset = 0 ) = 0;
@@ -85,27 +113,76 @@ class wxDC: public wxObject
int fillStyle=wxODDEVEN_RULE );
virtual void DrawRectangle( long x, long y, long width, long height ) = 0;
inline void DrawRectangle(const wxPoint& pt, const wxSize& sz)
{
DrawRectangle(pt.x, pt.y, sz.x, sz.y);
}
inline void DrawRectangle(const wxRect& rect)
{
DrawRectangle(rect.x, rect.y, rect.width, rect.height);
}
virtual void DrawRoundedRectangle( long x, long y, long width, long height, double radius = 20.0 ) = 0;
inline void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz, double radius = 20.0)
{
DrawRoundedRectangle(pt.x, pt.y, sz.x, sz.y, radius);
}
inline void DrawRoundedRectangle(const wxRect& rect, double radius = 20.0)
{
DrawRoundedRectangle(rect.x, rect.y, rect.width, rect.height, radius);
}
virtual void DrawEllipse( long x, long y, long width, long height ) = 0;
inline void DrawEllipse(const wxPoint& pt, const wxSize& sz)
{
DrawEllipse(pt.x, pt.y, sz.x, sz.y);
}
inline void DrawEllipse(const wxRect& rect)
{
DrawEllipse(rect.x, rect.y, rect.width, rect.height);
}
virtual void DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 );
virtual void DrawSpline( wxList *points ) = 0;
virtual void DrawSpline( int n, wxPoint points[] );
virtual bool CanDrawBitmap(void) const = 0;
virtual void DrawIcon( const wxIcon &icon, long x, long y )
{ DrawIcon( icon, x, y, TRUE ); }
virtual void DrawIcon( const wxIcon &icon, long x, long y, bool useMask );
void DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask=FALSE )
{ DrawIcon( *((wxIcon*)(&bmp)), x, y, useMask ); }
virtual bool Blit( long xdest, long ydest, long width, long height,
wxDC *source, long xsrc, long ysrc, int logical_func = wxCOPY, bool useMask=FALSE ) = 0;
virtual void DrawIcon( const wxIcon &icon, long x, long y ) = 0;
inline void DrawIcon( const wxIcon& icon, const wxPoint& pt )
{
DrawIcon(icon, pt.x, pt.y);
}
virtual void DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask=FALSE ) = 0;
inline void DrawBitmap( const wxBitmap& bitmap, const wxPoint& pt, bool useMask=FALSE )
{
DrawBitmap(bitmap, pt.x, pt.y, useMask );
}
virtual bool Blit( long xdest, long ydest,
long width, long height,
wxDC *source,
long xsrc, long ysrc,
int logical_func=wxCOPY,
bool useMask=FALSE ) = 0;
inline bool Blit( const wxPoint& destPt,
const wxSize& sz,
wxDC *source,
const wxPoint& srcPt,
int rop = wxCOPY,
bool useMask=FALSE)
{
return Blit(destPt.x, destPt.y, sz.x, sz.y, source, srcPt.x, srcPt.y, rop, useMask);
}
virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ) = 0;
inline void DrawText(const wxString& text, const wxPoint& pt, bool use16bit = FALSE )
{
DrawText(text, pt.x, pt.y, use16bit);
}
virtual bool CanGetTextExtent(void) const = 0;
virtual void GetTextExtent( const wxString &string, long *width, long *height,
long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE ) = 0;
virtual void GetTextExtent( const wxString &string,
long *width, long *height,
long *descent = (long *) NULL,
long *externalLeading = (long *) NULL,
wxFont *theFont = (wxFont *) NULL,
bool use16 = FALSE ) = 0;
virtual long GetCharWidth(void) = 0;
virtual long GetCharHeight(void) = 0;
@@ -138,9 +215,10 @@ class wxDC: public wxObject
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
// the first two must be overridden and called
virtual void SetClippingRegion( long x, long y, long width, long height );
virtual void DestroyClippingRegion(void);
virtual void SetClippingRegion( long x, long y, long width, long height );
virtual void GetClippingBox( long *x, long *y, long *width, long *height ) const;
virtual void SetClippingRegion( const wxRegion &region ) = 0;
virtual inline long MinX(void) const { return m_minX; }
virtual inline long MaxX(void) const { return m_maxX; }
@@ -183,7 +261,7 @@ class wxDC: public wxObject
virtual long LogicalToDeviceXRel(long x) const;
virtual long LogicalToDeviceYRel(long y) const;
public:
// implementation
void CalcBoundingBox( long x, long y );
void ComputeScaleAndOrigin(void);
@@ -279,7 +357,7 @@ class wxDC: public wxObject
// not sure what for, but what is a mm on a screen you don't know the size of?
double m_mm_to_pix_x,m_mm_to_pix_y;
long m_deviceOriginX,m_deviceOriginY; // Sum of the two above.
long m_deviceOriginX,m_deviceOriginY;
long m_logicalOriginX,m_logicalOriginY; // User defined.

6
include/wx/gtk1/dcclient.h
View File

@@ -40,7 +40,7 @@ public:
~wxWindowDC(void);
virtual void FloodFill( long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE );
virtual void FloodFill( long x, long y, const wxColour& col, int style=wxFLOOD_SURFACE );
virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
virtual void DrawLine( long x1, long y1, long x2, long y2 );
@@ -61,7 +61,8 @@ public:
virtual void DrawEllipse( long x, long y, long width, long height );
virtual bool CanDrawBitmap(void) const;
virtual void DrawIcon( const wxIcon &icon, long x, long y, bool useMask=FALSE );
virtual void DrawIcon( const wxIcon &icon, long x, long y );
virtual void DrawBitmap( const wxBitmap &bitmap, long x, long y, bool useMask=FALSE );
virtual bool Blit( long xdest, long ydest, long width, long height,
wxDC *source, long xsrc, long ysrc, int logical_func = wxCOPY, bool useMask=FALSE );
@@ -87,6 +88,7 @@ public:
virtual void SetClippingRegion( long x, long y, long width, long height );
virtual void DestroyClippingRegion(void);
virtual void SetClippingRegion( const wxRegion &region );
virtual void DrawSpline( wxList *points );

1
include/wx/gtk1/window.h
View File

@@ -165,6 +165,7 @@ public:
{ return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
void SetParent( wxWindow *p )
{ m_parent = p; }
virtual wxWindow *ReParent( wxWindow *newParent );
wxEvtHandler *GetEventHandler();
void SetEventHandler( wxEvtHandler *handler );

9
include/wx/postscrp.h
View File

@@ -61,7 +61,7 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
inline virtual void BeginDrawing(void) {} ;
inline virtual void EndDrawing(void) {} ;
void FloodFill(long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE) ;
void FloodFill(long x1, long y1, const wxColour &col, int style=wxFLOOD_SURFACE) ;
bool GetPixel(long x1, long y1, wxColour *col) const;
void DrawLine(long x1, long y1, long x2, long y2);
@@ -86,10 +86,7 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
void DrawSpline(wxList *points);
void DrawIcon( const wxIcon& icon, long x, long y );
#ifdef __WXGTK__
void DrawIcon(const wxIcon& icon, long x, long y, bool WXUNUSED(usemask) )
{ DrawIcon( icon, x, y ); }
#endif
void DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask=FALSE );
void DrawText(const wxString& text, long x, long y, bool use16 = FALSE);
void Clear();
@@ -98,7 +95,9 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
void SetBrush(const wxBrush& brush);
void SetLogicalFunction(int function);
void SetBackground(const wxBrush& brush);
void SetClippingRegion(long x, long y, long width, long height);
void SetClippingRegion( const wxRegion &region );
void DestroyClippingRegion();
bool StartDoc(const wxString& message);

10
src/common/postscrp.cpp
View File

@@ -304,6 +304,10 @@ void wxPostScriptDC::SetClippingRegion (long cx, long cy, long cw, long ch)
*m_pstream << "closepath clip newpath\n";
}
void wxPostScriptDC::SetClippingRegion( const wxRegion &WXUNUSED(region) )
{
}
void wxPostScriptDC::DestroyClippingRegion ()
{
if (!m_pstream)
@@ -319,7 +323,7 @@ void wxPostScriptDC::Clear ()
{
}
void wxPostScriptDC::FloodFill (long WXUNUSED(x), long WXUNUSED(y), wxColour * WXUNUSED(col), int WXUNUSED(style))
void wxPostScriptDC::FloodFill (long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
{
}
@@ -685,6 +689,10 @@ void wxPostScriptDC::DrawIcon (const wxIcon& icon, long x, long y)
#endif
}
void wxPostScriptDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask )
{
}
void wxPostScriptDC::SetFont (const wxFont& the_font)
{
if (!m_pstream)

3
src/generic/imaglist.cpp
View File

@@ -113,8 +113,7 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
if (!node) return FALSE;
wxBitmap *bm = (wxBitmap*)node->Data();
wxIcon *icon = (wxIcon*)bm;
dc.DrawIcon( *icon, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
return TRUE;
}

4
src/gtk.inc
View File

@@ -2,9 +2,9 @@
NONE =
# define library name
LIB_TARGET=wx_gtk
LIB_TARGET=wx_gtk_1_0
LIB_MAJOR=1
LIB_MINOR=97
LIB_MINOR=99
# define library sources

4
src/gtk/dc.cpp
View File

@@ -93,10 +93,6 @@ void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), lon
{
}
void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y), bool WXUNUSED(useMask) )
{
}
void wxDC::DrawPoint( wxPoint& point )
{
DrawPoint( point.x, point.y );

68
src/gtk/dcclient.cpp
View File

@@ -116,15 +116,6 @@ wxWindowDC::wxWindowDC( wxWindow *window )
SetUpDC();
/*
wxRegion update = window->GetUpdateRegion();
if (update.Empty()) return;
gdk_gc_set_clip_region( m_penGC, update.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, update.GetRegion() );
gdk_gc_set_clip_region( m_textGC, update.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, update.GetRegion() );
*/
}
wxWindowDC::~wxWindowDC(void)
@@ -132,8 +123,8 @@ wxWindowDC::~wxWindowDC(void)
Destroy();
}
void wxWindowDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1),
wxColour *WXUNUSED(col), int WXUNUSED(style) )
void wxWindowDC::FloodFill( long WXUNUSED(x), long WXUNUSED(y),
const wxColour &WXUNUSED(col), int WXUNUSED(style) )
{
wxFAIL_MSG( "wxWindowDC::FloodFill not implemented" );
}
@@ -505,7 +496,7 @@ bool wxWindowDC::CanDrawBitmap(void) const
return TRUE;
}
void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y )
{
if (!Ok()) return;
@@ -517,7 +508,7 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
GdkBitmap *mask = (GdkBitmap *) NULL;
if (icon.GetMask()) mask = icon.GetMask()->GetBitmap();
if (useMask && mask)
if (mask)
{
gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy );
@@ -526,6 +517,39 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
GdkPixmap *pm = icon.GetPixmap();
gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );
if (mask)
{
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
gdk_gc_set_clip_origin( m_penGC, 0, 0 );
}
CalcBoundingBox( x, y );
int width = icon.GetWidth();
int height = icon.GetHeight();
CalcBoundingBox( x + width, y + height );
}
void wxWindowDC::DrawBitmap( const wxBitmap &bitmap, long x, long y, bool useMask )
{
if (!Ok()) return;
if (!bitmap.Ok()) return;
int xx = XLOG2DEV(x);
int yy = YLOG2DEV(y);
GdkBitmap *mask = (GdkBitmap *) NULL;
if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
if (useMask && mask)
{
gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy );
}
GdkPixmap *pm = bitmap.GetPixmap();
gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );
if (useMask && mask)
{
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
@@ -533,8 +557,8 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
}
CalcBoundingBox( x, y );
int width = icon.GetWidth();
int height = icon.GetHeight();
int width = bitmap.GetWidth();
int height = bitmap.GetHeight();
CalcBoundingBox( x + width, y + height );
}
@@ -941,6 +965,20 @@ void wxWindowDC::SetClippingRegion( long x, long y, long width, long height )
gdk_gc_set_clip_rectangle( m_bgGC, &rect );
}
void wxWindowDC::SetClippingRegion( const wxRegion &region )
{
if (region.Empty())
{
DestroyClippingRegion();
return;
}
gdk_gc_set_clip_region( m_penGC, region.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, region.GetRegion() );
gdk_gc_set_clip_region( m_textGC, region.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, region.GetRegion() );
}
void wxWindowDC::DestroyClippingRegion(void)
{
wxDC::DestroyClippingRegion();

2
src/gtk/win_gtk.c
View File

@@ -211,7 +211,7 @@ gtk_myfixed_move (GtkMyFixed *myfixed,
if (child->widget == widget)
{
/* if ((child->x == x) && (child->y == y)) return; */
if ((child->x == x) && (child->y == y)) return;
child->x = x;
child->y = y;

17
src/gtk/window.cpp
View File

@@ -1813,6 +1813,23 @@ wxList *wxWindow::GetChildren()
return (&m_children);
}
wxWindow *wxWindow::ReParent( wxWindow *newParent )
{
wxWindow *oldParent = GetParent();
if (oldParent) oldParent->RemoveChild( this );
gtk_widget_unparent( m_widget );
if (newParent)
{
newParent->AddChild( this );
(newParent->m_insertCallback)( newParent, this );
}
return oldParent;
}
void wxWindow::RemoveChild( wxWindow *child )
{
if (GetChildren()) GetChildren()->DeleteObject( child );

4
src/gtk1/dc.cpp
View File

@@ -93,10 +93,6 @@ void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), lon
{
}
void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y), bool WXUNUSED(useMask) )
{
}
void wxDC::DrawPoint( wxPoint& point )
{
DrawPoint( point.x, point.y );

68
src/gtk1/dcclient.cpp
View File

@@ -116,15 +116,6 @@ wxWindowDC::wxWindowDC( wxWindow *window )
SetUpDC();
/*
wxRegion update = window->GetUpdateRegion();
if (update.Empty()) return;
gdk_gc_set_clip_region( m_penGC, update.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, update.GetRegion() );
gdk_gc_set_clip_region( m_textGC, update.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, update.GetRegion() );
*/
}
wxWindowDC::~wxWindowDC(void)
@@ -132,8 +123,8 @@ wxWindowDC::~wxWindowDC(void)
Destroy();
}
void wxWindowDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1),
wxColour *WXUNUSED(col), int WXUNUSED(style) )
void wxWindowDC::FloodFill( long WXUNUSED(x), long WXUNUSED(y),
const wxColour &WXUNUSED(col), int WXUNUSED(style) )
{
wxFAIL_MSG( "wxWindowDC::FloodFill not implemented" );
}
@@ -505,7 +496,7 @@ bool wxWindowDC::CanDrawBitmap(void) const
return TRUE;
}
void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y )
{
if (!Ok()) return;
@@ -517,7 +508,7 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
GdkBitmap *mask = (GdkBitmap *) NULL;
if (icon.GetMask()) mask = icon.GetMask()->GetBitmap();
if (useMask && mask)
if (mask)
{
gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy );
@@ -526,6 +517,39 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
GdkPixmap *pm = icon.GetPixmap();
gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );
if (mask)
{
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
gdk_gc_set_clip_origin( m_penGC, 0, 0 );
}
CalcBoundingBox( x, y );
int width = icon.GetWidth();
int height = icon.GetHeight();
CalcBoundingBox( x + width, y + height );
}
void wxWindowDC::DrawBitmap( const wxBitmap &bitmap, long x, long y, bool useMask )
{
if (!Ok()) return;
if (!bitmap.Ok()) return;
int xx = XLOG2DEV(x);
int yy = YLOG2DEV(y);
GdkBitmap *mask = (GdkBitmap *) NULL;
if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
if (useMask && mask)
{
gdk_gc_set_clip_mask( m_penGC, mask );
gdk_gc_set_clip_origin( m_penGC, xx, yy );
}
GdkPixmap *pm = bitmap.GetPixmap();
gdk_draw_pixmap( m_window, m_penGC, pm, 0, 0, xx, yy, -1, -1 );
if (useMask && mask)
{
gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
@@ -533,8 +557,8 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
}
CalcBoundingBox( x, y );
int width = icon.GetWidth();
int height = icon.GetHeight();
int width = bitmap.GetWidth();
int height = bitmap.GetHeight();
CalcBoundingBox( x + width, y + height );
}
@@ -941,6 +965,20 @@ void wxWindowDC::SetClippingRegion( long x, long y, long width, long height )
gdk_gc_set_clip_rectangle( m_bgGC, &rect );
}
void wxWindowDC::SetClippingRegion( const wxRegion &region )
{
if (region.Empty())
{
DestroyClippingRegion();
return;
}
gdk_gc_set_clip_region( m_penGC, region.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, region.GetRegion() );
gdk_gc_set_clip_region( m_textGC, region.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, region.GetRegion() );
}
void wxWindowDC::DestroyClippingRegion(void)
{
wxDC::DestroyClippingRegion();

2
src/gtk1/win_gtk.c
View File

@@ -211,7 +211,7 @@ gtk_myfixed_move (GtkMyFixed *myfixed,
if (child->widget == widget)
{
/* if ((child->x == x) && (child->y == y)) return; */
if ((child->x == x) && (child->y == y)) return;
child->x = x;
child->y = y;

17
src/gtk1/window.cpp
View File

@@ -1813,6 +1813,23 @@ wxList *wxWindow::GetChildren()
return (&m_children);
}
wxWindow *wxWindow::ReParent( wxWindow *newParent )
{
wxWindow *oldParent = GetParent();
if (oldParent) oldParent->RemoveChild( this );
gtk_widget_unparent( m_widget );
if (newParent)
{
newParent->AddChild( this );
(newParent->m_insertCallback)( newParent, this );
}
return oldParent;
}
void wxWindow::RemoveChild( wxWindow *child )
{
if (GetChildren()) GetChildren()->DeleteObject( child );

2
wx-config.in
View File

@@ -36,7 +36,7 @@ while test $# -gt 0; do
echo $exec_prefix
;;
--version)
echo 1.97
echo 1.99
;;
--cflags)
if test @includedir@ != /usr/include ; then