Got printing, toolbar samples compiling under Windows again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,15 +52,10 @@ wxFont *itemFont;
|
||||
|
||||
float zoom_factor = 1.0;
|
||||
|
||||
#ifdef __X__
|
||||
#include "aiai.xbm"
|
||||
#endif
|
||||
|
||||
#ifdef __WXGTK__
|
||||
#include "folder.xpm"
|
||||
#endif
|
||||
|
||||
|
||||
// Writes a header on a page. Margin units are in millimetres.
|
||||
bool WritePageHeader(wxPrintout *printout, wxDC *dc, char *text, float mmToLogical);
|
||||
|
||||
@@ -325,8 +320,15 @@ void MyFrame::Draw(wxDC& dc)
|
||||
dc.DrawLine(0, 0, 200, 200);
|
||||
dc.DrawLine(200, 0, 0, 200);
|
||||
|
||||
#if defined(__WXGTK__)
|
||||
wxIcon my_icon( folder_xpm );
|
||||
dc.DrawIcon( my_icon, 100, 100, TRUE );
|
||||
#elif defined(__WXMSW__)
|
||||
wxIcon my_icon( "mondrian" );
|
||||
#elif
|
||||
#error "Platform not supported."
|
||||
#endif
|
||||
|
||||
dc.DrawIcon( my_icon, 100, 100);
|
||||
}
|
||||
|
||||
void MyFrame::OnSize(wxSizeEvent& event )
|
||||
|
Reference in New Issue
Block a user