Changeset 53273 in webkit


Ignore:
Timestamp:
Jan 14, 2010 10:56:33 AM (14 years ago)
Author:
sfalken@apple.com
Message:

Windows build fixes.
Add forward declarations and additional includes of windows.h.

  • platform/Cursor.h: Add forward declaration of HCURSOR. Move destructor implementation into cpp.
  • platform/graphics/transforms/TransformationMatrix.h: Add forward declaration of XFORM. Remove windows.h include.
  • platform/graphics/win/TransformationMatrixWin.cpp: Add include of windows.h.
  • platform/win/CursorWin.cpp: Moved destructor of SharedCursor here.

(WebCore::SharedCursor::~SharedCursor): Moved here.

  • platform/win/EventLoopWin.cpp: Add include of windows.h.
  • platform/win/SystemInfo.cpp: Add include of windows.h.
Location:
trunk/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r53272 r53273  
     12010-01-14  Steve Falkenburg  <sfalken@apple.com>
     2
     3        Windows build fixes.
     4        Add forward declarations and additional includes of windows.h.
     5
     6        * platform/Cursor.h: Add forward declaration of HCURSOR. Move destructor implementation into cpp.
     7        * platform/graphics/transforms/TransformationMatrix.h: Add forward declaration of XFORM. Remove windows.h include.
     8        * platform/graphics/win/TransformationMatrixWin.cpp: Add include of windows.h.
     9        * platform/win/CursorWin.cpp: Moved destructor of SharedCursor here.
     10        (WebCore::SharedCursor::~SharedCursor): Moved here.
     11        * platform/win/EventLoopWin.cpp: Add include of windows.h.
     12        * platform/win/SystemInfo.cpp: Add include of windows.h.
     13
    1142010-01-14  Nate Chapin  <japhet@chromium.org>
    215

  • trunk/WebCore/platform/Cursor.h

    r47145 r53273  
    5757#endif
    5858
     59#if PLATFORM(WIN)
     60typedef struct HICON__ *HICON;
     61typedef HICON HCURSOR;
     62#endif
     63
    5964namespace WebCore {
    6065
    … …  
    6671    public:
    6772        static PassRefPtr<SharedCursor> create(HCURSOR nativeCursor) { return adoptRef(new SharedCursor(nativeCursor)); }
    68         ~SharedCursor() { DestroyIcon(m_nativeCursor); }
     73        ~SharedCursor();
    6974        HCURSOR nativeCursor() const { return m_nativeCursor; }
    7075    private:

  • trunk/WebCore/platform/graphics/transforms/TransformationMatrix.h

    r53260 r53273  
    4444#endif
    4545
    46 #if OS(WINDOWS)
    47 #include <windows.h>
     46#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(WX) && OS(WINDOWS))
     47typedef struct tagXFORM XFORM;
    4848#endif
    4949

  • trunk/WebCore/platform/graphics/win/TransformationMatrixWin.cpp

    r44793 r53273  
    2727#include "TransformationMatrix.h"
    2828
     29#include <windows.h>
     30
    2931namespace WebCore {
    3032

  • trunk/WebCore/platform/win/CursorWin.cpp

    r47636 r53273  
    409409}
    410410
    411 }
     411SharedCursor::~SharedCursor()
     412{
     413    DestroyIcon(m_nativeCursor);
     414}
     415
     416}

  • trunk/WebCore/platform/win/EventLoopWin.cpp

    r33400 r53273  
    2727#include "EventLoop.h"
    2828
     29#include <windows.h>
     30
    2931namespace WebCore {
    3032

  • trunk/WebCore/platform/win/SystemInfo.cpp

    r42288 r53273  
    2727#include "SystemInfo.h"
    2828
     29#include <windows.h>
     30
    2931namespace WebCore {
    3032
Note: See TracChangeset for help on using the changeset viewer.