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

Include XPM under wxX11 for some samples; added comment about

Browse Source 
non-working images in dragimag sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-15 12:32:50 +00:00
parent eb90fb3ee8
commit e334d0eac8
5 changed files with 581 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/dragimag/dragimag.cpp
View File

@@ -36,7 +36,7 @@
#include "dragimag.h"
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
#include "mondrian.xpm"
#include "dragicon.xpm"
#endif
@@ -190,7 +190,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
{
// Can anyone explain why this test is necessary,
// to prevent a gcc error?
#ifdef __WXMOTIF__
#if defined(__WXMOTIF__) || defined(__WXX11__)
wxIcon icon(dragicon_xpm);
#else
wxIcon icon(wxICON(dragicon));
@@ -394,6 +394,9 @@ bool MyApp::OnInit()
{
wxString filename;
filename.Printf(wxT("%s%d.png"), (const wxChar*)rootName, i);
/* For some reason under wxX11, the 2nd LoadFile in this loop fails, with
a BadMatch inside CreateFromImage (inside ConvertToBitmap). This happens even if you copy
the first file over the second file. */
if (image.LoadFile(filename, wxBITMAP_TYPE_PNG))
{
DragShape* newShape = new DragShape(image.ConvertToBitmap());