X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2049ba38adafa0ec146880de29f26e32dd69a125..f001799009630c46bc87aff5a84dbd2523005505:/include/wx/colordlg.h diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index e3b0a04c79..54a8fdc515 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -1,13 +1,34 @@ -#ifndef __COLORDLGH_BASE__ -#define __COLORDLGH_BASE__ +///////////////////////////////////////////////////////////////////////////// +// 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" + #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 - // __COLORDLGH_BASE__ + // _WX_COLORDLG_H_BASE_