X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd34332fc40b7f43507ec3c724a3abb64d42ff7c..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/colordlg.h?ds=sidebyside diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 75e6b83f7d..2f9df47192 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -1,26 +1,42 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/colordlg.h +// Purpose: wxColourDialog +// Author: Vadim Zeitiln +// Modified by: +// Created: 01/02/97 +// RCS-ID: $Id$ +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + #ifndef _WX_COLORDLG_H_BASE_ #define _WX_COLORDLG_H_BASE_ -#if defined(__WXMSW__) -#include "wx/msw/colordlg.h" -#elif defined(__WXMOTIF__) -#include "wx/generic/colrdlgg.h" -#elif defined(__WXGTK__) -#include "wx/generic/colrdlgg.h" -#elif defined(__WXQT__) -#include "wx/generic/colrdlgg.h" -#elif defined(__WXMAC__) -#include "wx/generic/colrdlgg.h" -#elif defined(__WXPM__) -#include "wx/os2/colordlg.h" -#elif defined(__WXSTUBS__) -#include "wx/generic/colrdlgg.h" -#endif +#include "wx/defs.h" + +#if wxUSE_COLOURDLG + +#include "wx/colourdata.h" -#if !defined(__WXMSW__) -#define wxColourDialog wxGenericColourDialog -#define sm_classwxColourDialog sm_classwxGenericColourDialog +#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" +#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_