-#ifndef __COLORDLGH_BASE__
-#define __COLORDLGH_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"
+/////////////////////////////////////////////////////////////////////////////
+// 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_
+
+#include "wx/defs.h"
+
+#if wxUSE_COLOURDLG
+
+#include "wx/colourdata.h"
+
+#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