X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37f214d588b02079a3ddf64c2e46585ca1657c1b..d7926e0b761b782b82f9ef01ff542251b2ef5ae7:/include/wx/colordlg.h diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 0e3c7cfaf4..54a8fdc515 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -1,26 +1,34 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/colrdlgg.h +// Purpose: wxColourDialog +// Author: Vadim Zeitiln +// Modified by: +// Created: 01/02/97 +// RCS-ID: $Id$ +// Copyright: (c) wxWindows 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 +#if wxUSE_COLOURDLG #if defined(__WXMSW__) -#define wxColourDialog wxGenericColourDialog -#define sm_classwxColourDialog sm_classwxColourDialog + #include "wx/msw/colordlg.h" +#else + #include "wx/generic/colrdlgg.h" + + #define wxColourDialog wxGenericColourDialog + #define sm_classwxColourDialog sm_classwxGenericColourDialog #endif +// get the colour from user and return it +wxColour WXDLLEXPORT +wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL, + const wxColour& colInit = wxNullColour); + +#endif // wxUSE_COLOURDLG + #endif // _WX_COLORDLG_H_BASE_