Apply parts of patch #1719888 to fix compilation on Mac and with

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

diff --git a/include/wx/mac/colordlg.h b/include/wx/mac/colordlg.h
index af93ad7c6bc6819771190312c56760d8819c5821..c6a3ac644708003a221cfc750f2e1d4a83454569 100644 (file)
--- a/include/wx/mac/colordlg.h
+++ b/include/wx/mac/colordlg.h
@@ -1,46 +1,6 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        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_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "colordlg.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/colordlg.h"
+#else
+#include "wx/mac/carbon/colordlg.h"

 #endif
 
 #endif
 

-#include "wx/setup.h"
-#include "wx/dialog.h"
-#include "wx/cmndata.h"
-
-/*
- * Platform-specific colour dialog implementation
- */
-
-class WXDLLEXPORT 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_