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

continue even if the bitmaps can't be found; look for them in argv[0] directory too; use more clear name for ROP screen in the menu (#9839)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-21 21:06:21 +00:00
parent 42046cf5e3
commit e0ac7d941f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/drawing/drawing.cpp
View File

@@ -36,6 +36,7 @@
#include "wx/dcgraph.h" #include "wx/dcgraph.h"
#include "wx/overlay.h" #include "wx/overlay.h"
#include "wx/graphics.h" #include "wx/graphics.h"
#include "wx/filename.h"
#define TEST_CAIRO_EVERYWHERE 0 #define TEST_CAIRO_EVERYWHERE 0
@@ -317,6 +318,9 @@ bool MyApp::LoadImages()
gs_bmp36 = new wxBitmap; gs_bmp36 = new wxBitmap;
wxPathList pathList; wxPathList pathList;
// special hack for Unix in-tree sample build, don't do this in real
// programs, use wxStandardPaths instead
pathList.Add(wxFileName(argv[0]).GetPath());
pathList.Add(_T(".")); pathList.Add(_T("."));
pathList.Add(_T("..")); pathList.Add(_T(".."));
pathList.Add(_T("../..")); pathList.Add(_T("../.."));
@@ -380,10 +384,8 @@ bool MyApp::OnInit()
wxT("for this sample from the current or parent ") wxT("for this sample from the current or parent ")
wxT("directory, please copy them there.")); wxT("directory, please copy them there."));
// stop here // still continue, the sample can be used without images too if they're
DeleteBitmaps(); // missing for whatever reason
return false;
} }
// ok, continue // ok, continue
@@ -1601,7 +1603,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
menuFile->Append(File_ShowPolygons, _T("&Polygons screen\tF5")); menuFile->Append(File_ShowPolygons, _T("&Polygons screen\tF5"));
menuFile->Append(File_ShowMask, _T("&Mask screen\tF6")); menuFile->Append(File_ShowMask, _T("&Mask screen\tF6"));
menuFile->Append(File_ShowMaskStretch, _T("1/&2 scaled mask\tShift-F6")); menuFile->Append(File_ShowMaskStretch, _T("1/&2 scaled mask\tShift-F6"));
menuFile->Append(File_ShowOps, _T("&ROP screen\tF7")); menuFile->Append(File_ShowOps, _T("&Raster operations screen\tF7"));
menuFile->Append(File_ShowRegions, _T("Re&gions screen\tF8")); menuFile->Append(File_ShowRegions, _T("Re&gions screen\tF8"));
menuFile->Append(File_ShowCircles, _T("&Circles screen\tF9")); menuFile->Append(File_ShowCircles, _T("&Circles screen\tF9"));
#if wxUSE_GRAPHICS_CONTEXT #if wxUSE_GRAPHICS_CONTEXT