Merge wxQT branch into the trunk.
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
This commit is contained in:
28
include/wx/qt/palette.h
Normal file
28
include/wx/qt/palette.h
Normal file
@@ -0,0 +1,28 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/qt/palette.h
|
||||
// Author: Peter Most
|
||||
// Copyright: (c) Peter Most
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_QT_PALETTE_H_
|
||||
#define _WX_QT_PALETTE_H_
|
||||
|
||||
class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
|
||||
{
|
||||
public:
|
||||
wxPalette();
|
||||
wxPalette(int n, unsigned char *red, unsigned char *green, unsigned char *blue);
|
||||
|
||||
bool Create(int n, unsigned char *red, unsigned char *green, unsigned char *blue);
|
||||
|
||||
bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
|
||||
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
|
||||
|
||||
protected:
|
||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
|
||||
};
|
||||
|
||||
#endif // _WX_QT_PALETTE_H_
|
Reference in New Issue
Block a user