wxBrush::SetColour and wxPen::SetColour unified. Source cleaning.

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

diff --git a/include/wx/mac/display.h b/include/wx/mac/display.h
index 060c9c7ef4cac3bf61fa50bc83d56f026f101cf9..4347bb27972cfad391af3889f2f69c63e6f69852 100644 (file)
--- a/include/wx/mac/display.h
+++ b/include/wx/mac/display.h
@@ -1,46 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        display.h
-// Purpose:     wxDisplay class customization for Mac
-// Author:      Brian Victor
-// Modified by: Royce Mitchell III
-// Created:     06/21/02
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_DISPLAY_H_
-#define _WX_MAC_DISPLAY_H_
-
-#include "wx/object.h"
-#include "wx/display.h"
-
-class wxDisplayMacPriv;
-class wxRect;
-class wxString;
-
-class WXDLLEXPORT wxDisplay : public wxDisplayBase
-{
-public:
-    wxDisplay ( size_t index = 0 );
-
-    ~wxDisplay();
-
-    virtual wxRect GetGeometry() const;
-    virtual int GetDepth() const;
-    virtual wxString GetName() const;
-
-    virtual wxArrayVideoModes
-        GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const;
-
-    virtual wxVideoMode GetCurrentMode() const;
-
-    virtual bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode);
-
-private:
-    wxDisplayMacPriv* m_priv;
-
-    DECLARE_NO_COPY_CLASS(wxDisplay)
-};
-
-#endif // _WX_MAC_DISPLAY_H_
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/display.h"
+#else
+#include "wx/mac/carbon/display.h"
+#endif
\ No newline at end of file