This merges in the latest sources from GSoC 2014 wxQt project with just a few minor corrections, mostly undoing wrong changes to common files in that branch (results of a previous bad merge?) and getting rid of whitespace-only changes. Also remove debug logging from wxGrid. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
		
			
				
	
	
		
			87 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			87 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /////////////////////////////////////////////////////////////////////////////
 | |
| // Name:        wx/qt/region.h
 | |
| // Purpose:     header for wxRegion
 | |
| // Author:      Peter Most, Javier Torres
 | |
| // Copyright:   (c) Peter Most, Javier Torres
 | |
| // Licence:     wxWindows Licence
 | |
| /////////////////////////////////////////////////////////////////////////////
 | |
| 
 | |
| #ifndef _WX_QT_REGION_H_
 | |
| #define _WX_QT_REGION_H_
 | |
| 
 | |
| #include <QtGui/QRegion>
 | |
| 
 | |
| class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase
 | |
| {
 | |
| public:
 | |
|     wxRegion();
 | |
|     wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 | |
|     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
 | |
|     wxRegion(const wxRect& rect);
 | |
|     wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
 | |
|     wxRegion(const wxBitmap& bmp);
 | |
|     wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0);
 | |
|     
 | |
|     virtual bool IsEmpty() const;
 | |
|     virtual void Clear();
 | |
| 
 | |
|     virtual QRegion GetHandle() const;
 | |
|     virtual void QtSetRegion(QRegion region); // Hangs on to this region
 | |
| 
 | |
| protected:
 | |
|     virtual wxGDIRefData *CreateGDIRefData() const;
 | |
|     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 | |
| 
 | |
|     virtual bool DoIsEqual(const wxRegion& region) const;
 | |
|     virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
 | |
|     virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
 | |
|     virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
 | |
| 
 | |
|     virtual bool DoOffset(wxCoord x, wxCoord y);
 | |
| 
 | |
|     virtual bool DoUnionWithRect(const wxRect& rect);
 | |
|     virtual bool DoUnionWithRegion(const wxRegion& region);
 | |
| 
 | |
|     virtual bool DoIntersect(const wxRegion& region);
 | |
|     virtual bool DoSubtract(const wxRegion& region);
 | |
|     virtual bool DoXor(const wxRegion& region);
 | |
|     
 | |
| private:
 | |
| };
 | |
| 
 | |
| 
 | |
| 
 | |
| class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject
 | |
| {
 | |
| public:
 | |
|     wxRegionIterator();
 | |
|     wxRegionIterator(const wxRegion& region);
 | |
|     wxRegionIterator(const wxRegionIterator& ri);
 | |
|     ~wxRegionIterator();
 | |
| 
 | |
|     wxRegionIterator& operator=(const wxRegionIterator& ri);
 | |
| 
 | |
|     void Reset();
 | |
|     void Reset(const wxRegion& region);
 | |
| 
 | |
|     bool HaveRects() const;
 | |
|     operator bool () const;
 | |
| 
 | |
|     wxRegionIterator& operator ++ ();
 | |
|     wxRegionIterator operator ++ (int);
 | |
| 
 | |
|     wxCoord GetX() const;
 | |
|     wxCoord GetY() const;
 | |
|     wxCoord GetW() const;
 | |
|     wxCoord GetWidth() const;
 | |
|     wxCoord GetH() const;
 | |
|     wxCoord GetHeight() const;
 | |
|     wxRect GetRect() const;
 | |
|     
 | |
| private:
 | |
|     QVector< QRect > *m_qtRects;
 | |
|     int m_pos;
 | |
| };
 | |
| 
 | |
| #endif // _WX_QT_REGION_H_
 |