/////////////////////////////////////////////////////////////////////////////
-// Name: drawing.cpp
+// Name: samples/drawing/drawing.cpp
// Purpose: shows and tests wxDC features
// Author: Robert Roebling
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma implementation "drawing.cpp"
- #pragma interface "drawing.cpp"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#endif
// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#include "wx/image.h"
#include "wx/artprov.h"
+#define wxTEST_GRAPHICS 1
+
+#if wxTEST_GRAPHICS
+#include "wx/graphics.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
// ----------------------------------------------------------------------------
Show_Mask,
Show_Ops,
Show_Regions,
- Show_Circles
+ Show_Circles,
+ Show_Splines,
+#if wxUSE_GRAPHICS_CONTEXT
+ Show_Alpha,
+#endif
+ Show_Gradient,
+ Show_Max
};
// ----------------------------------------------------------------------------
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
void OnClip(wxCommandEvent& event);
+#if wxUSE_GRAPHICS_CONTEXT
+ void OnGraphicContext(wxCommandEvent& event);
+#endif
void OnShow(wxCommandEvent &event);
void OnOption(wxCommandEvent &event);
+#if wxUSE_COLOURDLG
wxColour SelectColour();
+#endif // wxUSE_COLOURDLG
void PrepareDC(wxDC& dc);
int m_backgroundMode;
MyCanvas *m_canvas;
private:
- // any class wishing to process wxWindows events must use this macro
+ // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
};
void OnPaint(wxPaintEvent &event);
void OnMouseMove(wxMouseEvent &event);
- void Show(ScreenToShow show) { m_show = show; Refresh(); }
+ void ToShow(ScreenToShow show) { m_show = show; Refresh(); }
// set or remove the clipping region
void Clip(bool clip) { m_clip = clip; Refresh(); }
+#if wxUSE_GRAPHICS_CONTEXT
+ void UseGraphicContext(bool use) { m_useContext = use; Refresh(); }
+#endif
protected:
void DrawTestLines( int x, int y, int width, wxDC &dc );
void DrawText(wxDC& dc);
void DrawImages(wxDC& dc);
void DrawWithLogicalOps(wxDC& dc);
+#if wxUSE_GRAPHICS_CONTEXT
+ void DrawAlpha(wxDC& dc);
+#endif
void DrawRegions(wxDC& dc);
void DrawCircles(wxDC& dc);
+ void DrawSplines(wxDC& dc);
void DrawDefault(wxDC& dc);
+ void DrawGradients(wxDC& dc);
void DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime);
wxBitmap m_smile_bmp;
wxIcon m_std_icon;
bool m_clip;
+#if wxUSE_GRAPHICS_CONTEXT
+ bool m_useContext ;
+#endif
DECLARE_EVENT_TABLE()
};
enum
{
// menu items
- File_Quit = 1,
- File_About,
+ File_Quit = wxID_EXIT,
+ File_About = wxID_ABOUT,
- MenuShow_First,
+ MenuShow_First = wxID_HIGHEST,
File_ShowDefault = MenuShow_First,
File_ShowText,
File_ShowLines,
File_ShowOps,
File_ShowRegions,
File_ShowCircles,
- MenuShow_Last = File_ShowCircles,
+ File_ShowSplines,
+#if wxUSE_GRAPHICS_CONTEXT
+ File_ShowAlpha,
+#endif
+ File_ShowGradients,
+ MenuShow_Last = File_ShowGradients,
File_Clip,
+#if wxUSE_GRAPHICS_CONTEXT
+ File_GraphicContext,
+#endif
MenuOption_First,
LogicalOrigin_Set,
LogicalOrigin_Restore,
+#if wxUSE_COLOURDLG
Colour_TextForeground,
Colour_TextBackground,
Colour_Background,
+#endif // wxUSE_COLOURDLG
Colour_BackgroundMode,
Colour_TextureBackgound,
};
// ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
// ----------------------------------------------------------------------------
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
wxString path = pathList.FindValidPath(_T("pat4.bmp"));
if ( !path )
- return FALSE;
+ return false;
/* 4 colour bitmap */
gs_bmp4->LoadFile(path, wxBITMAP_TYPE_BMP);
path = pathList.FindValidPath(_T("pat36.bmp"));
if ( !path )
- return FALSE;
+ return false;
gs_bmp36->LoadFile(path, wxBITMAP_TYPE_BMP);
wxMask* mask36 = new wxMask(*gs_bmp36, *wxBLACK);
gs_bmp36->SetMask(mask36);
path = pathList.FindValidPath(_T("image.bmp"));
if ( !path )
- return FALSE;
+ return false;
gs_bmpNoMask->LoadFile(path, wxBITMAP_TYPE_BMP);
gs_bmpWithMask->LoadFile(path, wxBITMAP_TYPE_BMP);
gs_bmpWithColMask->LoadFile(path, wxBITMAP_TYPE_BMP);
path = pathList.FindValidPath(_T("mask.bmp"));
if ( !path )
- return FALSE;
+ return false;
gs_bmpMask->LoadFile(path, wxBITMAP_TYPE_BMP);
wxMask *mask = new wxMask(*gs_bmpMask, *wxBLACK);
mask = new wxMask(*gs_bmpWithColMask, *wxWHITE);
gs_bmpWithColMask->SetMask(mask);
- return TRUE;
+ return true;
}
// `Main program' equivalent: the program execution "starts" here
wxPoint(50, 50), wxSize(550, 340));
// Show it and tell the application that it's our main window
- frame->Show(TRUE);
+ frame->Show(true);
SetTopWindow(frame);
if ( !LoadImages() )
// stop here
DeleteBitmaps();
- return FALSE;
+ return false;
}
// ok, continue
- return TRUE;
+ return true;
}
void MyApp::DeleteBitmaps()
// MyCanvas
// ----------------------------------------------------------------------------
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
// handlers) which process them.
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
EVT_PAINT (MyCanvas::OnPaint)
#include "smile.xpm"
MyCanvas::MyCanvas(MyFrame *parent)
- : wxScrolledWindow(parent, -1, wxDefaultPosition, wxDefaultSize,
+ : wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxHSCROLL | wxVSCROLL | wxNO_FULL_REPAINT_ON_RESIZE)
{
m_owner = parent;
m_show = Show_Default;
m_smile_bmp = wxBitmap(smile_xpm);
m_std_icon = wxArtProvider::GetIcon(wxART_INFORMATION);
- m_clip = FALSE;
+ m_clip = false;
+#if wxUSE_GRAPHICS_CONTEXT
+ m_useContext = false;
+#endif
}
void MyCanvas::DrawTestBrushes(wxDC& dc)
_T("hatched"), 10, 10);
dc.DrawText(_T("except for the central region and the right ")
_T("one entirely hatched"), 10, 30);
-
- dc.DrawPolygon(WXSIZEOF(star), star);
- dc.DrawPolygon(WXSIZEOF(star), star, 160, 0, wxWINDING_RULE);
+ dc.DrawText(_T("The third star only has a hatched outline"), 10, 50);
+
+ dc.DrawPolygon(WXSIZEOF(star), star, 0, 30);
+ dc.DrawPolygon(WXSIZEOF(star), star, 160, 30, wxWINDING_RULE);
+
+ wxPoint star2[10];
+ star2[0] = wxPoint(0, 100);
+ star2[1] = wxPoint(-59, -81);
+ star2[2] = wxPoint(95, 31);
+ star2[3] = wxPoint(-95, 31);
+ star2[4] = wxPoint(59, -81);
+ star2[5] = wxPoint(0, 80);
+ star2[6] = wxPoint(-47, -64);
+ star2[7] = wxPoint(76, 24);
+ star2[8] = wxPoint(-76, 24);
+ star2[9] = wxPoint(47, -64);
+ int count[2] = {5, 5};
+
+ dc.DrawPolyPolygon(WXSIZEOF(count), count, star2, 450, 150);
}
void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
// mark the origin
dc.DrawCircle(0, 0, 10);
+#if !defined(wxMAC_USE_CORE_GRAPHICS) || !wxMAC_USE_CORE_GRAPHICS
+ // GetPixel and FloodFill not supported by Mac OS X CoreGraphics
+ // (FloodFill uses Blit from a non-wxMemoryDC)
//flood fill using brush, starting at 1,1 and replacing whatever colour we find there
dc.SetBrush(wxBrush(wxColour(128,128,0), wxSOLID));
+
wxColour tmpColour ;
dc.GetPixel(1,1, &tmpColour);
dc.FloodFill(1,1, tmpColour, wxFLOOD_SURFACE);
+#endif
dc.DrawCheckMark(5, 80, 15, 15);
dc.DrawCheckMark(25, 80, 30, 30);
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush( *wxGREEN_BRUSH );
dc.DrawRectangle(x, 10, rectSize, rectSize);
- dc.DrawBitmap(m_std_icon, x + 5, 15, TRUE);
+ dc.DrawBitmap(m_std_icon, x + 5, 15, true);
x += rectSize + 10;
dc.DrawRectangle(x, 10, rectSize, rectSize);
dc.DrawIcon(m_std_icon, x + 5, 15);
//dc.SetBrush( *wxTRANSPARENT_BRUSH );
if (m_smile_bmp.Ok())
- dc.DrawBitmap(m_smile_bmp, x + rectSize - 20, rectSize - 10, TRUE);
+ dc.DrawBitmap(m_smile_bmp, x + rectSize - 20, rectSize - 10, true);
dc.SetBrush( *wxBLACK_BRUSH );
dc.DrawRectangle( 0, 160, 1000, 300 );
// Added by JACS to demonstrate bizarre behaviour.
// With a size of 70, we get a missing red RHS,
- // and the hight is too small, so we get yellow
+ // and the height is too small, so we get yellow
// showing. With a size of 40, it draws as expected:
// it just shows a white rectangle with red outline.
int totalWidth = 70;
wxMemoryDC memdc2;
memdc2.SelectObject(bitmap2);
- wxBrush yellowBrush(wxColour(255, 255, 0), wxSOLID);
+ wxColour clr(255, 255, 0);
+ wxBrush yellowBrush(clr, wxSOLID);
memdc2.SetBackground(yellowBrush);
memdc2.Clear();
- wxPen yellowPen(wxColour(255, 255, 0), 1, wxSOLID);
+ wxPen yellowPen(clr, 1, wxSOLID);
// Now draw a white rectangle with red outline. It should
// entirely eclipse the yellow background.
void MyCanvas::DrawText(wxDC& dc)
{
// set underlined font for testing
- dc.SetFont( wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, TRUE) );
+ dc.SetFont( wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, true) );
dc.DrawText( _T("This is text"), 110, 10 );
dc.DrawRotatedText( _T("That is text"), 20, 10, -45 );
dc.DrawText(_T("original image"), 0, 0);
dc.DrawBitmap(*gs_bmpNoMask, 0, 20, 0);
dc.DrawText(_T("with colour mask"), 0, 100);
- dc.DrawBitmap(*gs_bmpWithColMask, 0, 120, TRUE);
+ dc.DrawBitmap(*gs_bmpWithColMask, 0, 120, true);
dc.DrawText(_T("the mask image"), 0, 200);
dc.DrawBitmap(*gs_bmpMask, 0, 220, 0);
dc.DrawText(_T("masked image"), 0, 300);
- dc.DrawBitmap(*gs_bmpWithMask, 0, 320, TRUE);
+ dc.DrawBitmap(*gs_bmpWithMask, 0, 320, true);
int cx = gs_bmpWithColMask->GetWidth(),
cy = gs_bmpWithColMask->GetHeight();
dc.DrawText(rasterOperations[n].name, x, y - 20);
memDC.SelectObject(*gs_bmpWithColMask);
- dc.Blit(x, y, cx, cy, &memDC, 0, 0, rasterOperations[n].rop, TRUE);
+ dc.Blit(x, y, cx, cy, &memDC, 0, 0, rasterOperations[n].rop, true);
}
}
}
}
+#if wxUSE_GRAPHICS_CONTEXT
+#ifdef __WXGTK20__
+void MyCanvas::DrawAlpha(wxDC& no_dc)
+#else
+void MyCanvas::DrawAlpha(wxDC& dc)
+#endif
+{
+#ifdef __WXGTK__
+ wxGCDC dc( this );
+ PrepareDC( dc );
+#endif
+
+ wxDouble margin = 20 ;
+ wxDouble width = 180 ;
+ wxDouble radius = 30 ;
+
+ dc.SetPen( wxPen( wxColour( 128, 0, 0, 255 ),12, wxSOLID));
+ dc.SetBrush( wxBrush( wxColour( 255, 0, 0, 255),wxSOLID));
+
+ wxRect r(margin,margin+width*0.66,width,width) ;
+
+ dc.DrawRoundedRectangle( r.x, r.y, r.width, r.width, radius ) ;
+
+ dc.SetPen( wxPen( wxColour( 0, 0, 128, 255 ),12, wxSOLID));
+ dc.SetBrush( wxBrush( wxColour( 0, 0, 255, 255),wxSOLID));
+
+ r.Offset( width * 0.8 , - width * 0.66 ) ;
+
+ dc.DrawRoundedRectangle( r.x, r.y, r.width, r.width, radius ) ;
+
+ dc.SetPen( wxPen( wxColour( 128, 128, 0, 255 ),12, wxSOLID));
+ dc.SetBrush( wxBrush( wxColour( 192, 192, 0, 255),wxSOLID));
+
+ r.Offset( width * 0.8 , width *0.5 ) ;
+
+ dc.DrawRoundedRectangle( r.x, r.y, r.width, r.width, radius ) ;
+
+ dc.SetPen( *wxTRANSPARENT_PEN ) ;
+ dc.SetBrush( wxBrush( wxColour(255,255,128,128) ) );
+ dc.DrawRoundedRectangle( 0 , margin + width / 2 , width * 3 , 100 , radius) ;
+
+ dc.SetTextForeground( wxColour(255,255,0,128) );
+ dc.SetFont( wxFont( 40, wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL ) );
+ dc.DrawText( wxT("Hello!"), 120, 80 );
+}
+
+#endif
+
void MyCanvas::DrawCircles(wxDC& dc)
{
int x = 100,
y = 100,
r = 20;
+ dc.SetPen( *wxRED_PEN );
+ dc.SetBrush( *wxGREEN_BRUSH );
+
dc.DrawText(_T("Some circles"), 0, y);
dc.DrawCircle(x, y, r);
dc.DrawCircle(x + 2*r, y, r);
dc.DrawEllipticArc(x + r, y, 2*r, r, 90, 180);
dc.DrawEllipticArc(x + 3*r, y, 2*r, r, 180, 270);
dc.DrawEllipticArc(x + 5*r, y, 2*r, r, 270, 360);
+
+ // same as above, just transparent brush
+
+ dc.SetPen( *wxRED_PEN );
+ dc.SetBrush( *wxTRANSPARENT_BRUSH );
+
+ y += 2*r;
+ dc.DrawText(_T("Some circles"), 0, y);
+ dc.DrawCircle(x, y, r);
+ dc.DrawCircle(x + 2*r, y, r);
+ dc.DrawCircle(x + 4*r, y, r);
+
+ y += 2*r;
+ dc.DrawText(_T("And ellipses"), 0, y);
+ dc.DrawEllipse(x - r, y, 2*r, r);
+ dc.DrawEllipse(x + r, y, 2*r, r);
+ dc.DrawEllipse(x + 3*r, y, 2*r, r);
+
+ y += 2*r;
+ dc.DrawText(_T("And arcs"), 0, y);
+ dc.DrawArc(x - r, y, x + r, y, x, y);
+ dc.DrawArc(x + 4*r, y, x + 2*r, y, x + 3*r, y);
+ dc.DrawArc(x + 5*r, y, x + 5*r, y, x + 6*r, y);
+
+ y += 2*r;
+ dc.DrawEllipticArc(x - r, y, 2*r, r, 0, 90);
+ dc.DrawEllipticArc(x + r, y, 2*r, r, 90, 180);
+ dc.DrawEllipticArc(x + 3*r, y, 2*r, r, 180, 270);
+ dc.DrawEllipticArc(x + 5*r, y, 2*r, r, 270, 360);
+
+}
+
+void MyCanvas::DrawSplines(wxDC& dc)
+{
+#if wxUSE_SPLINES
+ dc.DrawText(_T("Some splines"), 10, 5);
+
+ // values are hardcoded rather than randomly generated
+ // so the output can be compared between native
+ // implementations on platforms with different random
+ // generators
+
+ const int R = 300;
+ const wxPoint center( R + 20, R + 20 );
+ const int angles[7] = { 0, 10, 33, 77, 13, 145, 90 };
+ const int radii[5] = { 100 , 59, 85, 33, 90 };
+ const int n = 200;
+ wxPoint pts[n];
+
+ // background spline calculation
+ unsigned int radius_pos = 0;
+ unsigned int angle_pos = 0;
+ int angle = 0;
+ for ( int i = 0; i < n; i++ )
+ {
+ angle += angles[ angle_pos ];
+ int r = R * radii[ radius_pos ] / 100;
+ pts[ i ].x = center.x + (wxCoord)( r * cos( M_PI * angle / 180.0) );
+ pts[ i ].y = center.y + (wxCoord)( r * sin( M_PI * angle / 180.0) );
+
+ angle_pos++;
+ if ( angle_pos >= WXSIZEOF(angles) ) angle_pos = 0;
+
+ radius_pos++;
+ if ( radius_pos >= WXSIZEOF(radii) ) radius_pos = 0;
+ }
+
+ // background spline drawing
+ dc.SetPen(*wxRED_PEN);
+ dc.DrawSpline(WXSIZEOF(pts), pts);
+
+ // less detailed spline calculation
+ wxPoint letters[4][5];
+ // w
+ letters[0][0] = wxPoint( 0,1); // O O
+ letters[0][1] = wxPoint( 1,3); // * *
+ letters[0][2] = wxPoint( 2,2); // * O *
+ letters[0][3] = wxPoint( 3,3); // * * * *
+ letters[0][4] = wxPoint( 4,1); // O O
+ // x1
+ letters[1][0] = wxPoint( 5,1); // O*O
+ letters[1][1] = wxPoint( 6,1); // *
+ letters[1][2] = wxPoint( 7,2); // O
+ letters[1][3] = wxPoint( 8,3); // *
+ letters[1][4] = wxPoint( 9,3); // O*O
+ // x2
+ letters[2][0] = wxPoint( 5,3); // O*O
+ letters[2][1] = wxPoint( 6,3); // *
+ letters[2][2] = wxPoint( 7,2); // O
+ letters[2][3] = wxPoint( 8,1); // *
+ letters[2][4] = wxPoint( 9,1); // O*O
+ // W
+ letters[3][0] = wxPoint(10,0); // O O
+ letters[3][1] = wxPoint(11,3); // * *
+ letters[3][2] = wxPoint(12,1); // * O *
+ letters[3][3] = wxPoint(13,3); // * * * *
+ letters[3][4] = wxPoint(14,0); // O O
+
+ const int dx = 2 * R / letters[3][4].x;
+ const int h[4] = { -R/2, 0, R/4, R/2 };
+
+ for ( int m = 0; m < 4; m++ )
+ {
+ for ( int n = 0; n < 5; n++ )
+ {
+ letters[m][n].x = center.x - R + letters[m][n].x * dx;
+ letters[m][n].y = center.y + h[ letters[m][n].y ];
+ }
+
+ dc.SetPen( wxPen( wxT("blue"), 1, wxDOT) );
+ dc.DrawLines(5, letters[m]);
+ dc.SetPen( wxPen( wxT("black"), 4, wxSOLID) );
+ dc.DrawSpline(5, letters[m]);
+ }
+
+#else
+ dc.DrawText(_T("Splines not supported."), 10, 5);
+#endif
+}
+
+void MyCanvas::DrawGradients(wxDC& dc)
+{
+ // LHS: linear
+ wxRect r(10, 10, 100, 100);
+ dc.GradientFillLinear(r, *wxWHITE, *wxBLUE, wxRIGHT);
+
+ r.Offset(0, 110);
+ dc.GradientFillLinear(r, *wxWHITE, *wxBLUE, wxLEFT);
+
+ r.Offset(0, 110);
+ dc.GradientFillLinear(r, *wxWHITE, *wxBLUE, wxDOWN);
+
+ r.Offset(0, 110);
+ dc.GradientFillLinear(r, *wxWHITE, *wxBLUE, wxUP);
+
+
+ // RHS: concentric
+ r = wxRect(200, 10, 100, 100);
+ dc.GradientFillConcentric(r, *wxBLUE, *wxWHITE);
+
+ r.Offset(0, 110);
+ dc.GradientFillConcentric(r, *wxWHITE, *wxBLUE);
+
+ r.Offset(0, 110);
+ dc.GradientFillConcentric(r, *wxBLUE, *wxWHITE, wxPoint(0, 0));
+
+ r.Offset(0, 110);
+ dc.GradientFillConcentric(r, *wxBLUE, *wxWHITE, wxPoint(100, 100));
}
void MyCanvas::DrawRegions(wxDC& dc)
_T("should be offset by 10 pixels."),
10, 5 + 2*dc.GetCharHeight());
- DrawRegionsHelper(dc, 10, TRUE);
- DrawRegionsHelper(dc, 350, FALSE);
+ DrawRegionsHelper(dc, 10, true);
+ DrawRegionsHelper(dc, 350, false);
}
void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime)
if (m_smile_bmp.Ok())
{
- dc.DrawBitmap( m_smile_bmp, x + 150, y + 150, TRUE );
- dc.DrawBitmap( m_smile_bmp, x + 130, y + 10, TRUE );
- dc.DrawBitmap( m_smile_bmp, x + 130, y + 280, TRUE );
- dc.DrawBitmap( m_smile_bmp, x + 100, y + 70, TRUE );
- dc.DrawBitmap( m_smile_bmp, x + 200, y + 70, TRUE );
+ dc.DrawBitmap( m_smile_bmp, x + 150, y + 150, true );
+ dc.DrawBitmap( m_smile_bmp, x + 130, y + 10, true );
+ dc.DrawBitmap( m_smile_bmp, x + 130, y + 280, true );
+ dc.DrawBitmap( m_smile_bmp, x + 100, y + 70, true );
+ dc.DrawBitmap( m_smile_bmp, x + 200, y + 70, true );
}
}
void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
{
- wxPaintDC dc(this);
+ wxPaintDC pdc(this);
+
+#if wxUSE_GRAPHICS_CONTEXT
+ wxGCDC gdc( pdc ) ;
+ wxDC &dc = m_useContext ? (wxDC&) gdc : (wxDC&) pdc ;
+#else
+ wxDC &dc = pdc ;
+#endif
+
PrepareDC(dc);
m_owner->PrepareDC(dc);
if ( m_owner->m_textureBackground) {
if ( ! m_owner->m_backgroundBrush.Ok() ) {
- wxBrush b(wxColour(0,128,0), wxSOLID);
+ wxColour clr(0,128,0);
+ wxBrush b(clr, wxSOLID);
dc.SetBackground(b);
}
}
DrawCircles(dc);
break;
+ case Show_Splines:
+ DrawSplines(dc);
+ break;
+
case Show_Regions:
DrawRegions(dc);
break;
case Show_Ops:
DrawWithLogicalOps(dc);
break;
+
+#if wxUSE_GRAPHICS_CONTEXT
+ case Show_Alpha:
+ DrawAlpha(dc);
+ break;
+#endif
+
+ case Show_Gradient:
+ DrawGradients(dc);
+ break;
+
+ default:
+ break;
}
}
void MyCanvas::OnMouseMove(wxMouseEvent &event)
{
+#if wxUSE_STATUSBAR
wxClientDC dc(this);
PrepareDC(dc);
m_owner->PrepareDC(dc);
wxString str;
str.Printf( wxT("Current mouse position: %d,%d"), (int)x, (int)y );
m_owner->SetStatusText( str );
+#else
+ wxUnusedVar(event);
+#endif // wxUSE_STATUSBAR
}
// ----------------------------------------------------------------------------
// MyFrame
// ----------------------------------------------------------------------------
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
// handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU (File_Quit, MyFrame::OnQuit)
EVT_MENU (File_About, MyFrame::OnAbout)
EVT_MENU (File_Clip, MyFrame::OnClip)
+#if wxUSE_GRAPHICS_CONTEXT
+ EVT_MENU (File_GraphicContext, MyFrame::OnGraphicContext)
+#endif
EVT_MENU_RANGE(MenuShow_First, MenuShow_Last, MyFrame::OnShow)
// frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
- : wxFrame((wxFrame *)NULL, -1, title, pos, size,
+ : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size,
wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
{
// set the frame icon
menuFile->Append(File_ShowOps, _T("&ROP screen\tF7"));
menuFile->Append(File_ShowRegions, _T("Re&gions screen\tF8"));
menuFile->Append(File_ShowCircles, _T("&Circles screen\tF9"));
+#if wxUSE_GRAPHICS_CONTEXT
+ menuFile->Append(File_ShowAlpha, _T("&Alpha screen\tF10"));
+#endif
+ menuFile->Append(File_ShowSplines, _T("&Splines screen\tF11"));
+ menuFile->Append(File_ShowGradients, _T("&Gradients screen\tF12"));
menuFile->AppendSeparator();
menuFile->AppendCheckItem(File_Clip, _T("&Clip\tCtrl-C"), _T("Clip/unclip drawing"));
+#if wxUSE_GRAPHICS_CONTEXT
+ menuFile->AppendCheckItem(File_GraphicContext, _T("&Use GraphicContext\tCtrl-Y"), _T("Use GraphicContext"));
+#endif
menuFile->AppendSeparator();
menuFile->Append(File_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
menuFile->AppendSeparator();
menuUserScale->Append( UserScale_Restore, _T("&Restore to normal\tCtrl-0") );
wxMenu *menuAxis = new wxMenu;
- menuAxis->Append( AxisMirror_Horiz, _T("Mirror horizontally\tCtrl-M"), _T(""), TRUE );
- menuAxis->Append( AxisMirror_Vertic, _T("Mirror vertically\tCtrl-N"), _T(""), TRUE );
+ menuAxis->AppendCheckItem( AxisMirror_Horiz, _T("Mirror horizontally\tCtrl-M") );
+ menuAxis->AppendCheckItem( AxisMirror_Vertic, _T("Mirror vertically\tCtrl-N") );
wxMenu *menuLogical = new wxMenu;
menuLogical->Append( LogicalOrigin_MoveDown, _T("Move &down\tCtrl-D") );
menuLogical->Append( LogicalOrigin_Restore, _T("&Restore to normal\tShift-Ctrl-0") );
wxMenu *menuColour = new wxMenu;
+#if wxUSE_COLOURDLG
menuColour->Append( Colour_TextForeground, _T("Text &foreground...") );
menuColour->Append( Colour_TextBackground, _T("Text &background...") );
menuColour->Append( Colour_Background, _T("Background &colour...") );
- menuColour->Append( Colour_BackgroundMode, _T("&Opaque/transparent\tCtrl-B"), _T(""), TRUE );
- menuColour->Append( Colour_TextureBackgound, _T("Draw textured back&ground\tCtrl-T"), _T(""), TRUE);
+#endif // wxUSE_COLOURDLG
+ menuColour->AppendCheckItem( Colour_BackgroundMode, _T("&Opaque/transparent\tCtrl-B") );
+ menuColour->AppendCheckItem( Colour_TextureBackgound, _T("Draw textured back&ground\tCtrl-T") );
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar;
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
- // create a status bar just for fun (by default with 1 pane only)
+#if wxUSE_STATUSBAR
CreateStatusBar(2);
- SetStatusText(_T("Welcome to wxWindows!"));
+ SetStatusText(_T("Welcome to wxWidgets!"));
+#endif // wxUSE_STATUSBAR
m_mapMode = wxMM_TEXT;
m_xUserScale = 1.0;
m_xLogicalOrigin = 0;
m_yLogicalOrigin = 0;
m_xAxisReversed =
- m_yAxisReversed = FALSE;
+ m_yAxisReversed = false;
m_backgroundMode = wxSOLID;
m_colourForeground = *wxRED;
m_colourBackground = *wxBLUE;
- m_textureBackground = FALSE;
+ m_textureBackground = false;
m_canvas = new MyCanvas( this );
m_canvas->SetScrollbars( 10, 10, 100, 240 );
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- // TRUE is to force the frame to close
- Close(TRUE);
+ // true is to force the frame to close
+ Close(true);
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
m_canvas->Clip(event.IsChecked());
}
+#if wxUSE_GRAPHICS_CONTEXT
+void MyFrame::OnGraphicContext(wxCommandEvent& event)
+{
+ m_canvas->UseGraphicContext(event.IsChecked());
+}
+#endif
+
void MyFrame::OnShow(wxCommandEvent& event)
{
- m_canvas->Show((ScreenToShow)(event.GetId() - MenuShow_First));
+ m_canvas->ToShow((ScreenToShow)(event.GetId() - MenuShow_First));
}
void MyFrame::OnOption(wxCommandEvent& event)
m_xAxisReversed = !m_xAxisReversed;
break;
+#if wxUSE_COLOURDLG
case Colour_TextForeground:
m_colourForeground = SelectColour();
break;
}
}
break;
+#endif // wxUSE_COLOURDLG
+
case Colour_BackgroundMode:
m_backgroundMode = m_backgroundMode == wxSOLID ? wxTRANSPARENT
: wxSOLID;
dc.SetMapMode( m_mapMode );
}
+#if wxUSE_COLOURDLG
wxColour MyFrame::SelectColour()
{
wxColour col;
return col;
}
-
+#endif // wxUSE_COLOURDLG
projects / wxWidgets.git / blobdiff