From: Robert Roebling Date: Fri, 14 Jan 2000 17:08:42 +0000 (+0000) Subject: Updated "make dist", X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dfd6b52fdb0398320ba58b15ee066249cfab2dc0?hp=4b05d97389caaaa487f8b142204aa0c533e41e92 Updated "make dist", Extended scroll sub sample to demonstrate how wxGrid might work. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index c09276bee6..81043d2156 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 01:34, 2000/01/14 +# This file was automatically generated by tmake at 17:53, 2000/01/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -123,6 +123,7 @@ PMDIR = $(WXDIR)/src/os2 ODBCDIR = $(WXDIR)/src/iodbc INCDIR = $(WXDIR)/include SAMPDIR = $(WXDIR)/samples +DEMODIR = $(WXDIR)/demos UTILSDIR = $(WXDIR)/utils MISCDIR = $(WXDIR)/misc @@ -132,6 +133,7 @@ DOCDIR = $(WXDIR)/docs WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz +WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz DISTDIR = ./_dist_dir/wx$(TOOLKIT) ############################## Files ################################## @@ -2883,18 +2885,51 @@ MSW_DIST: mkdir $(DISTDIR)/src/msw/ole cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole +DEMOS_DIST: + mkdir $(DISTDIR)/demos + cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos + + mkdir $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs + + mkdir $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty + + mkdir $(DISTDIR)/demos/life + mkdir $(DISTDIR)/demos/life/bitmaps + cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life + cp $(DEMODIR)/life/makefile.unx $(DISTDIR)/demos/life + cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life + cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life + cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life + cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps + + mkdir $(DISTDIR)/demos/poem + cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem + cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem + cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem + cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem + cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem + + mkdir $(DISTDIR)/demos/fractal + cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal + cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal + cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal + SAMPLES_DIST: mkdir $(DISTDIR)/samples cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples - mkdir $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/makefile.unx $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs - mkdir $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret @@ -2978,24 +3013,11 @@ SAMPLES_DIST: cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic - mkdir $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/makefile.unx $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/*.h $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty - mkdir $(DISTDIR)/samples/font cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font - mkdir $(DISTDIR)/samples/fractal - cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal - cp $(SAMPDIR)/fractal/makefile.unx $(DISTDIR)/samples/fractal - cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal - mkdir $(DISTDIR)/samples/grid cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid @@ -3078,14 +3100,6 @@ SAMPLES_DIST: cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout - mkdir $(DISTDIR)/samples/life - mkdir $(DISTDIR)/samples/life/bitmaps - cp $(SAMPDIR)/life/Makefile.in $(DISTDIR)/samples/life - cp $(SAMPDIR)/life/makefile.unx $(DISTDIR)/samples/life - cp $(SAMPDIR)/life/*.cpp $(DISTDIR)/samples/life - cp $(SAMPDIR)/life/*.xpm $(DISTDIR)/samples/life - cp $(SAMPDIR)/life/bitmaps/*.xpm $(DISTDIR)/samples/life/bitmaps - mkdir $(DISTDIR)/samples/listctrl mkdir $(DISTDIR)/samples/listctrl/bitmaps cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl @@ -3130,10 +3144,10 @@ SAMPLES_DIST: cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal - mkdir $(DISTDIR)/samples/nettest - cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest - cp $(SAMPDIR)/nettest/makefile.unx $(DISTDIR)/samples/nettest - cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest + mkdir $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup mkdir $(DISTDIR)/samples/newgrid cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid @@ -3248,17 +3262,10 @@ SAMPLES_DIST: cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard - mkdir $(DISTDIR)/samples/wxpoem - cp $(SAMPDIR)/wxpoem/Makefile.in $(DISTDIR)/samples/wxpoem - cp $(SAMPDIR)/wxpoem/*.cpp $(DISTDIR)/samples/wxpoem - cp $(SAMPDIR)/wxpoem/*.xpm $(DISTDIR)/samples/wxpoem - cp $(SAMPDIR)/wxpoem/*.dat $(DISTDIR)/samples/wxpoem - cp $(SAMPDIR)/wxpoem/*.txt $(DISTDIR)/samples/wxpoem - - mkdir $(DISTDIR)/samples/wxsocket - cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket - cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket - cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket + mkdir $(DISTDIR)/samples/sockets + cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets + cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets + cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets UTILS_DIST: mkdir $(DISTDIR)/utils @@ -3297,10 +3304,12 @@ MISC_DIST: mkdir $(DISTDIR)/misc/gs_afm cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm -dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST +dist: ALL_DIST @GUIDIST@ SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../.. + mv _dist_dir/wx$(TOOLKIT)/demos _dist_dir/wx$(TOOLKIT)/wxDemos + cd _dist_dir/wx$(TOOLKIT); tar ch wxDemos | gzip -f9 > $(WXDEMOS); mv $(WXDEMOS) ../.. $(RM) -r _dist_dir clean: diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 32262da7bd..38a6514efb 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -332,6 +332,7 @@ PMDIR = $(WXDIR)/src/os2 ODBCDIR = $(WXDIR)/src/iodbc INCDIR = $(WXDIR)/include SAMPDIR = $(WXDIR)/samples +DEMODIR = $(WXDIR)/demos UTILSDIR = $(WXDIR)/utils MISCDIR = $(WXDIR)/misc @@ -341,6 +342,7 @@ DOCDIR = $(WXDIR)/docs WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz +WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz DISTDIR = ./_dist_dir/wx$(TOOLKIT) ############################## Files ################################## @@ -876,18 +878,51 @@ MSW_DIST: mkdir $(DISTDIR)/src/msw/ole cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole +DEMOS_DIST: + mkdir $(DISTDIR)/demos + cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos + + mkdir $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/*.cpp $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs + cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs + + mkdir $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/*.h $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty + cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty + + mkdir $(DISTDIR)/demos/life + mkdir $(DISTDIR)/demos/life/bitmaps + cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life + cp $(DEMODIR)/life/makefile.unx $(DISTDIR)/demos/life + cp $(DEMODIR)/life/*.cpp $(DISTDIR)/demos/life + cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life + cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life + cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps + + mkdir $(DISTDIR)/demos/poem + cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem + cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem + cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem + cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem + cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem + + mkdir $(DISTDIR)/demos/fractal + cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal + cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal + cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal + SAMPLES_DIST: mkdir $(DISTDIR)/samples cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples - mkdir $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/makefile.unx $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs - cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs - mkdir $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret @@ -971,24 +1006,11 @@ SAMPLES_DIST: cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic - mkdir $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/makefile.unx $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/*.h $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty - cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty - mkdir $(DISTDIR)/samples/font cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font cp $(SAMPDIR)/font/*.cpp $(DISTDIR)/samples/font - mkdir $(DISTDIR)/samples/fractal - cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal - cp $(SAMPDIR)/fractal/makefile.unx $(DISTDIR)/samples/fractal - cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal - mkdir $(DISTDIR)/samples/grid cp $(SAMPDIR)/grid/Makefile.in $(DISTDIR)/samples/grid cp $(SAMPDIR)/grid/makefile.unx $(DISTDIR)/samples/grid @@ -1071,14 +1093,6 @@ SAMPLES_DIST: cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout cp $(SAMPDIR)/layout/*.h $(DISTDIR)/samples/layout - mkdir $(DISTDIR)/samples/life - mkdir $(DISTDIR)/samples/life/bitmaps - cp $(SAMPDIR)/life/Makefile.in $(DISTDIR)/samples/life - cp $(SAMPDIR)/life/makefile.unx $(DISTDIR)/samples/life - cp $(SAMPDIR)/life/*.cpp $(DISTDIR)/samples/life - cp $(SAMPDIR)/life/*.xpm $(DISTDIR)/samples/life - cp $(SAMPDIR)/life/bitmaps/*.xpm $(DISTDIR)/samples/life/bitmaps - mkdir $(DISTDIR)/samples/listctrl mkdir $(DISTDIR)/samples/listctrl/bitmaps cp $(SAMPDIR)/listctrl/Makefile.in $(DISTDIR)/samples/listctrl @@ -1123,10 +1137,10 @@ SAMPLES_DIST: cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal - mkdir $(DISTDIR)/samples/nettest - cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest - cp $(SAMPDIR)/nettest/makefile.unx $(DISTDIR)/samples/nettest - cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest + mkdir $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup + cp $(SAMPDIR)/dialup/*.cpp $(DISTDIR)/samples/dialup mkdir $(DISTDIR)/samples/newgrid cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid @@ -1241,17 +1255,10 @@ SAMPLES_DIST: cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard - mkdir $(DISTDIR)/samples/wxpoem - cp $(SAMPDIR)/wxpoem/Makefile.in $(DISTDIR)/samples/wxpoem - cp $(SAMPDIR)/wxpoem/*.cpp $(DISTDIR)/samples/wxpoem - cp $(SAMPDIR)/wxpoem/*.xpm $(DISTDIR)/samples/wxpoem - cp $(SAMPDIR)/wxpoem/*.dat $(DISTDIR)/samples/wxpoem - cp $(SAMPDIR)/wxpoem/*.txt $(DISTDIR)/samples/wxpoem - - mkdir $(DISTDIR)/samples/wxsocket - cp $(SAMPDIR)/wxsocket/Makefile.in $(DISTDIR)/samples/wxsocket - cp $(SAMPDIR)/wxsocket/*.cpp $(DISTDIR)/samples/wxsocket - cp $(SAMPDIR)/wxsocket/*.xpm $(DISTDIR)/samples/wxsocket + mkdir $(DISTDIR)/samples/sockets + cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets + cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets + cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets UTILS_DIST: mkdir $(DISTDIR)/utils @@ -1290,10 +1297,12 @@ MISC_DIST: mkdir $(DISTDIR)/misc/gs_afm cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm -dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST +dist: ALL_DIST @GUIDIST@ SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../.. + mv _dist_dir/wx$(TOOLKIT)/demos _dist_dir/wx$(TOOLKIT)/wxDemos + cd _dist_dir/wx$(TOOLKIT); tar ch wxDemos | gzip -f9 > $(WXDEMOS); mv $(WXDEMOS) ../.. $(RM) -r _dist_dir clean: diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp index 954eb7e5cc..330f41013b 100644 --- a/samples/scrollsub/scrollsub.cpp +++ b/samples/scrollsub/scrollsub.cpp @@ -48,18 +48,56 @@ private: DECLARE_EVENT_TABLE() }; +// MyTopLabels + +class MyTopLabels: public wxWindow +{ +public: + MyTopLabels() {} + MyTopLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); + + void OnPaint( wxPaintEvent &event ); + +private: + wxScrolledWindow *m_owner; + + DECLARE_DYNAMIC_CLASS(MyTopLabels) + DECLARE_EVENT_TABLE() +}; + +// MyRightLabels + +class MyRightLabels: public wxWindow +{ +public: + MyRightLabels() {} + MyRightLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); + + void OnPaint( wxPaintEvent &event ); + +private: + wxScrolledWindow *m_owner; + + DECLARE_DYNAMIC_CLASS(MyRightLabels) + DECLARE_EVENT_TABLE() +}; + // MyCanvas class MyCanvas: public wxPanel { public: MyCanvas() {} - MyCanvas( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); + MyCanvas( wxScrolledWindow *parent, MyTopLabels *top, MyRightLabels *right, + wxWindowID id, const wxPoint &pos, const wxSize &size ); ~MyCanvas(); void OnPaint( wxPaintEvent &event ); + void ScrollWindow( int dx, int dy, const wxRect *rect ); private: wxScrolledWindow *m_owner; + MyTopLabels *m_topLabels; + MyRightLabels *m_rightLabels; DECLARE_DYNAMIC_CLASS(MyCanvas) DECLARE_EVENT_TABLE() @@ -107,7 +145,10 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER, "test canvas" ) { - m_canvas = new MyCanvas( this, -1, wxDefaultPosition, wxDefaultSize ); + MyTopLabels *top = new MyTopLabels( this, -1, wxDefaultPosition, wxSize(-1,25) ); + MyRightLabels *right = new MyRightLabels( this, -1, wxDefaultPosition, wxSize(60,-1) ); + + m_canvas = new MyCanvas( this, top, right, -1, wxDefaultPosition, wxDefaultSize ); SetTargetWindow( m_canvas ); @@ -115,13 +156,22 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id, SetCursor( wxCursor( wxCURSOR_HAND ) ); + wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL ); + topsizer->Add( 60,25 ); + topsizer->Add( top, 1 ); + + mainsizer->Add( topsizer, 0, wxEXPAND ); + + wxBoxSizer *middlesizer = new wxBoxSizer( wxHORIZONTAL ); + middlesizer->Add( right, 0, wxEXPAND ); + middlesizer->Add( m_canvas, 1, wxEXPAND ); - topsizer->Add( m_canvas, 1, wxEXPAND|wxALL, 30 ); + mainsizer->Add( middlesizer, 1, wxEXPAND ); SetAutoLayout( TRUE ); - SetSizer( topsizer ); + SetSizer( mainsizer ); } MyScrolledWindow::~MyScrolledWindow() @@ -132,12 +182,63 @@ void MyScrolledWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxPaintDC dc( this ); +/* wxSize size( GetClientSize() ); long w,h; dc.GetTextExtent( wxT("Headline"), &w, &h ); dc.DrawText( wxT("Headline"), long (size.x / 2 - w / 2), 10 ); +*/ +} + +// MyTopLabels + +IMPLEMENT_DYNAMIC_CLASS(MyTopLabels,wxWindow) + +BEGIN_EVENT_TABLE(MyTopLabels, wxWindow) + EVT_PAINT( MyTopLabels::OnPaint) +END_EVENT_TABLE() + +MyTopLabels::MyTopLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) + : wxWindow( parent, id, pos, size ) +{ + m_owner = parent; +} + +void MyTopLabels::OnPaint( wxPaintEvent &event ) +{ + wxPaintDC dc(this); + m_owner->PrepareDC( dc ); + dc.DrawText( "Colummn 1", 5, 5 ); + dc.DrawText( "Colummn 2", 105, 5 ); + dc.DrawText( "Colummn 3", 205, 5 ); +} + +// MyRightLabels + +IMPLEMENT_DYNAMIC_CLASS(MyRightLabels,wxWindow) + +BEGIN_EVENT_TABLE(MyRightLabels, wxWindow) + EVT_PAINT( MyRightLabels::OnPaint) +END_EVENT_TABLE() + +MyRightLabels::MyRightLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) + : wxWindow( parent, id, pos, size ) +{ + m_owner = parent; +} + +void MyRightLabels::OnPaint( wxPaintEvent &event ) +{ + wxPaintDC dc(this); + m_owner->PrepareDC( dc ); + dc.DrawText( "Row 1", 5, 5 ); + dc.DrawText( "Row 2", 5, 30 ); + dc.DrawText( "Row 3", 5, 55 ); + dc.DrawText( "Row 4", 5, 80 ); + dc.DrawText( "Row 5", 5, 105 ); + dc.DrawText( "Row 6", 5, 130 ); } // MyCanvas @@ -148,16 +249,21 @@ BEGIN_EVENT_TABLE(MyCanvas, wxPanel) EVT_PAINT( MyCanvas::OnPaint) END_EVENT_TABLE() -MyCanvas::MyCanvas( wxScrolledWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size ) +MyCanvas::MyCanvas( wxScrolledWindow *parent, MyTopLabels *top, MyRightLabels *right, + wxWindowID id, const wxPoint &pos, const wxSize &size ) : wxPanel( parent, id, pos, size, wxSUNKEN_BORDER, "test canvas" ) { m_owner = parent; + m_topLabels = top; + m_rightLabels = right; (void)new wxButton( this, -1, "Hallo I", wxPoint(0,50), wxSize(100,25) ); (void)new wxButton( this, -1, "Hallo II", wxPoint(200,50), wxSize(100,25) ); + + (void)new wxTextCtrl( this, -1, "Text I", wxPoint(0,100), wxSize(100,25) ); + (void)new wxTextCtrl( this, -1, "Text II", wxPoint(200,100), wxSize(100,25) ); - SetBackgroundColour( *wxWHITE ); + SetBackgroundColour( "WHEAT" ); SetCursor( wxCursor( wxCURSOR_IBEAM ) ); } @@ -198,13 +304,13 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) if ((0+100-scroll_x > 0) && (0+25-scroll_y > 0) && (0-scroll_x < size_x) && (0-scroll_y < size_y)) { - // Has the region an screen been exposed? - if (IsExposed(0,0,100,25)) - { - wxLogMessage( "Redraw first cell" ); + // Has the region on screen been exposed? + if (IsExposed(0,0,100,25)) + { + wxLogMessage( "Redraw first cell" ); dc.DrawRectangle( 0, 0, 100, 25 ); - dc.DrawText( "First Cell", 5, 5 ); - } + dc.DrawText( "First Cell", 5, 5 ); + } } @@ -213,17 +319,23 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) if ((200+100-scroll_x > 0) && (0+25-scroll_y > 0) && (200-scroll_x < size_x) && (0-scroll_y < size_y)) { - // Has the region an screen been exposed? - if (IsExposed(200,0,100,25)) - { - wxLogMessage( "Redraw second cell" ); + // Has the region on screen been exposed? + if (IsExposed(200,0,100,25)) + { + wxLogMessage( "Redraw second cell" ); dc.DrawRectangle( 200, 0, 100, 25 ); - dc.DrawText( "Second Cell", 205, 5 ); - } + dc.DrawText( "Second Cell", 205, 5 ); + } } } +void MyCanvas::ScrollWindow( int dx, int dy, const wxRect *rect ) +{ + wxPanel::ScrollWindow( dx, dy, rect ); + m_topLabels->ScrollWindow( dx, 0, rect ); + m_rightLabels->ScrollWindow( 0, dy, rect ); +} // MyFrame @@ -254,7 +366,7 @@ MyFrame::MyFrame() int widths[] = { -1, 100 }; SetStatusWidths( 2, widths ); - m_scrolled = new MyScrolledWindow( this, -1, wxPoint(0,0), wxSize(100,100) ); + m_scrolled = new MyScrolledWindow( this, -1, wxDefaultPosition, wxSize(100,100) ); m_scrolled->SetScrollbars( 10, 10, 50, 100 ); m_log = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE ); @@ -262,7 +374,6 @@ MyFrame::MyFrame() delete old_log; wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); - topsizer->Add( m_scrolled, 1, wxEXPAND ); topsizer->Add( m_log, 0, wxEXPAND );