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
		
			
				
	
	
		
			45 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			45 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/////////////////////////////////////////////////////////////////////////////
 | 
						|
// Name:        wx/palette.h
 | 
						|
// Purpose:     Common header and base class for wxPalette
 | 
						|
// Author:      Julian Smart
 | 
						|
// Modified by:
 | 
						|
// Created:
 | 
						|
// Copyright:   (c) Julian Smart
 | 
						|
// Licence:     wxWindows Licence
 | 
						|
/////////////////////////////////////////////////////////////////////////////
 | 
						|
 | 
						|
#ifndef _WX_PALETTE_H_BASE_
 | 
						|
#define _WX_PALETTE_H_BASE_
 | 
						|
 | 
						|
#include "wx/defs.h"
 | 
						|
 | 
						|
#if wxUSE_PALETTE
 | 
						|
 | 
						|
#include "wx/object.h"
 | 
						|
#include "wx/gdiobj.h"
 | 
						|
 | 
						|
// wxPaletteBase
 | 
						|
class WXDLLIMPEXP_CORE wxPaletteBase: public wxGDIObject
 | 
						|
{
 | 
						|
public:
 | 
						|
    virtual ~wxPaletteBase() { }
 | 
						|
 | 
						|
    virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; }
 | 
						|
};
 | 
						|
 | 
						|
#if defined(__WXMSW__)
 | 
						|
    #include "wx/msw/palette.h"
 | 
						|
#elif defined(__WXX11__) || defined(__WXMOTIF__)
 | 
						|
    #include "wx/x11/palette.h"
 | 
						|
#elif defined(__WXGTK__)
 | 
						|
    #include "wx/generic/paletteg.h"
 | 
						|
#elif defined(__WXMAC__)
 | 
						|
    #include "wx/osx/palette.h"
 | 
						|
#elif defined(__WXQT__)
 | 
						|
    #include "wx/qt/palette.h"
 | 
						|
#endif
 | 
						|
 | 
						|
#endif // wxUSE_PALETTE
 | 
						|
 | 
						|
#endif // _WX_PALETTE_H_BASE_
 |