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

added DrawRectangle() test

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-25 16:33:06 +00:00
parent 19695fbd61
commit 4786aabdbd
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/drawing/drawing.cpp
View File

@@ -103,13 +103,13 @@ public:
MyCanvas( MyFrame *parent ); MyCanvas( MyFrame *parent );
void DrawTestPoly( int x, int y, wxDC &dc ,int transparent ); void DrawTestPoly( int x, int y, wxDC &dc ,int transparent );
void DrawTestLines( int x, int y, int width, wxDC &dc ); void DrawTestLines( int x, int y, int width, wxDC &dc );
void OnPaint(wxPaintEvent &event); void OnPaint(wxPaintEvent &event);
void OnMouseMove(wxMouseEvent &event); void OnMouseMove(wxMouseEvent &event);
protected: protected:
MyFrame *m_owner; MyFrame *m_owner;
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@@ -461,7 +461,7 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
dc.SetPen( wxPen( "black", width, wxSOLID) ); dc.SetPen( wxPen( "black", width, wxSOLID) );
dc.SetBrush( *wxRED_BRUSH ); dc.SetBrush( *wxRED_BRUSH );
dc.DrawRectangle( x+10, y+10, 100, 190 ); dc.DrawRectangle( x+10, y+10, 100, 190 );
dc.SetPen( wxPen( "black", width, wxSOLID) ); dc.SetPen( wxPen( "black", width, wxSOLID) );
dc.DrawLine( x+20, y+20, 100, y+20 ); dc.DrawLine( x+20, y+20, 100, y+20 );
dc.SetPen( wxPen( "black", width, wxDOT) ); dc.SetPen( wxPen( "black", width, wxDOT) );
@@ -527,7 +527,7 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
// set underlined font for testing // set underlined font for testing
dc.SetFont( wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, TRUE) ); dc.SetFont( wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, TRUE) );
dc.DrawText( "This is text", 110, 10 ); dc.DrawText( "This is text", 110, 10 );
dc.DrawRotatedText( "That is text", 60, 30, -45 ); dc.DrawRotatedText( "That is text", 20, 10, -45 );
dc.SetFont( *wxNORMAL_FONT ); dc.SetFont( *wxNORMAL_FONT );
@@ -556,9 +556,16 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
text.Printf( "CharHeight() returns: %d", dc.GetCharHeight() ); text.Printf( "CharHeight() returns: %d", dc.GetCharHeight() );
dc.DrawText( text, 110, 120 ); dc.DrawText( text, 110, 120 );
dc.DrawIcon( wxICON(mondrian), 310, 40 ); dc.DrawIcon( wxICON(mondrian), 310, 40 );
// test the rectangle drawing - there should be no pixels between the rect
// and the lines
dc.SetPen(*wxTRANSPARENT_PEN);
dc.DrawRectangle(350, 170, 49, 29);
dc.SetPen(*wxRED_PEN);
dc.DrawLine(400, 160, 400, 210);
dc.DrawLine(340, 200, 410, 200);
DrawTestLines( 0, 200, 0, dc ); DrawTestLines( 0, 200, 0, dc );
DrawTestLines( 0, 400, 1, dc ); DrawTestLines( 0, 400, 1, dc );