From c41c20a566cb7558661a68c0ed6712a84982093f Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 15 Feb 2002 01:07:52 +0000 Subject: [PATCH] copyright update git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mgl/app.cpp | 2 +- src/mgl/bitmap.cpp | 2 +- src/mgl/brush.cpp | 2 +- src/mgl/cursor.cpp | 9 ++++----- src/mgl/dc.cpp | 2 +- src/mgl/dcclient.cpp | 2 +- src/mgl/dcscreen.cpp | 2 +- src/mgl/dirmgl.cpp | 2 +- src/mgl/evtloop.cpp | 7 ++++++- src/mgl/font.cpp | 2 +- src/mgl/fontenum.cpp | 2 +- src/mgl/fontutil.cpp | 2 +- src/mgl/icon.cpp | 2 +- src/mgl/palette.cpp | 2 +- src/mgl/pen.cpp | 2 +- src/mgl/region.cpp | 2 +- src/mgl/settings.cpp | 2 +- src/mgl/timer.cpp | 2 +- src/mgl/toplevel.cpp | 2 +- src/mgl/utils.cpp | 2 +- 20 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp index f4790cbc7a..3eea2d9844 100644 --- a/src/mgl/app.cpp +++ b/src/mgl/app.cpp @@ -3,7 +3,7 @@ // Author: Vaclav Slavik // based on GTK and MSW implementations // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp index 039406b2f4..8ab1f1f99e 100644 --- a/src/mgl/bitmap.cpp +++ b/src/mgl/bitmap.cpp @@ -2,7 +2,7 @@ // Name: bitmap.cpp // Author: Vaclav Slavik // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp index 92ba164307..437a499948 100644 --- a/src/mgl/brush.cpp +++ b/src/mgl/brush.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp index 94df70a5c2..0abbaccedb 100644 --- a/src/mgl/cursor.cpp +++ b/src/mgl/cursor.cpp @@ -69,6 +69,9 @@ wxCursor::wxCursor() wxCursor::wxCursor(int cursorId) { + if ( !gs_cursorsHash ) + gs_cursorsHash = new wxCursorsHash; + if ( gs_cursorsHash->find(cursorId) != gs_cursorsHash->end() ) { wxLogTrace(_T("mglcursor"), _T("cursor id %i fetched from cache"), cursorId); @@ -286,11 +289,7 @@ bool wxIsBusy() class wxCursorModule : public wxModule { public: - virtual bool OnInit() - { - gs_cursorsHash = new wxCursorsHash; - return TRUE; - } + virtual bool OnInit() { return TRUE; } virtual void OnExit() { diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp index 702f27e2d7..aab6d8f990 100644 --- a/src/mgl/dc.cpp +++ b/src/mgl/dc.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Created: 2001/03/09 // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/dcclient.cpp b/src/mgl/dcclient.cpp index 1bf1ba57f3..2afdbad279 100644 --- a/src/mgl/dcclient.cpp +++ b/src/mgl/dcclient.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Vaclav Slavik // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/dcscreen.cpp b/src/mgl/dcscreen.cpp index 575d656dba..e3f77babb0 100644 --- a/src/mgl/dcscreen.cpp +++ b/src/mgl/dcscreen.cpp @@ -2,7 +2,7 @@ // Name: dcscreen.cpp // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp index 0482918fb9..f2df7e706e 100644 --- a/src/mgl/dirmgl.cpp +++ b/src/mgl/dirmgl.cpp @@ -6,7 +6,7 @@ // Created: 2001/12/09 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp index ddf15a25b3..22f4d61355 100644 --- a/src/mgl/evtloop.cpp +++ b/src/mgl/evtloop.cpp @@ -3,7 +3,7 @@ // Purpose: implements wxEventLoop for MGL // Author: Vaclav Slavik // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // License: wxWindows license /////////////////////////////////////////////////////////////////////////////// @@ -178,6 +178,11 @@ void wxEventLoop::Exit(int rc) bool wxEventLoop::Pending() const { + // update the display here, so that wxYield refreshes display and + // changes take effect immediately, not after emptying events queue: + MGL_wmUpdateDC(g_winMng); + + // is there an event in the queue? event_t evt; return EVT_peekNext(&evt, EVT_EVERYEVT); } diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp index b6d93684c1..e3ac9a29d2 100644 --- a/src/mgl/font.cpp +++ b/src/mgl/font.cpp @@ -2,7 +2,7 @@ // Name: font.cpp // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp index 316d2c5d54..46386dfd99 100644 --- a/src/mgl/fontenum.cpp +++ b/src/mgl/fontenum.cpp @@ -3,7 +3,7 @@ // Purpose: wxFontEnumerator class for MGL // Author: Vaclav Slavik // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/fontutil.cpp b/src/mgl/fontutil.cpp index 85b76d080a..f73a6fb862 100644 --- a/src/mgl/fontutil.cpp +++ b/src/mgl/fontutil.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Created: 2001/04/29 // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/icon.cpp b/src/mgl/icon.cpp index becb75fd85..bd54a7001d 100644 --- a/src/mgl/icon.cpp +++ b/src/mgl/icon.cpp @@ -2,7 +2,7 @@ // Name: icon.cpp // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/palette.cpp b/src/mgl/palette.cpp index 0253f5a0ff..b851f799a8 100644 --- a/src/mgl/palette.cpp +++ b/src/mgl/palette.cpp @@ -3,7 +3,7 @@ // Author: Vaclav Slavik // Created: 2001/03/11 // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index d7a3cb142a..dc2e476e82 100644 --- a/src/mgl/pen.cpp +++ b/src/mgl/pen.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/region.cpp b/src/mgl/region.cpp index a3f2b9b0c6..3ec5b7d751 100644 --- a/src/mgl/region.cpp +++ b/src/mgl/region.cpp @@ -3,7 +3,7 @@ // Purpose: Region handling for wxWindows/MGL // Author: Vaclav Slavik // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp index d3b4828427..355db0d4f6 100644 --- a/src/mgl/settings.cpp +++ b/src/mgl/settings.cpp @@ -2,7 +2,7 @@ // Name: settings.h // Author: Vaclav Slavik, Robert Roebling // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/timer.cpp b/src/mgl/timer.cpp index 5452e675d0..1ab1a19087 100644 --- a/src/mgl/timer.cpp +++ b/src/mgl/timer.cpp @@ -3,7 +3,7 @@ // Purpose: wxTimer implementation // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp index c70e6f3865..2d23ae16d3 100644 --- a/src/mgl/toplevel.cpp +++ b/src/mgl/toplevel.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp index 78693a2a69..2408e47e2f 100644 --- a/src/mgl/utils.cpp +++ b/src/mgl/utils.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -- 2.45.2