Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

[wxWidgets.git] / include / wx / mgl / dcscreen.h

diff --git a/include/wx/mgl/dcscreen.h b/include/wx/mgl/dcscreen.h
index c5ae9860009b9ed032009bf3c346616f45e77a94..08c5e7bbcae1f8558d5badc55b6eed4f7ee24128 100644 (file)
--- a/include/wx/mgl/dcscreen.h
+++ b/include/wx/mgl/dcscreen.h
@@ -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
 /////////////////////////////////////////////////////////////////////////////