renaming

[wxWidgets.git] / src / mac / carbon / display.cpp

diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
deleted file mode 100644 (file)
index d8159cb..0000000
--- a/src/mac/carbon/display.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/display.cpp
-// Purpose:     Mac implementation of wxDisplay class
-// Author:      Ryan Norton & Brian Victor
-// Modified by: Royce Mitchell III, Vadim Zeitlin
-// Created:     06/21/02
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_DISPLAY
-
-#include "wx/display.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/log.h"
-    #include "wx/string.h"
-    #include "wx/gdicmn.h"
-#endif
-
-#include <Carbon/Carbon.h>
-
-#include "wx/display_impl.h"
-
-// ----------------------------------------------------------------------------
-// display classes implementation
-// ----------------------------------------------------------------------------
-
-class wxDisplayImplMacOSX : public wxDisplayImpl
-{
-public:
-    wxDisplayImplMacOSX(unsigned n, CGDirectDisplayID id)
-        : wxDisplayImpl(n),
-          m_id(id)
-    {
-    }
-
-    virtual wxRect GetGeometry() const;
-    virtual wxRect GetClientArea() const;
-    virtual wxString GetName() const { return wxString(); }
-
-    virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
-    virtual wxVideoMode GetCurrentMode() const;
-    virtual bool ChangeMode(const wxVideoMode& mode);
-
-private:
-    CGDirectDisplayID m_id;
-
-    DECLARE_NO_COPY_CLASS(wxDisplayImplMacOSX)
-};
-
-class wxDisplayFactoryMacOSX : public wxDisplayFactory
-{
-public:
-    wxDisplayFactoryMacOSX() {}
-
-    virtual wxDisplayImpl *CreateDisplay(unsigned n);
-    virtual unsigned GetCount();
-    virtual int GetFromPoint(const wxPoint& pt);
-
-protected:
-    DECLARE_NO_COPY_CLASS(wxDisplayFactoryMacOSX)
-};
-
-// ============================================================================
-// wxDisplayFactoryMacOSX implementation
-// ============================================================================
-
-unsigned wxDisplayFactoryMacOSX::GetCount()
-{
-    CGDisplayCount count;
-#ifdef __WXDEBUG__
-    CGDisplayErr err =
-#endif
-    CGGetActiveDisplayList(0, NULL, &count);
-
-    wxASSERT(err == CGDisplayNoErr);
-
-    return count;
-}
-
-int wxDisplayFactoryMacOSX::GetFromPoint(const wxPoint& p)
-{
-    CGPoint thePoint = {(float)p.x, (float)p.y};
-    CGDirectDisplayID theID;
-    CGDisplayCount theCount;
-    CGDisplayErr err = CGGetDisplaysWithPoint(thePoint, 1, &theID, &theCount);
-    wxASSERT(err == CGDisplayNoErr);
-
-    int nWhich = wxNOT_FOUND;
-
-    if (theCount)
-    {
-        theCount = GetCount();
-        CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];
-        err = CGGetActiveDisplayList(theCount, theIDs, &theCount);
-        wxASSERT(err == CGDisplayNoErr);
-
-        for (nWhich = 0; nWhich < (int) theCount; ++nWhich)
-        {
-            if (theIDs[nWhich] == theID)
-                break;
-        }
-
-        delete [] theIDs;
-
-        if (nWhich == (int) theCount)
-        {
-            wxFAIL_MSG(wxT("Failed to find display in display list"));
-            nWhich = wxNOT_FOUND;
-        }
-    }
-
-    return nWhich;
-}
-
-wxDisplayImpl *wxDisplayFactoryMacOSX::CreateDisplay(unsigned n)
-{
-    CGDisplayCount theCount = GetCount();
-    CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];
-
-#ifdef __WXDEBUG__
-    CGDisplayErr err =
-#endif
-    CGGetActiveDisplayList(theCount, theIDs, &theCount);
-
-    wxASSERT( err == CGDisplayNoErr );
-    wxASSERT( n < theCount );
-
-    wxDisplayImplMacOSX *display = new wxDisplayImplMacOSX(n, theIDs[n]);
-
-    delete [] theIDs;
-
-    return display;
-}
-
-// ============================================================================
-// wxDisplayImplMacOSX implementation
-// ============================================================================
-
-wxRect wxDisplayImplMacOSX::GetGeometry() const
-{
-    CGRect theRect = CGDisplayBounds(m_id);
-    return wxRect( (int)theRect.origin.x,
-                   (int)theRect.origin.y,
-                   (int)theRect.size.width,
-                   (int)theRect.size.height ); //floats
-}
-
-wxRect wxDisplayImplMacOSX::GetClientArea() const
-{
-    // VZ: I don't know how to get client area for arbitrary display but
-    //     wxGetClientDisplayRect() does work correctly for at least the main
-    //     one (TODO: do it correctly for the other displays too)
-    if ( IsPrimary() )
-        return wxGetClientDisplayRect();
-
-    return wxDisplayImpl::GetClientArea();
-}
-
-static int wxCFDictKeyToInt( CFDictionaryRef desc, CFStringRef key )
-{
-    CFNumberRef value = (CFNumberRef) CFDictionaryGetValue( desc, key );
-    if (value == NULL)
-        return 0;
-
-    int num = 0;
-    CFNumberGetValue( value, kCFNumberIntType, &num );
-
-    return num;
-}
-
-wxArrayVideoModes wxDisplayImplMacOSX::GetModes(const wxVideoMode& mode) const
-{
-    wxArrayVideoModes resultModes;
-
-    CFArrayRef theArray = CGDisplayAvailableModes( m_id );
-
-    for (CFIndex i = 0; i < CFArrayGetCount(theArray); ++i)
-    {
-        CFDictionaryRef theValue = (CFDictionaryRef) CFArrayGetValueAtIndex( theArray, i );
-
-        wxVideoMode theMode(
-            wxCFDictKeyToInt( theValue, kCGDisplayWidth ),
-            wxCFDictKeyToInt( theValue, kCGDisplayHeight ),
-            wxCFDictKeyToInt( theValue, kCGDisplayBitsPerPixel ),
-            wxCFDictKeyToInt( theValue, kCGDisplayRefreshRate ));
-
-        if (theMode.Matches( mode ))
-            resultModes.Add( theMode );
-    }
-
-    return resultModes;
-}
-
-wxVideoMode wxDisplayImplMacOSX::GetCurrentMode() const
-{
-    CFDictionaryRef theValue = CGDisplayCurrentMode( m_id );
-
-    return wxVideoMode(
-        wxCFDictKeyToInt( theValue, kCGDisplayWidth ),
-        wxCFDictKeyToInt( theValue, kCGDisplayHeight ),
-        wxCFDictKeyToInt( theValue, kCGDisplayBitsPerPixel ),
-        wxCFDictKeyToInt( theValue, kCGDisplayRefreshRate ));
-}
-
-bool wxDisplayImplMacOSX::ChangeMode( const wxVideoMode& mode )
-{
-    // Changing to default mode (wxDefaultVideoMode) doesn't
-    // work because we don't have access to the system's 'scrn'
-    // resource which holds the user's mode which the system
-    // will return to after this app is done
-    boolean_t bExactMatch;
-    CFDictionaryRef theCGMode = CGDisplayBestModeForParametersAndRefreshRate(
-        m_id,
-        (size_t)mode.GetDepth(),
-        (size_t)mode.GetWidth(),
-        (size_t)mode.GetHeight(),
-        (double)mode.GetRefresh(),
-        &bExactMatch );
-
-    bool bOK = bExactMatch;
-
-    if (bOK)
-        bOK = CGDisplaySwitchToMode( m_id, theCGMode ) == CGDisplayNoErr;
-
-    return bOK;
-}
-
-// ============================================================================
-// wxDisplay::CreateFactory()
-// ============================================================================
-
-/* static */ wxDisplayFactory *wxDisplay::CreateFactory()
-{
-    return new wxDisplayFactoryMacOSX;
-}
-
-#endif // wxUSE_DISPLAY