diff --git a/Makefile.in b/Makefile.in index 049f206a8b..f356e0f9c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4,7 +4,7 @@ # Author: Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee # Created: 1993 # Version: $Id$ -# Copyright:(c) 1993, AIAI, University of Edinburgh, +# Copyright:, # Copyright:(c) 1999, Vadim Zeitlin # Copyright:(c) 1999, Robert Roebling # Copyright:(c) 2001, Ron Lee diff --git a/demos/makefile.b32 b/demos/makefile.b32 index 74a83ee628..089b13ec24 100644 --- a/demos/makefile.b32 +++ b/demos/makefile.b32 @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/demos/makefile.vc b/demos/makefile.vc index aa7d8e1e1b..90fb158b0e 100644 --- a/demos/makefile.vc +++ b/demos/makefile.vc @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/distrib/msw/contrib.rsp b/distrib/msw/contrib.rsp index 55e3f264bb..1a9cee95b4 100644 --- a/distrib/msw/contrib.rsp +++ b/distrib/msw/contrib.rsp @@ -1,32 +1,6 @@ contrib/configure.in contrib/configure -contrib/samples/canvas/simple/*.cpp -contrib/samples/canvas/simple/*.h -contrib/samples/canvas/simple/*.def -contrib/samples/canvas/simple/makefile* -contrib/samples/canvas/simple/*.xbm -contrib/samples/canvas/simple/*.xpm -contrib/samples/canvas/simple/*.txt -contrib/samples/canvas/simple/*.ico -contrib/samples/canvas/simple/*.bmp -contrib/samples/canvas/simple/*.rc -contrib/samples/canvas/simple/SimpleVC.dsp -contrib/samples/canvas/simple/SimpleVC.dsw - -contrib/samples/canvas/test/*.cpp -contrib/samples/canvas/test/*.h -contrib/samples/canvas/test/*.def -contrib/samples/canvas/test/makefile* -contrib/samples/canvas/test/*.xbm -contrib/samples/canvas/test/*.xpm -contrib/samples/canvas/test/*.txt -contrib/samples/canvas/test/*.ico -contrib/samples/canvas/test/*.bmp -contrib/samples/canvas/test/*.rc -contrib/samples/canvas/test/TestVC.dsp -contrib/samples/canvas/test/TestVC.dsw - contrib/samples/plot/*.cpp contrib/samples/plot/*.h contrib/samples/plot/*.def @@ -211,13 +185,6 @@ contrib/samples/fl/fl_sample3/*.rc contrib/samples/fl/fl_sample3/fl_demo.dsp contrib/samples/fl/fl_sample3/fl_demo.dsw -contrib/src/canvas/*.cpp -contrib/src/canvas/*.h -contrib/src/canvas/make* -contrib/src/canvas/CanvasVC.dsp -contrib/src/canvas/CanvasVC.dsw -contrib/include/wx/canvas/*.h - contrib/src/plot/*.cpp contrib/src/plot/*.h contrib/src/plot/make* diff --git a/distrib/msw/cw.rsp b/distrib/msw/cw.rsp index 82869a191b..7c167d5597 100644 --- a/distrib/msw/cw.rsp +++ b/distrib/msw/cw.rsp @@ -70,6 +70,7 @@ samples/rotate/*W7.xml samples/sashtest/*W7.xml samples/scroll/*W7.xml samples/scrollsub/*W7.xml +samples/shaped/*W7.xml samples/sockets/*W7.xml samples/splitter/*W7.xml samples/statbar/*W7.xml diff --git a/distrib/msw/cw_mac.rsp b/distrib/msw/cw_mac.rsp index f1140ac369..b345bc36f2 100644 --- a/distrib/msw/cw_mac.rsp +++ b/distrib/msw/cw_mac.rsp @@ -127,6 +127,8 @@ samples/scroll/*M?.xml samples/scroll/*.mcp samples/scrollsub/*M?.xml samples/scrollsub/*.mcp +samples/shaped/*M?.xml +samples/shaped/*.mcp samples/sockets/*M?.xml samples/sockets/*.mcp samples/splitter/*M?.xml diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 1b179cf4ef..206172a1c3 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -981,6 +981,19 @@ samples/scrollsub/*.ico samples/scrollsub/*.txt samples/scrollsub/*.pro +samples/shaped/*.cpp +samples/shaped/*.h +samples/shaped/makefile* +samples/shaped/*.rc +samples/shaped/*.def +samples/shaped/*.bmp +samples/shaped/*.xpm +samples/shaped/*.xbm +samples/shaped/*.png +samples/shaped/*.ico +samples/shaped/*.txt +samples/shaped/*.pro + samples/splitter/*.cpp samples/splitter/*.h samples/splitter/*.def diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index cee12e6042..db9ac53c12 100644 --- a/distrib/msw/makefile.rsp +++ b/distrib/msw/makefile.rsp @@ -58,6 +58,7 @@ samples/rotate/Makefile.in samples/sashtest/Makefile.in samples/scroll/Makefile.in samples/scrollsub/Makefile.in +samples/shaped/Makefile.in samples/splitter/Makefile.in samples/statbar/Makefile.in samples/text/Makefile.in diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp index 71a22b26c3..6e3095deb6 100644 --- a/distrib/msw/vc.rsp +++ b/distrib/msw/vc.rsp @@ -209,6 +209,9 @@ samples/scroll/scroll.dsw samples/scrollsub/scrollsub.dsp samples/scrollsub/scrollsub.dsw +samples/shaped/shaped.dsp +samples/shaped/shaped.dsw + samples/sockets/client.dsp samples/sockets/server.dsp samples/sockets/client.dsw diff --git a/docs/html/index.htm b/docs/html/index.htm index 808bfe3bb2..2e1d6ebfe7 100644 --- a/docs/html/index.htm +++ b/docs/html/index.htm @@ -342,8 +342,7 @@ dynamically.
  • event: demonstrates event handling.
  • exec: demonstrates wxExecute.
  • font: tests fonts, font enumerator, font encodings. -
  • grid: demonstrates the wxGrid class. This demo should work -when the old grid implementation is compiled into wxWindows, and also with the new implementation. +
  • grid: demonstrates the wxGrid class. Please see newgrid below for a full demo of the new implementation's capabilities.
  • help: shows how to use wxHelpController.
  • html: a number of demos for the wxHTML class library, used inside @@ -379,7 +378,6 @@ small a wxWindows application as you can get.
  • mobile: mini applications for embedded platforms.
  • nativdlg: shows how wxWindows can load a standard Windows dialog resource, translating the controls into wxWindows controls (Windows only). -
  • newgrid: demonstrates the new wxGrid implementation, by Michael Bedward and others.
  • notebook: shows the wxNotebook (tabbed window) control.
  • oleauto: a little OLE automation controller (Windows only; requires Excel to be present). diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp index 63b821bd7b..70fb548e14 100644 --- a/src/common/wxexpr.cpp +++ b/src/common/wxexpr.cpp @@ -196,12 +196,12 @@ wxExpr::wxExpr(wxList *the_list) wxExpr *listExpr = new wxExpr(wxExprList); - wxNode *node = the_list->First(); + wxNode *node = the_list->GetFirst(); while (node) { - wxExpr *expr = (wxExpr *)node->Data(); + wxExpr *expr = (wxExpr *)node->GetData(); listExpr->Append(expr); - node = node->Next(); + node = node->GetNext(); } Append(listExpr); @@ -605,13 +605,13 @@ void wxExpr::AddAttributeValueStringList(const wxString& attribute, wxList *stri // First make a list of wxExpr strings wxExpr *listExpr = new wxExpr(wxExprList); - wxNode *node = string_list->First(); + wxNode *node = string_list->GetFirst(); while (node) { wxChar *string = (wxChar*)node->GetData(); wxExpr *expr = new wxExpr(wxExprString, wxString(string)); listExpr->Append(expr); - node = node->Next(); + node = node->GetNext(); } // Now make an (=, Att, Value) triple @@ -907,7 +907,7 @@ wxExprDatabase::~wxExprDatabase(void) void wxExprDatabase::BeginFind(void) // Initialise a search { - position = First(); + position = GetFirst(); } wxExpr *wxExprDatabase::FindClause(long id) // Find a term based on an integer id attribute @@ -916,7 +916,7 @@ wxExpr *wxExprDatabase::FindClause(long id) // Find a term based on an integer wxExpr *found = NULL; while (position && !found) { - wxExpr *term = (wxExpr *)position->Data(); + wxExpr *term = (wxExpr *)position->GetData(); if (term->Type() == wxExprList) { @@ -924,7 +924,7 @@ wxExpr *wxExprDatabase::FindClause(long id) // Find a term based on an integer if (value->Type() == wxExprInteger && value->IntegerValue() == id) found = term; } - position = position->Next(); + position = position->GetNext(); } return found; } @@ -935,7 +935,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, const wxString& val) wxExpr *found = NULL; while (position && !found) { - wxExpr *term = (wxExpr *)position->Data(); + wxExpr *term = (wxExpr *)position->GetData(); if (term->Type() == wxExprList) { @@ -944,7 +944,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, const wxString& val) (value->Type() == wxExprString && value->StringValue() == val)) found = term; } - position = position->Next(); + position = position->GetNext(); } return found; } @@ -954,7 +954,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, long val) wxExpr *found = NULL; while (position && !found) { - wxExpr *term = (wxExpr *)position->Data(); + wxExpr *term = (wxExpr *)position->GetData(); if (term->Type() == wxExprList) { @@ -962,7 +962,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, long val) if ((value->Type() == wxExprInteger) && (value->IntegerValue() == val)) found = term; } - position = position->Next(); + position = position->GetNext(); } return found; } @@ -972,7 +972,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, double val) wxExpr *found = NULL; while (position && !found) { - wxExpr *term = (wxExpr *)position->Data(); + wxExpr *term = (wxExpr *)position->GetData(); if (term->Type() == wxExprList) { @@ -980,7 +980,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, double val) if ((value->Type() == wxExprReal) && (value->RealValue() == val)) found = term; } - position = position->Next(); + position = position->GetNext(); } return found; } @@ -990,14 +990,14 @@ wxExpr *wxExprDatabase::FindClauseByFunctor(const wxString& functor) wxExpr *found = NULL; while (position && !found) { - wxExpr *term = (wxExpr *)position->Data(); + wxExpr *term = (wxExpr *)position->GetData(); if (term->Type() == wxExprList) { if (term->Functor() == functor) found = term; } - position = position->Next(); + position = position->GetNext(); } return found; } @@ -1048,13 +1048,13 @@ wxExpr *wxExprDatabase::HashFind(const wxString& functor, const wxString& value) void wxExprDatabase::ClearDatabase(void) { noErrors = 0; - wxNode *node = First(); + wxNode *node = GetFirst(); while (node) { - wxExpr *expr = (wxExpr *)node->Data(); + wxExpr *expr = (wxExpr *)node->GetData(); delete expr; delete node; - node = First(); + node = GetFirst(); } if (hash_table) @@ -1110,12 +1110,12 @@ bool wxExprDatabase::Write(const wxString& fileName) bool wxExprDatabase::Write(FILE *stream) { noErrors = 0; - wxNode *node = First(); + wxNode *node = GetFirst(); while (node) { - wxExpr *expr = (wxExpr *)node->Data(); + wxExpr *expr = (wxExpr *)node->GetData(); expr->WriteClause(stream); - node = node->Next(); + node = node->GetNext(); } return (noErrors == 0); } diff --git a/src/jpeg/MAKEFILE.VA b/src/jpeg/MAKEFILE.VA index 803a38b09e..72b5cbc8af 100644 --- a/src/jpeg/MAKEFILE.VA +++ b/src/jpeg/MAKEFILE.VA @@ -3,7 +3,7 @@ # Author: David Webster # Created: 1999 # Updated: -# Copyright: c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/src/make.env.in b/src/make.env.in index 036ee92a96..d72dc2c558 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -3,7 +3,7 @@ # Author: Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee # Created: 1993 # Updated: 2001 -# Copyright:(c) 1993, AIAI, University of Edinburgh, +# Copyright:, # Copyright:(c) 1999, Vadim Zeitlin # Copyright:(c) 1999, Robert Roebling # Copyright:(c) 2001, Ron Lee diff --git a/src/makefile.bcc b/src/makefile.bcc index b85f2aeac2..71a35b0cad 100644 --- a/src/makefile.bcc +++ b/src/makefile.bcc @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/src/makefile.dos b/src/makefile.dos index 4e5afd4ce7..dbc9928c96 100644 --- a/src/makefile.dos +++ b/src/makefile.dos @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/src/makemsc.env b/src/makemsc.env index 70d41d4cf5..b896b1852f 100644 --- a/src/makemsc.env +++ b/src/makemsc.env @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index e36e35dfc8..191d5c3396 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -2186,10 +2186,10 @@ wxDCCacheEntry::~wxDCCacheEntry() wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h) { int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL); - wxNode* node = sm_bitmapCache.First(); + wxNode* node = sm_bitmapCache.GetFirst(); while (node) { - wxDCCacheEntry* entry = (wxDCCacheEntry*) node->Data(); + wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData(); if (entry->m_depth == depth) { @@ -2207,7 +2207,7 @@ wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h) return entry; } - node = node->Next(); + node = node->GetNext(); } WXHBITMAP hBitmap = (WXHBITMAP) ::CreateCompatibleBitmap((HDC) dc, w, h); if ( !hBitmap) @@ -2222,10 +2222,10 @@ wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h) wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc) { int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL); - wxNode* node = sm_dcCache.First(); + wxNode* node = sm_dcCache.GetFirst(); while (node) { - wxDCCacheEntry* entry = (wxDCCacheEntry*) node->Data(); + wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData(); // Don't return the same one as we already have if (!notThis || (notThis != entry)) @@ -2236,7 +2236,7 @@ wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc) } } - node = node->Next(); + node = node->GetNext(); } WXHDC hDC = (WXHDC) ::CreateCompatibleDC((HDC) dc); if ( !hDC) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index c56e5a1b33..e7a470453c 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -8,7 +8,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright:(c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 06fcb7e6ba..3fd9b26240 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -6,7 +6,7 @@ # Author: Julian Smart, Robert Roebling, Vadim Zeitlin # Created: 1993 # Updated: 1999 -# Copyright:(c) 1993, AIAI, University of Edinburgh, +# Copyright:, # Copyright:(c) 1999, Vadim Zeitlin # Copyright:(c) 1999, Robert Roebling # diff --git a/src/png/MAKEFILE.VA b/src/png/MAKEFILE.VA index d51c88a25b..35fd3a9398 100644 --- a/src/png/MAKEFILE.VA +++ b/src/png/MAKEFILE.VA @@ -3,7 +3,7 @@ # Author: David Webster # Created: 1999 # Updated: -# Copyright: c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/src/png/makefile.dos b/src/png/makefile.dos index 41f1712e65..ad3425896d 100644 --- a/src/png/makefile.dos +++ b/src/png/makefile.dos @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/src/zlib/MAKEFILE.VA b/src/zlib/MAKEFILE.VA index 0a5251c2e3..f6508d8cff 100644 --- a/src/zlib/MAKEFILE.VA +++ b/src/zlib/MAKEFILE.VA @@ -3,7 +3,7 @@ # Author: David Webster # Created: 1999 # Updated: -# Copyright: c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/utils/dialoged/src/makefile.b32 b/utils/dialoged/src/makefile.b32 index 39c14b5720..d41b6d3de9 100644 --- a/utils/dialoged/src/makefile.b32 +++ b/utils/dialoged/src/makefile.b32 @@ -3,7 +3,7 @@ # Author: Patrick Halke # Created: 1995 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/utils/dialoged/src/makefile.dos b/utils/dialoged/src/makefile.dos index 04fa91936a..054025947d 100644 --- a/utils/dialoged/src/makefile.dos +++ b/utils/dialoged/src/makefile.dos @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1995 # Updated: -# Copyright: (c) 1995, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/utils/makefile.vc b/utils/makefile.vc index ece8395fe1..1e13159387 100644 --- a/utils/makefile.vc +++ b/utils/makefile.vc @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/utils/nplugin/makefile.vc b/utils/nplugin/makefile.vc index a35290b4af..c5ebbfe489 100644 --- a/utils/nplugin/makefile.vc +++ b/utils/nplugin/makefile.vc @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/utils/nplugin/src/makefile.vc b/utils/nplugin/src/makefile.vc index 8493ca3723..5d0c12d39a 100644 --- a/utils/nplugin/src/makefile.vc +++ b/utils/nplugin/src/makefile.vc @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/utils/projgen/makefile.vc b/utils/projgen/makefile.vc index 5a8ef5201c..681f529efe 100644 --- a/utils/projgen/makefile.vc +++ b/utils/projgen/makefile.vc @@ -3,7 +3,7 @@ # Author: Julian Smart # Created: 1993 # Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" # diff --git a/utils/tex2rtf/src/makefile.vc b/utils/tex2rtf/src/makefile.vc index 5732870d0f..10baac1790 100644 --- a/utils/tex2rtf/src/makefile.vc +++ b/utils/tex2rtf/src/makefile.vc @@ -2,7 +2,7 @@ # File: makefile.nt # Author: Julian Smart # Created: 1993 -# Copyright: (c) 1993, AIAI, University of Edinburgh +# Copyright: # # "%W% %G%" #