X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..594f0f5bf1355fb8d58f403d3ebacc1c1767c429:/include/wx/colordlg.h?ds=sidebyside diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 977c8e5bde..54a8fdc515 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -1,19 +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 wxUSE_COLOURDLG + #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(__WXSTUBS__) -#include "wx/generic/colrdlgg.h" + #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_