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
34 lines
868 B
C++
34 lines
868 B
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/qt/colordlg.h
|
|
// Author: Sean D'Epagnier
|
|
// Copyright: (c) Sean D'Epagnier 2014
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_QT_COLORDLG_H_
|
|
#define _WX_QT_COLORDLG_H_
|
|
|
|
#include "wx/dialog.h"
|
|
|
|
#include <QtWidgets/QColorDialog>
|
|
|
|
class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
|
|
{
|
|
public:
|
|
wxColourDialog() { }
|
|
wxColourDialog(wxWindow *parent,
|
|
wxColourData *data = NULL) { Create(parent, data); }
|
|
|
|
bool Create(wxWindow *parent, wxColourData *data = NULL);
|
|
|
|
wxColourData &GetColourData();
|
|
|
|
QColorDialog *GetHandle() const { return static_cast<QColorDialog *>(m_qtWindow); }
|
|
|
|
private:
|
|
|
|
wxColourData m_data;
|
|
};
|
|
|
|
#endif // _WX_QT_COLORDLG_H_
|