no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / osx / colordlg.h

diff --git a/include/wx/osx/colordlg.h b/include/wx/osx/colordlg.h
index c6a3ac644708003a221cfc750f2e1d4a83454569..219e1b4e192347e4a8a6f40deba114564a17393a 100644 (file)
--- a/include/wx/osx/colordlg.h
+++ b/include/wx/osx/colordlg.h
@@ -1,6 +1,42 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/colordlg.h"
-#else
-#include "wx/mac/carbon/colordlg.h"
-#endif
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/mac/carbon/colordlg.h
+// Purpose:     wxColourDialog class. Use generic version if no
+//              platform-specific implementation.
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_COLORDLG_H_
+#define _WX_COLORDLG_H_
+
+#include "wx/defs.h"
+#include "wx/dialog.h"
+#include "wx/cmndata.h"
+
+/*
+ * Platform-specific colour dialog implementation
+ */
+
+class WXDLLIMPEXP_CORE wxColourDialog: public wxDialog
+{
+DECLARE_DYNAMIC_CLASS(wxColourDialog)
+public:
+    wxColourDialog();
+    wxColourDialog(wxWindow *parent, wxColourData *data = NULL);

 
 

+    bool Create(wxWindow *parent, wxColourData *data = NULL);
+
+    int ShowModal();
+    wxColourData& GetColourData() { return m_colourData; }
+
+protected:
+    wxColourData        m_colourData;
+    wxWindow*           m_dialogParent;
+};
+
+#endif
+    // _WX_COLORDLG_H_