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
44 lines
1.3 KiB
C
44 lines
1.3 KiB
C
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/colordlg.h
|
|
// Purpose: wxColourDialog
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) wxWidgets team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_COLORDLG_H_BASE_
|
|
#define _WX_COLORDLG_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_COLOURDLG
|
|
|
|
#include "wx/colourdata.h"
|
|
|
|
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
|
|
#include "wx/msw/colordlg.h"
|
|
#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
|
|
#include "wx/osx/colordlg.h"
|
|
#elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
|
|
#include "wx/gtk/colordlg.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/colordlg.h"
|
|
#else
|
|
#include "wx/generic/colrdlgg.h"
|
|
|
|
#define wxColourDialog wxGenericColourDialog
|
|
#endif
|
|
|
|
// get the colour from user and return it
|
|
WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL,
|
|
const wxColour& colInit = wxNullColour,
|
|
const wxString& caption = wxEmptyString,
|
|
wxColourData *data = NULL);
|
|
|
|
#endif // wxUSE_COLOURDLG
|
|
|
|
#endif
|
|
// _WX_COLORDLG_H_BASE_
|