X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8371a35340baf588549273328cb2a1579a4dfe81..0526c8cc07ac02aeb1d95afecfa0d9201a8ddea0:/samples/printing/printing.cpp diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp index 7b172efb7f..205caee637 100644 --- a/samples/printing/printing.cpp +++ b/samples/printing/printing.cpp @@ -51,8 +51,8 @@ #include "printing.h" -#ifndef __WXMSW__ - #include "mondrian.xpm" +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "../sample.xpm" #endif // Global print data, to remember settings during the session @@ -212,7 +212,7 @@ void MyApp::Draw(wxDC&dc) str.Printf( wxT("---- Text at angle %d ----"), i ); dc.DrawRotatedText( str, 100, 300, i ); - wxIcon my_icon = wxICON(mondrian); + wxIcon my_icon = wxICON(sample); dc.DrawIcon( my_icon, 100, 100); @@ -254,14 +254,14 @@ void MyApp::Draw(wxDC&dc) // draw some text wxString text("Text by wxGraphicsContext"); - gc->SetFont( m_testFont, *wxBLUE ); - gc->DrawText(text, 50.0, 50.0); + gc->SetFont( m_testFont, *wxBLACK ); + gc->DrawText(text, 25.0, 60.0); // draw rectangle around the text double w, h, d, el; gc->GetTextExtent(text, &w, &h, &d, &el); - gc->SetPen( *wxBLUE_PEN ); - gc->DrawRectangle(50.0, 50.0, w, h); + gc->SetPen( *wxBLACK_PEN ); + gc->DrawRectangle(25.0, 60.0, w, h); delete gc; } @@ -303,7 +303,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString&title, const wxPoint&pos, const #endif // wxUSE_STATUSBAR // Load icon and bitmap - SetIcon( wxICON( mondrian) ); + SetIcon( wxICON( sample) ); // Make a menubar wxMenu *file_menu = new wxMenu;