From 1c4e8f384d7c9a2e1f31e9602917f2d1318de01f Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 16 Oct 2006 09:30:01 +0000 Subject: [PATCH] CVS tags cleaning (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/gizmos/multicell.cpp | 3 +- include/wx/bmpcbox.h | 2 +- include/wx/cocoa/NSPanel.h | 2 +- include/wx/cocoa/NSWindow.h | 2 +- include/wx/cocoa/ObjcAssociate.h | 5 ++-- include/wx/cocoa/ObjcPose.h | 43 +++++++++++++-------------- include/wx/cocoa/bmpbuttn.h | 4 +-- include/wx/cocoa/dcscreen.h | 4 +-- include/wx/cocoa/frame.h | 6 ++-- include/wx/cocoa/radiobut.h | 4 +-- include/wx/cocoa/statbmp.h | 4 +-- include/wx/cocoa/statbox.h | 4 +-- include/wx/cocoa/statline.h | 4 +-- include/wx/cocoa/textctrl.h | 2 +- include/wx/generic/bmpcbox.h | 2 +- include/wx/mac/carbon/private/print.h | 4 +-- include/wx/mac/carbon/uma.h | 4 +-- include/wx/mac/classic/uma.h | 4 +-- include/wx/xrc/xh_bmpcbox.h | 2 +- src/cocoa/NSPanel.mm | 5 ++-- src/cocoa/NSWindow.mm | 5 ++-- src/cocoa/dialog.mm | 3 +- src/cocoa/frame.mm | 2 +- src/cocoa/main.cpp | 2 +- src/generic/bmpcboxg.cpp | 2 +- src/xrc/xh_bmpcbox.cpp | 2 +- 26 files changed, 60 insertions(+), 66 deletions(-) diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp index 05221dbe97..b9351e00de 100644 --- a/contrib/src/gizmos/multicell.cpp +++ b/contrib/src/gizmos/multicell.cpp @@ -4,7 +4,7 @@ // Author: Jonathan Bayer // Modified by: // Created: -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Jonathan Bayer // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -651,4 +651,3 @@ void wxMultiCellCanvas :: CalculateConstraints() } /*** End of File ***/ - diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h index 83b69a20c0..2de65ac579 100644 --- a/include/wx/bmpcbox.h +++ b/include/wx/bmpcbox.h @@ -5,7 +5,7 @@ // Modified by: // Created: Aug-31-2006 // Copyright: (c) Jaakko Salli -// RCS-ID: $Id: +// RCS-ID: $Id$ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/cocoa/NSPanel.h b/include/wx/cocoa/NSPanel.h index b107c54d93..043267a5fd 100644 --- a/include/wx/cocoa/NSPanel.h +++ b/include/wx/cocoa/NSPanel.h @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h index cc62cb2ad1..4b16e5f7f0 100644 --- a/include/wx/cocoa/NSWindow.h +++ b/include/wx/cocoa/NSWindow.h @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/cocoa/ObjcAssociate.h b/include/wx/cocoa/ObjcAssociate.h index 04d8756251..3ba2f5aa86 100644 --- a/include/wx/cocoa/ObjcAssociate.h +++ b/include/wx/cocoa/ObjcAssociate.h @@ -2,9 +2,9 @@ // Name: wx/cocoa/ObjcAssociate.h // Purpose: Associates an Objective-C class with a C++ class // Author: David Elliott -// Modified by: +// Modified by: // Created: 2002/12/03 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -76,4 +76,3 @@ void wxClass::Set##ObjcClass(WX_##ObjcClass cocoaObjcClass) \ } #endif // __WX_COCOA_OBJC_ASSOCIATE_H__ - diff --git a/include/wx/cocoa/ObjcPose.h b/include/wx/cocoa/ObjcPose.h index 6bfdf45f4b..fc43094672 100644 --- a/include/wx/cocoa/ObjcPose.h +++ b/include/wx/cocoa/ObjcPose.h @@ -2,9 +2,9 @@ // Name: wx/cocoa/ObjcPose.h // Purpose: Macros for initializing poseAs, among other things // Author: David Elliott -// Modified by: +// Modified by: // Created: 2002/12/03 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,31 +22,31 @@ Objective-C Poser class initialization class wxPoseAsInitializer { public: - wxPoseAsInitializer() - : m_next(sm_first) - { - sm_first = this; - } - virtual ~wxPoseAsInitializer() - { - sm_first = m_next; - } - static void InitializePosers() - { - while(sm_first) - { - delete sm_first; - } - }; + wxPoseAsInitializer() + : m_next(sm_first) + { + sm_first = this; + } + virtual ~wxPoseAsInitializer() + { + sm_first = m_next; + } + static void InitializePosers() + { + while(sm_first) + { + delete sm_first; + } + }; protected: - wxPoseAsInitializer *m_next; - static wxPoseAsInitializer *sm_first; + wxPoseAsInitializer *m_next; + static wxPoseAsInitializer *sm_first; }; class wxDummyForPoseAsInitializer { public: - wxDummyForPoseAsInitializer(void*) {} + wxDummyForPoseAsInitializer(void*) {} }; #define WX_IMPLEMENT_POSER(poser) \ @@ -65,4 +65,3 @@ wxDummyForPoseAsInitializer wxDummyPoseAsInitializerFor##poser(new wxPoseAsIniti #endif // __OBJC__ #endif // __WX_COCOA_PRIVATE_POSER_H__ - diff --git a/include/wx/cocoa/bmpbuttn.h b/include/wx/cocoa/bmpbuttn.h index 7df20950ea..b26b75a15e 100644 --- a/include/wx/cocoa/bmpbuttn.h +++ b/include/wx/cocoa/bmpbuttn.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_BMPBUTTN_H__ diff --git a/include/wx/cocoa/dcscreen.h b/include/wx/cocoa/dcscreen.h index 5b67bb8eca..8c330c5b6f 100644 --- a/include/wx/cocoa/dcscreen.h +++ b/include/wx/cocoa/dcscreen.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_DCSCREEN_H__ diff --git a/include/wx/cocoa/frame.h b/include/wx/cocoa/frame.h index 971e872e47..c7f886ade5 100644 --- a/include/wx/cocoa/frame.h +++ b/include/wx/cocoa/frame.h @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,7 +15,7 @@ class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxStatusBar; -class WXDLLEXPORT wxFrame: public wxFrameBase +class WXDLLEXPORT wxFrame: public wxFrameBase { DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxFrame) @@ -95,7 +95,7 @@ public: #if wxUSE_TOOLBAR // create main toolbar bycalling OnCreateToolBar() virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID winid = -1, + wxWindowID winid = wxID_ANY, const wxString& name = wxToolBarNameStr); // sets the main tool bar virtual void SetToolBar(wxToolBar *toolbar); diff --git a/include/wx/cocoa/radiobut.h b/include/wx/cocoa/radiobut.h index 5f4019e9ca..ccd502b474 100644 --- a/include/wx/cocoa/radiobut.h +++ b/include/wx/cocoa/radiobut.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/18 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_RADIOBUT_H__ diff --git a/include/wx/cocoa/statbmp.h b/include/wx/cocoa/statbmp.h index 31cb7b143d..df5866edcf 100644 --- a/include/wx/cocoa/statbmp.h +++ b/include/wx/cocoa/statbmp.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_STATBMP_H__ diff --git a/include/wx/cocoa/statbox.h b/include/wx/cocoa/statbox.h index 8764385c1e..e6aab49b45 100644 --- a/include/wx/cocoa/statbox.h +++ b/include/wx/cocoa/statbox.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/18 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_STATBOX_H__ diff --git a/include/wx/cocoa/statline.h b/include/wx/cocoa/statline.h index 9c69a65ea8..c470309216 100644 --- a/include/wx/cocoa/statline.h +++ b/include/wx/cocoa/statline.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/18 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_STATLINE_H__ diff --git a/include/wx/cocoa/textctrl.h b/include/wx/cocoa/textctrl.h index 79d49c74de..4adacb081e 100644 --- a/include/wx/cocoa/textctrl.h +++ b/include/wx/cocoa/textctrl.h @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h index e1c963d4f1..58f53627de 100644 --- a/include/wx/generic/bmpcbox.h +++ b/include/wx/generic/bmpcbox.h @@ -4,7 +4,7 @@ // Author: Jaakko Salli // Modified by: // Created: Aug-30-2006 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/mac/carbon/private/print.h b/include/wx/mac/carbon/private/print.h index 2fd53ff8b8..6e7e3ead45 100644 --- a/include/wx/mac/carbon/private/print.h +++ b/include/wx/mac/carbon/private/print.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: print.h +// Name: wx/mac/carbon/private/print.h // Purpose: private implementation for printing on MacOS // Author: Stefan Csomor // Modified by: // Created: 03/02/99 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/mac/carbon/uma.h b/include/wx/mac/carbon/uma.h index d51ab20ed2..6fc10b6120 100644 --- a/include/wx/mac/carbon/uma.h +++ b/include/wx/mac/carbon/uma.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: uma.h +// Name: wx/mac/carbon/uma.h // Purpose: Universal MacOS API // Author: Stefan Csomor // Modified by: // Created: 03/02/99 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/mac/classic/uma.h b/include/wx/mac/classic/uma.h index c862427f62..7eba95d42e 100644 --- a/include/wx/mac/classic/uma.h +++ b/include/wx/mac/classic/uma.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: uma.h +// Name: wx/mac/classic/uma.h // Purpose: Universal MacOS API // Author: Stefan Csomor // Modified by: // Created: 03/02/99 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/xrc/xh_bmpcbox.h b/include/wx/xrc/xh_bmpcbox.h index 5b5e0624ef..fe99d117e2 100644 --- a/include/wx/xrc/xh_bmpcbox.h +++ b/include/wx/xrc/xh_bmpcbox.h @@ -3,7 +3,7 @@ // Purpose: XML resource handler for wxBitmapComboBox // Author: Jaakko Salli // Created: Sep-10-2006 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2006 Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/cocoa/NSPanel.mm b/src/cocoa/NSPanel.mm index 9dbb83c522..30723dd0ab 100644 --- a/src/cocoa/NSPanel.mm +++ b/src/cocoa/NSPanel.mm @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/NSPanel.mm +// Name: src/cocoa/NSPanel.mm // Purpose: wxCocoaNSPanel // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// @@ -30,4 +30,3 @@ // globals // ---------------------------------------------------------------------------- WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSPanel) - diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm index ebb81b92b0..792f701b19 100644 --- a/src/cocoa/NSWindow.mm +++ b/src/cocoa/NSWindow.mm @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/NSWindow.mm +// Name: src/cocoa/NSWindow.mm // Purpose: wxCocoaNSWindow // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// @@ -219,4 +219,3 @@ WX_IMPLEMENT_POSER(wxPoserNSWindow); } @end // implementation wxPoserNSWindow - diff --git a/src/cocoa/dialog.mm b/src/cocoa/dialog.mm index e51faffa37..f8d3faeafb 100644 --- a/src/cocoa/dialog.mm +++ b/src/cocoa/dialog.mm @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2002/12/15 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: 2002 David Elliott // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// @@ -169,4 +169,3 @@ void wxDialog::EndModal(int retCode) SetReturnCode(retCode); Show(false); } - diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm index fd61328157..4a3569d81e 100644 --- a/src/cocoa/frame.mm +++ b/src/cocoa/frame.mm @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/cocoa/main.cpp b/src/cocoa/main.cpp index 31754e2de8..b84c2a5a91 100644 --- a/src/cocoa/main.cpp +++ b/src/cocoa/main.cpp @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2002/11/11 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// diff --git a/src/generic/bmpcboxg.cpp b/src/generic/bmpcboxg.cpp index bac36de5a2..e74fabd3c1 100644 --- a/src/generic/bmpcboxg.cpp +++ b/src/generic/bmpcboxg.cpp @@ -4,7 +4,7 @@ // Author: Jaakko Salli // Modified by: // Created: Aug-31-2006 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2005 Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/src/xrc/xh_bmpcbox.cpp b/src/xrc/xh_bmpcbox.cpp index 9c6e5ff894..6fc2840bd6 100644 --- a/src/xrc/xh_bmpcbox.cpp +++ b/src/xrc/xh_bmpcbox.cpp @@ -3,7 +3,7 @@ // Purpose: XRC resource for wxBitmapComboBox // Author: Jaakko Salli // Created: Sep-10-2006 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2006 Jaakko Salli // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -- 2.45.2