Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GdiplusStartup() takes ULONG_PTR, not DWORD (patch 1596318); also deTABified

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-14 14:05:14 +00:00
parent 5bbdfd5ba2
commit cb3a0d420a
1 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/graphics.cpp
View File

@@ -142,11 +142,11 @@ public :
virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ; virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ;
*/ */
// returns the native path // returns the native path
virtual void * GetNativePath() const { return m_path; } virtual void * GetNativePath() const { return m_path; }
// give the native path returned by GetNativePath() back (there might be some deallocations necessary) // give the native path returned by GetNativePath() back (there might be some deallocations necessary)
virtual void UnGetNativePath(void * WXUNUSED(path)) const {} virtual void UnGetNativePath(void * WXUNUSED(path)) const {}
// transforms each point of this path by the matrix // transforms each point of this path by the matrix
virtual void Transform( const wxGraphicsMatrixData* matrix ) ; virtual void Transform( const wxGraphicsMatrixData* matrix ) ;
@@ -281,10 +281,10 @@ public:
// clips drawings to the rect // clips drawings to the rect
virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
// resets the clipping to original extent // resets the clipping to original extent
virtual void ResetClip(); virtual void ResetClip();
virtual void * GetNativeContext(); virtual void * GetNativeContext();
virtual void StrokePath( const wxGraphicsPath& p ); virtual void StrokePath( const wxGraphicsPath& p );
virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxODDEVEN_RULE ); virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxODDEVEN_RULE );
@@ -1180,7 +1180,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
void* wxGDIPlusContext::GetNativeContext() void* wxGDIPlusContext::GetNativeContext()
{ {
return m_context; return m_context;
} }
// concatenates this transform with the current transform of this context // concatenates this transform with the current transform of this context
@@ -1212,7 +1212,7 @@ public :
wxGDIPlusRenderer() wxGDIPlusRenderer()
{ {
m_loaded = false; m_loaded = false;
m_gditoken = NULL; m_gditoken = 0;
} }
virtual ~wxGDIPlusRenderer() virtual ~wxGDIPlusRenderer()
@@ -1269,7 +1269,7 @@ protected :
private : private :
bool m_loaded; bool m_loaded;
DWORD m_gditoken; ULONG_PTR m_gditoken;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer)
} ; } ;