475_uppsrc.diff
uppsrc/Draw/Draw.cpp 2013-05-23 21:39:19 +0400 | ||
---|---|---|
480 | 480 |
DrawPainting(RectC(x, y, cx, cy), ig); |
481 | 481 |
} |
482 | 482 |
|
483 |
void Draw::DrawPainting(int x, int y, const Painting& iw) |
|
484 |
{ |
|
485 |
Size sz = iw.GetSize(); |
|
486 |
DrawPainting(RectC(x, y, sz.cx, sz.cy), iw); |
|
487 |
} |
|
488 |
|
|
483 | 489 |
// --------------------------- |
484 | 490 |
|
485 | 491 |
dword NilDraw::GetInfo() const { return DOTS; } |
uppsrc/Draw/Draw.h 2013-05-23 21:18:36 +0400 | ||
---|---|---|
560 | 560 |
|
561 | 561 |
void DrawDrawing(const Rect& r, const Drawing& iw) { DrawDrawingOp(r, iw); } |
562 | 562 |
void DrawDrawing(int x, int y, int cx, int cy, const Drawing& iw); |
563 |
void DrawDrawing(int x, int y, const Drawing& iw); |
|
563 | 564 |
|
564 | 565 |
void DrawPainting(const Rect& r, const Painting& iw) { DrawPaintingOp(r, iw); } |
565 | 566 |
void DrawPainting(int x, int y, int cx, int cy, const Painting& iw); |
567 |
void DrawPainting(int x, int y, const Painting& iw); |
|
566 | 568 |
|
567 | 569 |
void DrawText(int x, int y, int angle, const wchar *text, Font font = StdFont(), |
568 | 570 |
Color ink = DefaultInk, int n = -1, const int *dx = NULL); |
uppsrc/Draw/Drawing.cpp 2013-05-23 21:34:09 +0400 | ||
---|---|---|
632 | 632 |
DrawDrawing(RectC(x, y, cx, cy), w); |
633 | 633 |
} |
634 | 634 |
|
635 |
void Draw::DrawDrawing(int x, int y, const Drawing& iw) |
|
636 |
{ |
|
637 |
Size sz = iw.GetSize(); |
|
638 |
DrawDrawing(RectC(x, y, sz.cx, sz.cy), iw); |
|
639 |
} |
|
640 |
|
|
635 | 641 |
void DrawingDraw::Create(int cx, int cy, bool dots_) { |
636 | 642 |
Create(Size(cx, cy), dots_); |
637 | 643 |
} |