projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of wxFontMapper in wxBase library.
[wxWidgets.git]
/
include
/
wx
/
dc.h
diff --git
a/include/wx/dc.h
b/include/wx/dc.h
index bb485c7acaf35fb6829eabeb13e208cddb46c75f..0e6d1d055bd64fce4005246461b4d0200891e5e2 100644
(file)
--- a/
include/wx/dc.h
+++ b/
include/wx/dc.h
@@
-31,6
+31,7
@@
#include "wx/palette.h"
#include "wx/list.h" // we use wxList in inline functions
#include "wx/dynarray.h"
#include "wx/palette.h"
#include "wx/list.h" // we use wxList in inline functions
#include "wx/dynarray.h"
+#include "wx/math.h"
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxDCBase;
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxDCBase;
@@
-96,7
+97,7
@@
protected:
// global variables
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
-
WXDLLEXPORT_DATA(extern
int) wxPageNumber;
+
extern WXDLLEXPORT_DATA(
int) wxPageNumber;
// ---------------------------------------------------------------------------
// wxDC is the device context - object on which any drawing is done
// ---------------------------------------------------------------------------
// wxDC is the device context - object on which any drawing is done
@@
-347,7
+348,7
@@
public:
* \param angle Rotating angle (counterclockwise, start at 3 o'clock, 360 is full circle).
* \param center Center of rotation.
*/
* \param angle Rotating angle (counterclockwise, start at 3 o'clock, 360 is full circle).
* \param center Center of rotation.
*/
- void Rotate( wxList* points, double angle, wxPoint center = wxPoint() );
+ void Rotate( wxList* points, double angle, wxPoint center = wxPoint(
0,0
) );
// used by DrawEllipticArcRot
// Careful: wxList gets filled with points you have to delete later.
// used by DrawEllipticArcRot
// Careful: wxList gets filled with points you have to delete later.
@@
-529,6
+530,8
@@
public:
{ wxCoord x, y; DoGetDeviceOrigin(&x, &y); return wxPoint(x, y); }
virtual void SetDeviceOrigin(wxCoord x, wxCoord y) = 0;
{ wxCoord x, y; DoGetDeviceOrigin(&x, &y); return wxPoint(x, y); }
virtual void SetDeviceOrigin(wxCoord x, wxCoord y) = 0;
+ virtual void ComputeScaleAndOrigin() {}
+
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) = 0;
int GetLogicalFunction() const { return m_logicalFunction; }
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) = 0;
int GetLogicalFunction() const { return m_logicalFunction; }
@@
-788,7
+791,7
@@
private:
// now include the declaration of wxDC class
// ----------------------------------------------------------------------------
// now include the declaration of wxDC class
// ----------------------------------------------------------------------------
-#if defined(__PALMOS__)
+#if defined(__
WX
PALMOS__)
#include "wx/palmos/dc.h"
#elif defined(__WXMSW__)
#include "wx/msw/dc.h"
#include "wx/palmos/dc.h"
#elif defined(__WXMSW__)
#include "wx/msw/dc.h"