Show
Ignore:
Timestamp:
08/15/08 13:25:16 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35774

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/BAL/WKAL/Concretizations/Graphics/WK/BCAffineTransformWK.h

    r243 r437  
    2929#if PLATFORM(CG) 
    3030#include <CoreGraphics/CGAffineTransform.h> 
     31typedef CGAffineTransform PlatformAffineTransform; 
    3132#elif PLATFORM(QT) 
    3233#include <QMatrix> 
     34typedef QMatrix PlatformAffineTransform; 
    3335#elif PLATFORM(CAIRO) 
    3436#include <cairo.h> 
     37typedef cairo_matrix_t PlatformAffineTransform; 
    3538#elif PLATFORM(WX) && USE(WXGC) 
    3639#include <wx/defs.h> 
    3740#include <wx/graphics.h> 
     41typedef wxGraphicsMatrix PlatformAffineTransform; 
    3842#endif 
    3943 
     
    4953    AffineTransform(); 
    5054    AffineTransform(double a, double b, double c, double d, double e, double f); 
    51 #if PLATFORM(CG) 
    52     AffineTransform(CGAffineTransform transform); 
    53 #elif PLATFORM(QT) 
    54     AffineTransform(const QMatrix &matrix); 
    55 #elif PLATFORM(CAIRO) 
    56     AffineTransform(const cairo_matrix_t &matrix); 
    57 #elif PLATFORM(WX) && USE(WXGC) 
    58     AffineTransform(const wxGraphicsMatrix &matrix); 
     55#if !PLATFORM(WX) || USE(WXGC) 
     56    AffineTransform(const PlatformAffineTransform&); 
    5957#endif 
    6058 
     
    106104    AffineTransform inverse() const; 
    107105 
    108 #if PLATFORM(CG) 
    109     operator CGAffineTransform() const; 
    110 #elif PLATFORM(QT) 
    111     operator QMatrix() const; 
    112 #elif PLATFORM(CAIRO) 
    113     operator cairo_matrix_t() const; 
    114 #elif PLATFORM(WX) && USE(WXGC) 
    115     operator wxGraphicsMatrix() const; 
     106#if !PLATFORM(WX) || USE(WXGC) 
     107    operator PlatformAffineTransform() const; 
    116108#endif 
    117109 
     
    122114     
    123115private: 
    124 #if PLATFORM(CG) 
    125     CGAffineTransform m_transform; 
    126 #elif PLATFORM(QT) 
    127     QMatrix m_transform; 
    128 #elif PLATFORM(CAIRO) 
    129     cairo_matrix_t m_transform; 
    130 #elif PLATFORM(WX) && USE(WXGC) 
    131     wxGraphicsMatrix m_transform; 
     116#if !PLATFORM(WX) || USE(WXGC) 
     117    PlatformAffineTransform m_transform; 
    132118#endif 
    133119};