From 352d44d26856241d5e14dac630ab4473d18e05ef Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 24 Aug 2000 11:31:32 +0000 Subject: [PATCH] Fixed for wxGTK compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/gizmos/multicell/Makefile.in | 24 +++++++ contrib/samples/gizmos/splittree/Makefile.in | 21 +++--- contrib/samples/gizmos/splittree/tree.cpp | 75 ++++++++++++++++---- 3 files changed, 96 insertions(+), 24 deletions(-) create mode 100644 contrib/samples/gizmos/multicell/Makefile.in diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in new file mode 100644 index 0000000000..5c24b072ba --- /dev/null +++ b/contrib/samples/gizmos/multicell/Makefile.in @@ -0,0 +1,24 @@ +# +# File: Makefile.in +# Author: Julian Smart +# Created: 2000 +# Updated: +# Copyright: (c) 2000 Julian Smart +# +# "%W% %G%" +# +# Makefile for the multicell example (UNIX). + +top_srcdir = @top_srcdir@/.. +top_builddir = ../../../.. +program_dir = contrib/samples/gizmos/multicell + +PROGRAM=multicell + +OBJECTS=$(PROGRAM).o + +#APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@ +APPEXTRALIBS=$(top_builddir)/lib/libgizmos.a +APPEXTRADEFS=-I$(top_srcdir)/contrib/include + +include $(top_builddir)/src/makeprog.env diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in index 7185ea5865..a66a64938d 100644 --- a/contrib/samples/gizmos/splittree/Makefile.in +++ b/contrib/samples/gizmos/splittree/Makefile.in @@ -1,21 +1,24 @@ # -# File: makefile.unx +# File: Makefile.in # Author: Julian Smart -# Created: 1998 +# Created: 2000 # Updated: -# Copyright: (c) 1998 Julian Smart +# Copyright: (c) 2000 Julian Smart # # "%W% %G%" # -# Makefile for minimal example (UNIX). +# Makefile for the splittree example (UNIX). top_srcdir = @top_srcdir@/.. -top_builddir = ../.. -program_dir = samples/minimal +top_builddir = ../../../.. +program_dir = contrib/samples/gizmos/splittree -PROGRAM=minimal +PROGRAM=splittree +OBJECTS=tree.o -OBJECTS=$(PROGRAM).o +#APPEXTRALIBS=$(top_builddir)/lib/libgizmos.@WX_TARGET_LIBRARY_TYPE@ +APPEXTRALIBS=$(top_builddir)/lib/libgizmos.a +APPEXTRADEFS=-I$(top_srcdir)/contrib/include -include ../../src/makeprog.env +include $(top_builddir)/src/makeprog.env diff --git a/contrib/samples/gizmos/splittree/tree.cpp b/contrib/samples/gizmos/splittree/tree.cpp index a1539c65ea..a060a5f887 100644 --- a/contrib/samples/gizmos/splittree/tree.cpp +++ b/contrib/samples/gizmos/splittree/tree.cpp @@ -34,6 +34,63 @@ #include "wx/wx.h" #endif +#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW +/* Closed folder */ +static char * icon1_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 6 1", +/* colors */ +" s None c None", +". c #000000", +"+ c #c0c0c0", +"@ c #808080", +"# c #ffff00", +"$ c #ffffff", +/* pixels */ +" ", +" @@@@@ ", +" @#+#+#@ ", +" @#+#+#+#@@@@@@ ", +" @$$$$$$$$$$$$@.", +" @$#+#+#+#+#+#@.", +" @$+#+#+#+#+#+@.", +" @$#+#+#+#+#+#@.", +" @$+#+#+#+#+#+@.", +" @$#+#+#+#+#+#@.", +" @$+#+#+#+#+#+@.", +" @$#+#+#+#+#+#@.", +" @@@@@@@@@@@@@@.", +" ..............", +" ", +" "}; + +/* File */ +static char * icon2_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 3 1", +/* colors */ +" s None c None", +". c #000000", +"+ c #ffffff", +/* pixels */ +" ", +" ........ ", +" .++++++.. ", +" .+.+.++.+. ", +" .++++++.... ", +" .+.+.+++++. ", +" .+++++++++. ", +" .+.+.+.+.+. ", +" .+++++++++. ", +" .+.+.+.+.+. ", +" .+++++++++. ", +" .+.+.+.+.+. ", +" .+++++++++. ", +" ........... ", +" ", +" "}; +#endif + #include "wx/imaglist.h" #include "tree.h" @@ -184,21 +241,9 @@ TestTree::TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt, #if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW m_imageList->Add(wxIcon(icon1_xpm)); m_imageList->Add(wxIcon(icon2_xpm)); - m_imageList->Add(wxIcon(icon3_xpm)); - m_imageList->Add(wxIcon(icon4_xpm)); - m_imageList->Add(wxIcon(icon5_xpm)); - m_imageList->Add(wxIcon(icon6_xpm)); - m_imageList->Add(wxIcon(icon7_xpm)); - m_imageList->Add(wxIcon(icon8_xpm)); #elif defined(__WXMSW__) m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CLOSED_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_OPEN_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE)); m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_COMPUTER"), wxBITMAP_TYPE_ICO_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_DRIVE"), wxBITMAP_TYPE_ICO_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CDROM"), wxBITMAP_TYPE_ICO_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FLOPPY"), wxBITMAP_TYPE_ICO_RESOURCE)); - m_imageList->Add(wxIcon(wxT("wxICON_SMALL_REMOVEABLE"), wxBITMAP_TYPE_ICO_RESOURCE)); #else #error "Sorry, we don't have icons available for this platforms." #endif @@ -206,18 +251,18 @@ TestTree::TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt, // Add some dummy items - wxTreeItemId rootId = AddRoot(_("Root"), 3, -1); + wxTreeItemId rootId = AddRoot(_("Root"), -1, -1); int i; for (i = 1; i <= 20; i++) { wxString label; label.Printf(wxT("Item %d"), i); wxTreeItemId id = AppendItem(rootId, label, 0); - SetItemImage( id, 1, wxTreeItemIcon_Expanded ); + //SetItemImage( id, 1, wxTreeItemIcon_Expanded ); int j; for (j = 0; j < 10; j++) - AppendItem(id, _("Child"), 2); + AppendItem(id, _("Child"), 1); } Expand(rootId); } -- 2.45.2