df13791078
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
51 lines
1.8 KiB
C++
51 lines
1.8 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/qt/clrpicker.h
|
|
// Author: Peter Most
|
|
// Copyright: (c) Peter Most
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_QT_CLRPICKER_H_
|
|
#define _WX_QT_CLRPICKER_H_
|
|
|
|
#include "wx/generic/clrpickerg.h"
|
|
|
|
// TODO: A QtColorPicker is available from
|
|
// http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Widgets/qtcolorpicker/
|
|
// How to integrate into wxWidgets:
|
|
//
|
|
// class WXDLLIMPEXP_CORE wxColourPickerWidget : public wxButton, public wxColourPickerWidgetBase
|
|
|
|
// TODO: For now we reuse the existing wxGenericColourButton but this should be
|
|
// changed to use the above mentioned color picker.
|
|
|
|
class WXDLLIMPEXP_CORE wxColourPickerWidget : public wxGenericColourButton
|
|
{
|
|
public:
|
|
wxColourPickerWidget();
|
|
wxColourPickerWidget(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxColour& initial = *wxBLACK,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxCLRBTN_DEFAULT_STYLE,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxColourPickerWidgetNameStr);
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxColour& initial = *wxBLACK,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxCLRBTN_DEFAULT_STYLE,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxColourPickerWidgetNameStr);
|
|
|
|
protected:
|
|
virtual void UpdateColour();
|
|
|
|
private:
|
|
};
|
|
|
|
#endif // _WX_QT_CLRPICKER_H_
|