DC change header change for wxMemoryDC and wxPostscriptDC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ed43910deb
commit
4e4ea166d7
@ -113,8 +113,8 @@ public:
|
|||||||
long *externalLeading = (long *) NULL,
|
long *externalLeading = (long *) NULL,
|
||||||
wxFont *theFont = (wxFont *) NULL ) const;
|
wxFont *theFont = (wxFont *) NULL ) const;
|
||||||
|
|
||||||
void GetSize(int* width, int* height) const;
|
void DoGetSize(int* width, int* height) const;
|
||||||
void GetSizeMM(int *width, int *height) const;
|
void DoGetSizeMM(int *width, int *height) const;
|
||||||
|
|
||||||
// Resolution in pixels per logical inch
|
// Resolution in pixels per logical inch
|
||||||
wxSize GetPPI(void) const;
|
wxSize GetPPI(void) const;
|
||||||
|
@ -37,7 +37,7 @@ public:
|
|||||||
wxMemoryDC( wxDC *dc ); // Create compatible DC
|
wxMemoryDC( wxDC *dc ); // Create compatible DC
|
||||||
~wxMemoryDC();
|
~wxMemoryDC();
|
||||||
virtual void SelectObject( const wxBitmap& bitmap );
|
virtual void SelectObject( const wxBitmap& bitmap );
|
||||||
void GetSize( int *width, int *height ) const;
|
void DoGetSize( int *width, int *height ) const;
|
||||||
|
|
||||||
// implementation
|
// implementation
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ public:
|
|||||||
wxMemoryDC( wxDC *dc ); // Create compatible DC
|
wxMemoryDC( wxDC *dc ); // Create compatible DC
|
||||||
~wxMemoryDC();
|
~wxMemoryDC();
|
||||||
virtual void SelectObject( const wxBitmap& bitmap );
|
virtual void SelectObject( const wxBitmap& bitmap );
|
||||||
void GetSize( int *width, int *height ) const;
|
void DoGetSize( int *width, int *height ) const;
|
||||||
|
|
||||||
// implementation
|
// implementation
|
||||||
|
|
||||||
|
@ -1230,7 +1230,7 @@ void wxPostScriptDC::SetDeviceOrigin( long x, long y )
|
|||||||
wxDC::SetDeviceOrigin( x, h-y );
|
wxDC::SetDeviceOrigin( x, h-y );
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxPostScriptDC::GetSize(int* width, int* height) const
|
void wxPostScriptDC::DoGetSize(int* width, int* height) const
|
||||||
{
|
{
|
||||||
wxPaperSize id = m_printData.GetPaperId();
|
wxPaperSize id = m_printData.GetPaperId();
|
||||||
|
|
||||||
@ -1250,7 +1250,7 @@ void wxPostScriptDC::GetSize(int* width, int* height) const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxPostScriptDC::GetSizeMM(int *width, int *height) const
|
void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const
|
||||||
{
|
{
|
||||||
wxPaperSize id = m_printData.GetPaperId();
|
wxPaperSize id = m_printData.GetPaperId();
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxMemoryDC::GetSize( int *width, int *height ) const
|
void wxMemoryDC::DoGetSize( int *width, int *height ) const
|
||||||
{
|
{
|
||||||
if (m_selected.Ok())
|
if (m_selected.Ok())
|
||||||
{
|
{
|
||||||
|
@ -66,7 +66,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxMemoryDC::GetSize( int *width, int *height ) const
|
void wxMemoryDC::DoGetSize( int *width, int *height ) const
|
||||||
{
|
{
|
||||||
if (m_selected.Ok())
|
if (m_selected.Ok())
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user