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

Simplify renderer selection in the drawing sample

Browse Source 
Make "Use default wxGraphicsContext" part of the renderer selection
radio group and put it in correct order, as having "1, 0, 3, 4"
accelerators order in the menu was really surprising.

Remove wxEVT_UPDATE_UI handlers as they complicated things in the sample
code (which is supposed to be simple, after all) without much benefit
and arguably even added to the confusion during run-time as menu items
could both be manually selected and checked automatically.
This commit is contained in:
Vadim Zeitlin
2020-03-27 11:43:19 +01:00
parent 62bb47cfdb
commit e7c8039d13
1 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
samples/drawing/drawing.cpp
View File

@@ -203,31 +203,16 @@ public:
m_canvas->UseGraphicRenderer(NULL); m_canvas->UseGraphicRenderer(NULL);
} }
void OnGraphicContextNoneUpdateUI(wxUpdateUIEvent& event)
{
event.Check(m_canvas->GetRenderer() == NULL);
}
void OnGraphicContextDefault(wxCommandEvent& WXUNUSED(event)) void OnGraphicContextDefault(wxCommandEvent& WXUNUSED(event))
{ {
m_canvas->UseGraphicRenderer(wxGraphicsRenderer::GetDefaultRenderer()); m_canvas->UseGraphicRenderer(wxGraphicsRenderer::GetDefaultRenderer());
} }
void OnGraphicContextDefaultUpdateUI(wxUpdateUIEvent& event)
{
event.Check(m_canvas->IsDefaultRenderer());
}
#if wxUSE_CAIRO #if wxUSE_CAIRO
void OnGraphicContextCairo(wxCommandEvent& WXUNUSED(event)) void OnGraphicContextCairo(wxCommandEvent& WXUNUSED(event))
{ {
m_canvas->UseGraphicRenderer(wxGraphicsRenderer::GetCairoRenderer()); m_canvas->UseGraphicRenderer(wxGraphicsRenderer::GetCairoRenderer());
} }
void OnGraphicContextCairoUpdateUI(wxUpdateUIEvent& event)
{
event.Check(m_canvas->GetRenderer() == wxGraphicsRenderer::GetCairoRenderer());
}
#endif // wxUSE_CAIRO #endif // wxUSE_CAIRO
#ifdef __WXMSW__ #ifdef __WXMSW__
#if wxUSE_GRAPHICS_GDIPLUS #if wxUSE_GRAPHICS_GDIPLUS
@@ -235,22 +220,12 @@ public:
{ {
m_canvas->UseGraphicRenderer(wxGraphicsRenderer::GetGDIPlusRenderer()); m_canvas->UseGraphicRenderer(wxGraphicsRenderer::GetGDIPlusRenderer());
} }
void OnGraphicContextGDIPlusUpdateUI(wxUpdateUIEvent& event)
{
event.Check(m_canvas->GetRenderer() == wxGraphicsRenderer::GetGDIPlusRenderer());
}
#endif #endif
#if wxUSE_GRAPHICS_DIRECT2D #if wxUSE_GRAPHICS_DIRECT2D
void OnGraphicContextDirect2D(wxCommandEvent& WXUNUSED(event)) void OnGraphicContextDirect2D(wxCommandEvent& WXUNUSED(event))
{ {
m_canvas->UseGraphicRenderer(wxGraphicsRenderer::GetDirect2DRenderer()); m_canvas->UseGraphicRenderer(wxGraphicsRenderer::GetDirect2DRenderer());
} }
void OnGraphicContextDirect2DUpdateUI(wxUpdateUIEvent& event)
{
event.Check(m_canvas->GetRenderer() == wxGraphicsRenderer::GetDirect2DRenderer());
}
#endif #endif
#endif // __WXMSW__ #endif // __WXMSW__
void OnAntiAliasing(wxCommandEvent& event) void OnAntiAliasing(wxCommandEvent& event)
@@ -2230,21 +2205,16 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
#if wxUSE_GRAPHICS_CONTEXT #if wxUSE_GRAPHICS_CONTEXT
EVT_MENU (File_GC_Default, MyFrame::OnGraphicContextDefault) EVT_MENU (File_GC_Default, MyFrame::OnGraphicContextDefault)
EVT_UPDATE_UI (File_GC_Default, MyFrame::OnGraphicContextDefaultUpdateUI)
EVT_MENU (File_DC, MyFrame::OnGraphicContextNone) EVT_MENU (File_DC, MyFrame::OnGraphicContextNone)
EVT_UPDATE_UI (File_DC, MyFrame::OnGraphicContextNoneUpdateUI)
#if wxUSE_CAIRO #if wxUSE_CAIRO
EVT_MENU (File_GC_Cairo, MyFrame::OnGraphicContextCairo) EVT_MENU (File_GC_Cairo, MyFrame::OnGraphicContextCairo)
EVT_UPDATE_UI (File_GC_Cairo, MyFrame::OnGraphicContextCairoUpdateUI)
#endif // wxUSE_CAIRO #endif // wxUSE_CAIRO
#ifdef __WXMSW__ #ifdef __WXMSW__
#if wxUSE_GRAPHICS_GDIPLUS #if wxUSE_GRAPHICS_GDIPLUS
EVT_MENU (File_GC_GDIPlus, MyFrame::OnGraphicContextGDIPlus) EVT_MENU (File_GC_GDIPlus, MyFrame::OnGraphicContextGDIPlus)
EVT_UPDATE_UI (File_GC_GDIPlus, MyFrame::OnGraphicContextGDIPlusUpdateUI)
#endif #endif
#if wxUSE_GRAPHICS_DIRECT2D #if wxUSE_GRAPHICS_DIRECT2D
EVT_MENU (File_GC_Direct2D, MyFrame::OnGraphicContextDirect2D) EVT_MENU (File_GC_Direct2D, MyFrame::OnGraphicContextDirect2D)
EVT_UPDATE_UI (File_GC_Direct2D, MyFrame::OnGraphicContextDirect2DUpdateUI)
#endif #endif
#endif // __WXMSW__ #endif // __WXMSW__
EVT_MENU (File_AntiAliasing, MyFrame::OnAntiAliasing) EVT_MENU (File_AntiAliasing, MyFrame::OnAntiAliasing)
@@ -2292,8 +2262,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
wxMenu *menuFile = new wxMenu; wxMenu *menuFile = new wxMenu;
#if wxUSE_GRAPHICS_CONTEXT #if wxUSE_GRAPHICS_CONTEXT
menuFile->AppendCheckItem(File_GC_Default, "Use default wx&GraphicContext\t1");
m_menuItemUseDC = menuFile->AppendRadioItem(File_DC, "Use wx&DC\t0"); m_menuItemUseDC = menuFile->AppendRadioItem(File_DC, "Use wx&DC\t0");
menuFile->AppendRadioItem(File_GC_Default, "Use default wx&GraphicContext\t1");
#if wxUSE_CAIRO #if wxUSE_CAIRO
menuFile->AppendRadioItem(File_GC_Cairo, "Use &Cairo\t2"); menuFile->AppendRadioItem(File_GC_Cairo, "Use &Cairo\t2");
#endif // wxUSE_CAIRO #endif // wxUSE_CAIRO