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

no real changes, just some minor cleanup to fix a few compile- and run-time warnings (#9805)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-01 14:12:09 +00:00
parent 49ad157e30
commit 795b5a8bf6
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/drawing/drawing.cpp
View File

@@ -35,25 +35,12 @@
#include "wx/artprov.h" #include "wx/artprov.h"
#include "wx/dcgraph.h" #include "wx/dcgraph.h"
#include "wx/overlay.h" #include "wx/overlay.h"
#include "wx/graphics.h"
#define wxTEST_GRAPHICS 1
#define TEST_CAIRO_EVERYWHERE 0 #define TEST_CAIRO_EVERYWHERE 0
#if wxTEST_GRAPHICS
#include "wx/graphics.h"
#include "wx/dcgraph.h"
#if wxUSE_GRAPHICS_CONTEXT == 0
#undef wxTEST_GRAPHICS
#define wxTEST_GRAPHICS 0
#endif
#else
#undef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// ressources // resources
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the application icon // the application icon
@@ -1364,7 +1351,7 @@ void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime)
if ( !firstTime ) if ( !firstTime )
region.Offset(10, 10); region.Offset(10, 10);
#endif #endif
dc.SetClippingRegion(region); dc.SetDeviceClippingRegion(region);
dc.SetBrush( *wxGREY_BRUSH ); dc.SetBrush( *wxGREY_BRUSH );
dc.DrawRectangle( x, y, 310, 310 ); dc.DrawRectangle( x, y, 310, 310 );
@@ -1623,7 +1610,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
menuFile->Append(File_ShowSplines, _T("&Splines screen\tF11")); menuFile->Append(File_ShowSplines, _T("&Splines screen\tF11"));
menuFile->Append(File_ShowGradients, _T("&Gradients screen\tF12")); menuFile->Append(File_ShowGradients, _T("&Gradients screen\tF12"));
#if wxUSE_GRAPHICS_CONTEXT #if wxUSE_GRAPHICS_CONTEXT
menuFile->Append(File_ShowGraphics, _T("&Graphics screen\tF13")); menuFile->Append(File_ShowGraphics, _T("&Graphics screen"));
#endif #endif
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->AppendCheckItem(File_Clip, _T("&Clip\tCtrl-C"), _T("Clip/unclip drawing")); menuFile->AppendCheckItem(File_Clip, _T("&Clip\tCtrl-C"), _T("Clip/unclip drawing"));