added wxUSE_COLOURDLG to the header too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,30 +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_
|
#ifndef _WX_COLORDLG_H_BASE_
|
||||||
#define _WX_COLORDLG_H_BASE_
|
#define _WX_COLORDLG_H_BASE_
|
||||||
|
|
||||||
#if defined(__WXMSW__)
|
#if wxUSE_COLOURDLG
|
||||||
#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/generic/colrdlgg.h"
|
|
||||||
#elif defined(__WXSTUBS__)
|
|
||||||
#include "wx/generic/colrdlgg.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined(__WXMSW__)
|
#if defined(__WXMSW__)
|
||||||
#define wxColourDialog wxGenericColourDialog
|
#include "wx/msw/colordlg.h"
|
||||||
#define sm_classwxColourDialog sm_classwxGenericColourDialog
|
#else
|
||||||
|
#include "wx/generic/colrdlgg.h"
|
||||||
|
|
||||||
|
#define wxColourDialog wxGenericColourDialog
|
||||||
|
#define sm_classwxColourDialog sm_classwxGenericColourDialog
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// get the colour from user and return it
|
// get the colour from user and return it
|
||||||
wxColour WXDLLEXPORT wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
|
wxColour WXDLLEXPORT
|
||||||
const wxColour& colInit = wxNullColour);
|
wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
|
||||||
|
const wxColour& colInit = wxNullColour);
|
||||||
|
|
||||||
|
#endif // wxUSE_COLOURDLG
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// _WX_COLORDLG_H_BASE_
|
// _WX_COLORDLG_H_BASE_
|
||||||
|
Reference in New Issue
Block a user