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
		
			
				
	
	
		
			57 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			57 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /////////////////////////////////////////////////////////////////////////////
 | |
| // Name:        wx/qt/pen.h
 | |
| // Author:      Peter Most, Javier Torres
 | |
| // Copyright:   (c) Peter Most, Javier Torres
 | |
| // Licence:     wxWindows licence
 | |
| /////////////////////////////////////////////////////////////////////////////
 | |
| 
 | |
| #ifndef _WX_QT_PEN_H_
 | |
| #define _WX_QT_PEN_H_
 | |
| 
 | |
| #include <QtCore/Qt>
 | |
| 
 | |
| class QPen;
 | |
| 
 | |
| class WXDLLIMPEXP_CORE wxPen : public wxPenBase
 | |
| {
 | |
| public:
 | |
|     wxPen();
 | |
| 
 | |
|     wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
 | |
| 
 | |
|     wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
 | |
|     wxPen(const wxColour& col, int width, int style);
 | |
| 
 | |
|     bool operator==(const wxPen& pen) const;
 | |
|     bool operator!=(const wxPen& pen) const;
 | |
| 
 | |
|     virtual void SetColour(const wxColour& col);
 | |
|     virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
 | |
| 
 | |
|     virtual void SetWidth(int width);
 | |
|     virtual void SetStyle(wxPenStyle style);
 | |
|     virtual void SetStipple(const wxBitmap& stipple);
 | |
|     virtual void SetDashes(int nb_dashes, const wxDash *dash);
 | |
|     virtual void SetJoin(wxPenJoin join);
 | |
|     virtual void SetCap(wxPenCap cap);
 | |
| 
 | |
|     virtual wxColour GetColour() const;
 | |
|     virtual wxBitmap *GetStipple() const;
 | |
|     virtual wxPenStyle GetStyle() const;
 | |
|     virtual wxPenJoin GetJoin() const;
 | |
|     virtual wxPenCap GetCap() const;
 | |
|     virtual int GetWidth() const;
 | |
|     virtual int GetDashes(wxDash **ptr) const;
 | |
| 
 | |
|     wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
 | |
|     void SetStyle(int style) { SetStyle((wxPenStyle)style); }
 | |
|         
 | |
|     QPen GetHandle() const;
 | |
| 
 | |
| protected:
 | |
|     virtual wxGDIRefData *CreateGDIRefData() const;
 | |
|     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 | |
| };
 | |
| 
 | |
| #endif // _WX_QT_PEN_H_
 |