From 80fdcdb90ef779185492dab676d461fc34933312 Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Sun, 20 Mar 2011 00:14:35 +0000
Subject: [PATCH] No changes, synchronised source names that appear commented
at the top of files with the actual path to the files.
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/msvc/wx/setup.h | 2 +-
include/wx/aui/tabmdi.h | 2 +-
include/wx/bmpbuttn.h | 2 +-
include/wx/choicdlg.h | 2 +-
include/wx/cocoa/app.h | 2 +-
include/wx/cocoa/clipbrd.h | 2 +-
include/wx/cocoa/font.h | 2 +-
include/wx/cocoa/msgdlg.h | 2 +-
include/wx/cocoa/objc/NSSlider.h | 2 +-
include/wx/cocoa/private/fontfactory.h | 2 +-
include/wx/cocoa/private/scrollview.h | 2 +-
include/wx/cocoa/sound.h | 2 +-
include/wx/cocoa/tooltip.h | 2 +-
include/wx/confbase.h | 2 +-
include/wx/config.h | 2 +-
include/wx/datstrm.h | 2 +-
include/wx/dcgraph.h | 2 +-
include/wx/dlist.h | 2 +-
include/wx/dynload.h | 2 +-
include/wx/file.h | 2 +-
include/wx/fs_inet.h | 2 +-
include/wx/fs_mem.h | 2 +-
include/wx/gbsizer.h | 2 +-
include/wx/generic/calctrlg.h | 2 +-
include/wx/generic/caret.h | 2 +-
include/wx/generic/datectrl.h | 2 +-
include/wx/generic/dcpsg.h | 2 +-
include/wx/generic/dirctrlg.h | 2 +-
include/wx/generic/fdrepdlg.h | 2 +-
include/wx/generic/gridctrl.h | 2 +-
include/wx/generic/laywin.h | 2 +-
include/wx/generic/notebook.h | 2 +-
include/wx/generic/printps.h | 2 +-
include/wx/generic/private/listctrl.h | 2 +-
include/wx/generic/prntdlgg.h | 2 +-
include/wx/generic/progdlgg.h | 2 +-
include/wx/generic/sashwin.h | 2 +-
include/wx/generic/splash.h | 2 +-
include/wx/generic/splitter.h | 2 +-
include/wx/generic/statline.h | 2 +-
include/wx/generic/tabg.h | 2 +-
include/wx/generic/textdlgg.h | 2 +-
include/wx/gtk/assertdlg_gtk.h | 2 +-
include/wx/gtk/clipbrd.h | 2 +-
include/wx/gtk/control.h | 2 +-
include/wx/gtk/cursor.h | 2 +-
include/wx/gtk/dataform.h | 2 +-
include/wx/gtk/dataobj.h | 2 +-
include/wx/gtk/dataobj2.h | 2 +-
include/wx/gtk/dcclient.h | 2 +-
include/wx/gtk/dcmemory.h | 2 +-
include/wx/gtk/dcscreen.h | 2 +-
include/wx/gtk/dialog.h | 2 +-
include/wx/gtk/dirdlg.h | 2 +-
include/wx/gtk/dnd.h | 2 +-
include/wx/gtk/filedlg.h | 2 +-
include/wx/gtk/font.h | 2 +-
include/wx/gtk/fontdlg.h | 2 +-
include/wx/gtk/glcanvas.h | 2 +-
include/wx/gtk/menuitem.h | 2 +-
include/wx/gtk/minifram.h | 2 +-
include/wx/gtk/notebook.h | 2 +-
include/wx/gtk/popupwin.h | 2 +-
include/wx/gtk/private/messagetype.h | 2 +-
include/wx/gtk/private/mnemonics.h | 2 +-
include/wx/gtk/private/timer.h | 2 +-
include/wx/gtk/private/win_gtk.h | 2 +-
include/wx/gtk/scrolbar.h | 2 +-
include/wx/gtk/spinctrl.h | 2 +-
include/wx/gtk/statbox.h | 2 +-
include/wx/gtk/tooltip.h | 2 +-
include/wx/gtk/treeentry_gtk.h | 2 +-
include/wx/gtk1/clipbrd.h | 2 +-
include/wx/gtk1/fontdlg.h | 2 +-
include/wx/gtk1/glcanvas.h | 2 +-
include/wx/gtk1/private/mnemonics.h | 2 +-
include/wx/gtk1/statbox.h | 2 +-
include/wx/help.h | 2 +-
include/wx/helpbase.h | 2 +-
include/wx/helphtml.h | 2 +-
include/wx/helpwin.h | 2 +-
include/wx/html/forcelnk.h | 2 +-
include/wx/html/helpctrl.h | 2 +-
include/wx/html/helpdata.h | 2 +-
include/wx/html/helpfrm.h | 2 +-
include/wx/html/htmlcell.h | 2 +-
include/wx/html/htmldefs.h | 2 +-
include/wx/html/htmlfilt.h | 2 +-
include/wx/html/htmlpars.h | 2 +-
include/wx/html/htmlproc.h | 2 +-
include/wx/html/htmltag.h | 2 +-
include/wx/html/htmlwin.h | 2 +-
include/wx/html/htmprint.h | 2 +-
include/wx/html/m_templ.h | 2 +-
include/wx/html/winpars.h | 2 +-
include/wx/imagiff.h | 2 +-
include/wx/imagjpeg.h | 2 +-
include/wx/imagpcx.h | 2 +-
include/wx/imagpng.h | 2 +-
include/wx/imagpnm.h | 2 +-
include/wx/imagtiff.h | 2 +-
include/wx/ipcbase.h | 2 +-
include/wx/joystick.h | 2 +-
include/wx/listimpl.cpp | 2 +-
include/wx/mgl/bitmap.h | 2 +-
include/wx/mgl/clipbrd.h | 2 +-
include/wx/mgl/cursor.h | 2 +-
include/wx/mgl/dc.h | 2 +-
include/wx/mgl/dcclient.h | 2 +-
include/wx/mgl/dcmemory.h | 2 +-
include/wx/mgl/dcscreen.h | 2 +-
include/wx/mgl/font.h | 2 +-
include/wx/mgl/private.h | 2 +-
include/wx/motif/scrolbar.h | 2 +-
include/wx/msgdlg.h | 2 +-
include/wx/msgqueue.h | 2 +-
include/wx/msw/app.h | 2 +-
include/wx/msw/caret.h | 2 +-
include/wx/msw/dcclient.h | 2 +-
include/wx/msw/dde.h | 2 +-
include/wx/msw/debughlp.h | 2 +-
include/wx/msw/helpchm.h | 2 +-
include/wx/msw/helpwin.h | 2 +-
include/wx/msw/joystick.h | 2 +-
include/wx/msw/menuitem.h | 2 +-
include/wx/msw/microwin.h | 2 +-
include/wx/msw/ole/access.h | 2 +-
include/wx/msw/ole/automtn.h | 2 +-
include/wx/msw/ole/dataform.h | 2 +-
include/wx/msw/ole/dataobj.h | 2 +-
include/wx/msw/ole/dropsrc.h | 2 +-
include/wx/msw/ole/droptgt.h | 2 +-
include/wx/msw/ole/oleutils.h | 2 +-
include/wx/msw/ole/uuid.h | 2 +-
include/wx/msw/printdlg.h | 2 +-
include/wx/msw/printwin.h | 2 +-
include/wx/msw/private/button.h | 2 +-
include/wx/msw/private/datecontrols.h | 2 +-
include/wx/msw/private/dc.h | 2 +-
include/wx/msw/private/sockmsw.h | 2 +-
include/wx/msw/radiobut.h | 2 +-
include/wx/msw/regconf.h | 2 +-
include/wx/msw/scrolbar.h | 2 +-
include/wx/msw/spinbutt.h | 2 +-
include/wx/msw/spinctrl.h | 2 +-
include/wx/msw/statline.h | 2 +-
include/wx/msw/statusbar.h | 2 +-
include/wx/msw/tls.h | 2 +-
include/wx/msw/toolbar.h | 2 +-
include/wx/msw/wince/missing.h | 2 +-
include/wx/msw/wince/smartphone.rc | 2 +-
include/wx/msw/wrapwin.h | 2 +-
include/wx/os2/accel.h | 2 +-
include/wx/os2/app.h | 2 +-
include/wx/os2/bmpbuttn.h | 2 +-
include/wx/os2/button.h | 2 +-
include/wx/os2/checkbox.h | 2 +-
include/wx/os2/clipbrd.h | 2 +-
include/wx/os2/combobox.h | 2 +-
include/wx/os2/cursor.h | 2 +-
include/wx/os2/dataform.h | 2 +-
include/wx/os2/dc.h | 2 +-
include/wx/os2/dcclient.h | 2 +-
include/wx/os2/dcmemory.h | 2 +-
include/wx/os2/dcscreen.h | 2 +-
include/wx/os2/dirdlg.h | 2 +-
include/wx/os2/dnd.h | 2 +-
include/wx/os2/filedlg.h | 2 +-
include/wx/os2/frame.h | 2 +-
include/wx/os2/icon.h | 2 +-
include/wx/os2/iniconf.h | 2 +-
include/wx/os2/joystick.h | 2 +-
include/wx/os2/mdi.h | 2 +-
include/wx/os2/menu.h | 2 +-
include/wx/os2/metafile.h | 2 +-
include/wx/os2/minifram.h | 2 +-
include/wx/os2/notebook.h | 2 +-
include/wx/os2/print.h | 2 +-
include/wx/os2/printos2.h | 2 +-
include/wx/os2/radiobut.h | 2 +-
include/wx/os2/scrolbar.h | 2 +-
include/wx/os2/slider.h | 2 +-
include/wx/os2/sound.h | 2 +-
include/wx/os2/spinbutt.h | 2 +-
include/wx/os2/spinctrl.h | 2 +-
include/wx/os2/statbmp.h | 2 +-
include/wx/os2/statbox.h | 2 +-
include/wx/os2/statline.h | 2 +-
include/wx/os2/stattext.h | 2 +-
include/wx/os2/stdpaths.h | 2 +-
include/wx/os2/textctrl.h | 2 +-
include/wx/os2/toolbar.h | 2 +-
include/wx/os2/tooltip.h | 2 +-
include/wx/osx/accel.h | 2 +-
include/wx/osx/app.h | 2 +-
include/wx/osx/bitmap.h | 2 +-
include/wx/osx/bmpbuttn.h | 2 +-
include/wx/osx/button.h | 2 +-
include/wx/osx/carbon/private/mactext.h | 2 +-
include/wx/osx/carbon/region.h | 2 +-
include/wx/osx/carbon/statbmp.h | 2 +-
include/wx/osx/checkbox.h | 2 +-
include/wx/osx/clipbrd.h | 2 +-
include/wx/osx/cocoa/private/textimpl.h | 2 +-
include/wx/osx/config_xcode.h | 2 +-
include/wx/osx/control.h | 2 +-
include/wx/osx/core/joystick.h | 2 +-
include/wx/osx/dataform.h | 2 +-
include/wx/osx/dataobj.h | 2 +-
include/wx/osx/dataobj2.h | 2 +-
include/wx/osx/dc.h | 2 +-
include/wx/osx/dcclient.h | 2 +-
include/wx/osx/dcmemory.h | 2 +-
include/wx/osx/dcscreen.h | 2 +-
include/wx/osx/dialog.h | 2 +-
include/wx/osx/dirdlg.h | 2 +-
include/wx/osx/filedlg.h | 2 +-
include/wx/osx/font.h | 2 +-
include/wx/osx/frame.h | 2 +-
include/wx/osx/gauge.h | 2 +-
include/wx/osx/helpxxxx.h | 2 +-
include/wx/osx/icon.h | 2 +-
include/wx/osx/imaglist.h | 2 +-
include/wx/osx/iphone/private/textimpl.h | 2 +-
include/wx/osx/joystick.h | 2 +-
include/wx/osx/listctrl.h | 2 +-
include/wx/osx/menu.h | 2 +-
include/wx/osx/metafile.h | 2 +-
include/wx/osx/minifram.h | 2 +-
include/wx/osx/notebook.h | 2 +-
include/wx/osx/pnghand.h | 2 +-
include/wx/osx/printmac.h | 2 +-
include/wx/osx/radiobut.h | 2 +-
include/wx/osx/scrolbar.h | 2 +-
include/wx/osx/setup0.h | 2 +-
include/wx/osx/slider.h | 2 +-
include/wx/osx/sound.h | 2 +-
include/wx/osx/spinbutt.h | 2 +-
include/wx/osx/spinctrl.h | 2 +-
include/wx/osx/statbox.h | 2 +-
include/wx/osx/statline.h | 2 +-
include/wx/osx/stattext.h | 2 +-
include/wx/ownerdrw.h | 2 +-
include/wx/palmos/help.h | 2 +-
include/wx/palmos/missing.h | 2 +-
include/wx/palmos/scrolbar.h | 2 +-
include/wx/paper.h | 2 +-
include/wx/private/sckaddr.h | 2 +-
include/wx/private/timer.h | 2 +-
include/wx/propgrid/propgridiface.h | 2 +-
include/wx/protocol/file.h | 2 +-
include/wx/protocol/ftp.h | 2 +-
include/wx/protocol/http.h | 2 +-
include/wx/richtext/richtextbackgroundpage.h | 2 +-
include/wx/richtext/richtextborderspage.h | 2 +-
include/wx/richtext/richtextfontpage.h | 2 +-
include/wx/richtext/richtextmarginspage.h | 2 +-
include/wx/richtext/richtextsizepage.h | 2 +-
include/wx/richtext/richtextxml.h | 2 +-
include/wx/sckipc.h | 2 +-
include/wx/sckstrm.h | 2 +-
include/wx/scrolbar.h | 2 +-
include/wx/socket.h | 2 +-
include/wx/spinctrl.h | 2 +-
include/wx/srchctrl.h | 2 +-
include/wx/statbox.h | 2 +-
include/wx/stattext.h | 2 +-
include/wx/strconv.h | 2 +-
include/wx/sysopt.h | 2 +-
include/wx/textdlg.h | 2 +-
include/wx/thrimpl.cpp | 2 +-
include/wx/tipdlg.h | 2 +-
include/wx/tooltip.h | 2 +-
include/wx/types.h | 2 +-
include/wx/univ/dialog.h | 2 +-
include/wx/univ/tglbtn.h | 2 +-
include/wx/univ/toplevel.h | 2 +-
include/wx/unix/execute.h | 2 +-
include/wx/unix/private/epolldispatcher.h | 2 +-
include/wx/url.h | 2 +-
include/wx/valgen.h | 2 +-
include/wx/valtext.h | 2 +-
include/wx/wizard.h | 2 +-
include/wx/wx_cw.h | 2 +-
include/wx/wx_cw_d.h | 2 +-
include/wx/wx_cwc.h | 2 +-
include/wx/wx_cwc_d.h | 2 +-
include/wx/wx_cwu_d.h | 2 +-
include/wx/wxhtml.h | 2 +-
include/wx/wxshlb_cw.h | 2 +-
include/wx/wxshlb_cw_d.h | 2 +-
include/wx/wxshlb_cwc.h | 2 +-
include/wx/wxshlb_cwc_d.h | 2 +-
include/wx/wxshlba_cw.h | 2 +-
include/wx/wxshlba_cw_d.h | 2 +-
include/wx/wxshlba_cwc.h | 2 +-
include/wx/wxshlba_cwc_d.h | 2 +-
include/wx/x11/bitmap.h | 2 +-
include/wx/x11/dataform.h | 2 +-
include/wx/x11/dataobj.h | 2 +-
include/wx/x11/dataobj2.h | 2 +-
include/wx/x11/dc.h | 2 +-
include/wx/x11/dcclient.h | 2 +-
include/wx/x11/dcmemory.h | 2 +-
include/wx/x11/dnd.h | 2 +-
include/wx/x11/popupwin.h | 2 +-
include/wx/x11/private.h | 2 +-
include/wx/x11/privx.h | 2 +-
include/wx/x11/reparent.h | 2 +-
include/wx/xml/xml.h | 2 +-
include/wx/xrc/xh_richtext.h | 2 +-
src/aui/auibar.cpp | 2 +-
src/cocoa/NSBox.mm | 2 +-
src/cocoa/NSButton.mm | 2 +-
src/cocoa/NSControl.mm | 2 +-
src/cocoa/NSMenu.mm | 2 +-
src/cocoa/NSScroller.mm | 2 +-
src/cocoa/NSTabView.mm | 2 +-
src/cocoa/NSTableView.mm | 2 +-
src/cocoa/NSTextField.mm | 2 +-
src/cocoa/NSView.mm | 2 +-
src/cocoa/ObjcRef.mm | 2 +-
src/cocoa/data.cpp | 2 +-
src/cocoa/evtloop.mm | 2 +-
src/cocoa/font.mm | 2 +-
src/cocoa/glcanvas.mm | 2 +-
src/cocoa/mbarman.mm | 2 +-
src/cocoa/mediactrl.mm | 2 +-
src/cocoa/menu.mm | 2 +-
src/cocoa/notebook.mm | 2 +-
src/cocoa/sound.mm | 2 +-
src/cocoa/spinbutt.mm | 2 +-
src/cocoa/statline2.mm | 2 +-
src/cocoa/utils.mm | 2 +-
src/common/accesscmn.cpp | 2 +-
src/common/calctrlcmn.cpp | 2 +-
src/common/clntdata.cpp | 2 +-
src/common/dcgraph.cpp | 2 +-
src/common/dcsvg.cpp | 2 +-
src/common/dndcmn.cpp | 2 +-
src/common/encconv.cpp | 2 +-
src/common/execcmn.cpp | 2 +-
src/common/extended.c | 2 +-
src/common/fddlgcmn.cpp | 2 +-
src/common/ffile.cpp | 2 +-
src/common/fs_arc.cpp | 2 +-
src/common/fswatchercmn.cpp | 2 +-
src/common/ftp.cpp | 2 +-
src/common/gbsizer.cpp | 2 +-
src/common/imagiff.cpp | 2 +-
src/common/imagtga.cpp | 2 +-
src/common/languageinfo.cpp | 2 +-
src/common/mediactrlcmn.cpp | 2 +-
src/common/numformatter.cpp | 2 +-
src/common/process.cpp | 2 +-
src/common/sstream.cpp | 2 +-
src/common/stdpbase.cpp | 2 +-
src/common/stdstream.cpp | 2 +-
src/common/tarstrm.cpp | 2 +-
src/common/timercmn.cpp | 2 +-
src/common/timerimpl.cpp | 2 +-
src/common/treebase.cpp | 2 +-
src/common/uri.cpp | 2 +-
src/common/valnum.cpp | 2 +-
src/common/wfstream.cpp | 2 +-
src/common/wincmn.cpp | 2 +-
src/dfb/region.cpp | 2 +-
src/generic/animateg.cpp | 2 +-
src/generic/caret.cpp | 2 +-
src/generic/dirdlgg.cpp | 2 +-
src/generic/editlbox.cpp | 2 +-
src/generic/fdrepdlg.cpp | 2 +-
src/generic/fswatcherg.cpp | 2 +-
src/generic/gridctrl.cpp | 2 +-
src/generic/htmllbox.cpp | 2 +-
src/generic/laywin.cpp | 2 +-
src/generic/regiong.cpp | 2 +-
src/generic/selstore.cpp | 2 +-
src/gtk/artgtk.cpp | 2 +-
src/gtk/assertdlg_gtk.c | 2 +-
src/gtk/bmpcbox.cpp | 2 +-
src/gtk/colordlg.cpp | 2 +-
src/gtk/dc.cpp | 2 +-
src/gtk/hildon/notifmsg.cpp | 2 +-
src/gtk/print.cpp | 2 +-
src/gtk/radiobut.cpp | 2 +-
src/gtk/scrolwin.cpp | 2 +-
src/gtk/sockgtk.cpp | 2 +-
src/gtk/spinctrl.cpp | 2 +-
src/gtk/statbmp.cpp | 2 +-
src/gtk/statbox.cpp | 2 +-
src/gtk/statline.cpp | 2 +-
src/gtk/stattext.cpp | 2 +-
src/gtk/timer.cpp | 2 +-
src/gtk1/artgtk.cpp | 2 +-
src/gtk1/dc.cpp | 2 +-
src/gtk1/gnome/gprint.cpp | 2 +-
src/gtk1/main.cpp | 2 +-
src/gtk1/radiobut.cpp | 2 +-
src/gtk1/scrolwin.cpp | 2 +-
src/gtk1/sockgtk.cpp | 2 +-
src/gtk1/spinctrl.cpp | 2 +-
src/gtk1/statbmp.cpp | 2 +-
src/gtk1/statbox.cpp | 2 +-
src/gtk1/statline.cpp | 2 +-
src/gtk1/stattext.cpp | 2 +-
src/gtk1/timer.cpp | 2 +-
src/html/helpctrl.cpp | 2 +-
src/html/htmlctrl/webkit/webkit.mm | 2 +-
src/mgl/clipbrd.cpp | 2 +-
src/mgl/dirmgl.cpp | 2 +-
src/motif/data.cpp | 2 +-
src/motif/main.cpp | 2 +-
src/motif/sockmot.cpp | 2 +-
src/msdos/utilsdos.cpp | 2 +-
src/msw/accel.cpp | 2 +-
src/msw/basemsw.cpp | 2 +-
src/msw/bmpcbox.cpp | 2 +-
src/msw/caret.cpp | 2 +-
src/msw/crashrpt.cpp | 2 +-
src/msw/data.cpp | 2 +-
src/msw/debughlp.cpp | 2 +-
src/msw/dir.cpp | 2 +-
src/msw/dlmsw.cpp | 2 +-
src/msw/evtloop.cpp | 2 +-
src/msw/fontutil.cpp | 2 +-
src/msw/fswatcher.cpp | 2 +-
src/msw/gauge.cpp | 2 +-
src/msw/microwin.c | 2 +-
src/msw/minifram.cpp | 2 +-
src/msw/ole/dataobj.cpp | 2 +-
src/msw/snglinst.cpp | 2 +-
src/msw/sound.cpp | 2 +-
src/msw/stackwalk.cpp | 2 +-
src/msw/stdpaths.cpp | 2 +-
src/msw/utilsgui.cpp | 2 +-
src/msw/wince/crt.cpp | 2 +-
src/msw/winestub.c | 2 +-
src/os2/data.cpp | 2 +-
src/os2/dir.cpp | 2 +-
src/os2/fontutil.cpp | 2 +-
src/os2/main.cpp | 2 +-
src/os2/minifram.cpp | 2 +-
src/os2/nativdlg.cpp | 2 +-
src/os2/popupwin.cpp | 2 +-
src/os2/snglinst.cpp | 2 +-
src/os2/sockpm.cpp | 2 +-
src/os2/sound.cpp | 2 +-
src/os2/spinbutt.cpp | 2 +-
src/os2/stdpaths.cpp | 2 +-
src/os2/tooltip.cpp | 2 +-
src/osx/carbon/aboutdlg.cpp | 2 +-
src/osx/carbon/colordlg.cpp | 2 +-
src/osx/carbon/colordlgosx.mm | 2 +-
src/osx/carbon/dirmac.cpp | 2 +-
src/osx/carbon/drawer.cpp | 2 +-
src/osx/carbon/fontdlgosx.mm | 2 +-
src/osx/carbon/gauge.cpp | 2 +-
src/osx/carbon/graphics.cpp | 2 +-
src/osx/carbon/helpxxxx.cpp | 2 +-
src/osx/carbon/main.cpp | 2 +-
src/osx/carbon/mimetmac.cpp | 2 +-
src/osx/carbon/popupwin.cpp | 2 +-
src/osx/carbon/slider.cpp | 2 +-
src/osx/carbon/spinbutt.cpp | 2 +-
src/osx/carbon/utilscocoa.mm | 2 +-
src/osx/checkbox_osx.cpp | 2 +-
src/osx/choice_osx.cpp | 2 +-
src/osx/cocoa/aboutdlg.mm | 2 +-
src/osx/cocoa/dialog.mm | 2 +-
src/osx/cocoa/gauge.mm | 2 +-
src/osx/cocoa/printdlg.mm | 2 +-
src/osx/cocoa/spinbutt.mm | 2 +-
src/osx/cocoa/srchctrl.mm | 2 +-
src/osx/cocoa/statbox.mm | 2 +-
src/osx/cocoa/toolbar.mm | 2 +-
src/osx/cocoa/tooltip.mm | 2 +-
src/osx/core/cfstring.cpp | 2 +-
src/osx/core/colour.cpp | 2 +-
src/osx/core/hid.cpp | 2 +-
src/osx/core/hidjoystick.cpp | 2 +-
src/osx/core/sockosx.cpp | 2 +-
src/osx/core/stdpaths_cf.cpp | 2 +-
src/osx/core/strconv_cf.cpp | 2 +-
src/osx/core/utilsexc_base.cpp | 2 +-
src/osx/core/utilsexc_cf.cpp | 2 +-
src/osx/dnd_osx.cpp | 2 +-
src/osx/iphone/dialog.mm | 2 +-
src/osx/iphone/gauge.mm | 2 +-
src/osx/iphone/nonownedwnd.mm | 2 +-
src/osx/iphone/stattext.mm | 2 +-
src/osx/iphone/textctrl.mm | 2 +-
src/osx/iphone/toolbar.mm | 2 +-
src/osx/iphone/utils.mm | 2 +-
src/osx/listbox_osx.cpp | 2 +-
src/osx/radiobox_osx.cpp | 2 +-
src/osx/radiobut_osx.cpp | 2 +-
src/osx/scrolbar_osx.cpp | 2 +-
src/osx/spinbutt_osx.cpp | 2 +-
src/osx/spinctrl_osx.cpp | 2 +-
src/osx/statline_osx.cpp | 2 +-
src/osx/stattext_osx.cpp | 2 +-
src/osx/toolbar_osx.cpp | 2 +-
src/osx/toplevel_osx.cpp | 2 +-
src/osx/window_osx.cpp | 2 +-
src/palmos/base.cpp | 2 +-
src/palmos/help.cpp | 2 +-
src/richtext/richtextbackgroundpage.cpp | 2 +-
src/richtext/richtextborderspage.cpp | 2 +-
src/richtext/richtextctrl.cpp | 2 +-
src/richtext/richtextfontpage.cpp | 2 +-
src/richtext/richtextmarginspage.cpp | 2 +-
src/richtext/richtextsizepage.cpp | 2 +-
src/stc/ScintillaWX.cpp | 2 +-
src/stc/ScintillaWX.h | 2 +-
src/stc/stc.cpp | 2 +-
src/univ/button.cpp | 2 +-
src/univ/framuniv.cpp | 2 +-
src/univ/gauge.cpp | 2 +-
src/univ/inphand.cpp | 2 +-
src/univ/spinbutt.cpp | 2 +-
src/univ/statbox.cpp | 2 +-
src/univ/statline.cpp | 2 +-
src/univ/tglbtn.cpp | 2 +-
src/univ/theme.cpp | 2 +-
src/univ/winuniv.cpp | 2 +-
src/unix/appunix.cpp | 2 +-
src/unix/dir.cpp | 2 +-
src/unix/dlunix.cpp | 2 +-
src/unix/epolldispatcher.cpp | 2 +-
src/unix/glx11.cpp | 2 +-
src/unix/net.cpp | 2 +-
src/unix/stackwalk.cpp | 2 +-
src/unix/stdpaths.cpp | 2 +-
src/x11/data.cpp | 2 +-
src/x11/minifram.cpp | 2 +-
src/xrc/xh_datectrl.cpp | 2 +-
src/xrc/xh_grid.cpp | 2 +-
src/xrc/xh_html.cpp | 2 +-
src/xrc/xh_htmllbox.cpp | 2 +-
src/xrc/xh_spin.cpp | 2 +-
src/xrc/xh_stlin.cpp | 2 +-
src/xrc/xh_tglbtn.cpp | 2 +-
src/xrc/xh_tree.cpp | 2 +-
544 files changed, 544 insertions(+), 544 deletions(-)
diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 4d6ee18e28..99362ff09a 100644
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msvc/wx/msw/setup.h
+// Name: msvc/wx/setup.h
// Purpose: wrapper around the real wx/setup.h for Visual C++
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index e4e7b8182c..fa1fd058d5 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/generic/tabmdi.h
+// Name: wx/aui/tabmdi.h
// Purpose: Generic MDI (Multiple Document Interface) classes
// Author: Hans Van Leemputten
// Modified by: Benjamin I. Williams / Kirix Corporation
diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index f34ae50935..66f4511758 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/bmpbutton.h
+// Name: wx/bmpbuttn.h
// Purpose: wxBitmapButton class interface
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/choicdlg.h b/include/wx/choicdlg.h
index 29802b5965..4fb0b46340 100644
--- a/include/wx/choicdlg.h
+++ b/include/wx/choicdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/choicdgg.h
+// Name: wx/choicdlg.h
// Purpose: Includes generic choice dialog file
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 2f30970f7a..839a4e012c 100644
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/app.h
+// Name: wx/cocoa/app.h
// Purpose: wxApp class
// Author: David Elliott
// Modified by:
diff --git a/include/wx/cocoa/clipbrd.h b/include/wx/cocoa/clipbrd.h
index 82b10d6c15..f3349375fc 100644
--- a/include/wx/cocoa/clipbrd.h
+++ b/include/wx/cocoa/clipbrd.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/cocoa/clipboard.h
+// Name: wx/cocoa/clipbrd.h
// Purpose: wxClipboard
// Author: David Elliott <dfe@cox.net>
// Modified by:
diff --git a/include/wx/cocoa/font.h b/include/wx/cocoa/font.h
index b671f95bcb..d54a07f6e1 100644
--- a/include/wx/cocoa/font.h
+++ b/include/wx/cocoa/font.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: font.h
+// Name: wx/cocoa/font.h
// Purpose: wxFont class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/cocoa/msgdlg.h b/include/wx/cocoa/msgdlg.h
index 90cfdc23e9..bfea16092d 100644
--- a/include/wx/cocoa/msgdlg.h
+++ b/include/wx/cocoa/msgdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/cocoa/dirdlg.h
+// Name: wx/cocoa/msgdlg.h
// Purpose: wxMessageDialog class
// Author: Gareth Simpson
// Created: 2007-10-29
diff --git a/include/wx/cocoa/objc/NSSlider.h b/include/wx/cocoa/objc/NSSlider.h
index d89c270551..9a44c607a5 100644
--- a/include/wx/cocoa/objc/NSSlider.h
+++ b/include/wx/cocoa/objc/NSSlider.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/cocoa/objc/NSView.h
+// Name: wx/cocoa/objc/NSSlider.h
// Purpose: WXNSSlider class
// Author: David Elliott
// Modified by:
diff --git a/include/wx/cocoa/private/fontfactory.h b/include/wx/cocoa/private/fontfactory.h
index ccfafa9ea9..a242f0ed2c 100644
--- a/include/wx/cocoa/private/fontfactory.h
+++ b/include/wx/cocoa/private/fontfactory.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/cocoa/fontfactory.h
+// Name: wx/cocoa/private/fontfactory.h
// Purpose: wxFontFactory class
// Author: David Elliott
// Modified by:
diff --git a/include/wx/cocoa/private/scrollview.h b/include/wx/cocoa/private/scrollview.h
index c94dd41f48..a1f3de30ed 100644
--- a/include/wx/cocoa/private/scrollview.h
+++ b/include/wx/cocoa/private/scrollview.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/cocoa/scrollview.h
+// Name: wx/cocoa/private/scrollview.h
// Purpose: wxWindowCocoaScrollView
// Author: David Elliott
// Modified by:
diff --git a/include/wx/cocoa/sound.h b/include/wx/cocoa/sound.h
index 63355c870d..1a6f7de02d 100644
--- a/include/wx/cocoa/sound.h
+++ b/include/wx/cocoa/sound.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: sound.h
+// Name: wx/cocoa/sound.h
// Purpose: wxSound class (loads and plays short Windows .wav files).
// Optional on non-Windows platforms.
// Authors: David Elliott, Ryan Norton
diff --git a/include/wx/cocoa/tooltip.h b/include/wx/cocoa/tooltip.h
index 85f944d925..ee632c6873 100644
--- a/include/wx/cocoa/tooltip.h
+++ b/include/wx/cocoa/tooltip.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/tooltip.h
+// Name: wx/cocoa/tooltip.h
// Purpose: wxToolTip class - tooltip control
// Author: Ryan Norton
// Modified by:
diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 9d948b659f..481723857e 100644
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: confbase.h
+// Name: wx/confbase.h
// Purpose: declaration of the base class of all config implementations
// (see also: fileconf.h and msw/regconf.h and iniconf.h)
// Author: Karsten Ballueder & Vadim Zeitlin
diff --git a/include/wx/config.h b/include/wx/config.h
index e8734bf25d..97d28248a3 100644
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: config.h
+// Name: wx/config.h
// Purpose: wxConfig base header
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 478d45b8be..6882bab2a3 100644
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: datstrm.h
+// Name: wx/datstrm.h
// Purpose: Data stream classes
// Author: Guilhem Lavaux
// Modified by: Mickael Gilabert
diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index a5c7e6ff97..df10beeb96 100644
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/graphdc.h
+// Name: wx/dcgraph.h
// Purpose: graphics context device bridge header
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/dlist.h b/include/wx/dlist.h
index 0389d830d4..164ed8680a 100644
--- a/include/wx/dlist.h
+++ b/include/wx/dlist.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: dlist.h
+// Name: wx/dlist.h
// Purpose: wxDList<T> which is a template version of wxList
// Author: Robert Roebling
// Created: 18.09.2008
diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 8f440b78be..3c5644d652 100644
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dynload.h
+// Name: wx/dynload.h
// Purpose: Dynamic loading framework
// Author: Ron Lee, David Falkinder, Vadim Zeitlin and a cast of 1000's
// (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)
diff --git a/include/wx/file.h b/include/wx/file.h
index 5b04b0d7a2..044e891fa8 100644
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: file.h
+// Name: wx/file.h
// Purpose: wxFile - encapsulates low-level "file descriptor"
// wxTempFile - safely replace the old file
// Author: Vadim Zeitlin
diff --git a/include/wx/fs_inet.h b/include/wx/fs_inet.h
index 3e29572b05..bde0c69546 100644
--- a/include/wx/fs_inet.h
+++ b/include/wx/fs_inet.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: fs_inet.h
+// Name: wx/fs_inet.h
// Purpose: HTTP and FTP file system
// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 4c478b759b..6688537ca5 100644
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: fs_mem.h
+// Name: wx/fs_mem.h
// Purpose: in-memory file system
// Author: Vaclav Slavik
// Copyright: (c) 2000 Vaclav Slavik
diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h
index f62f891954..8d3c74adf4 100644
--- a/include/wx/gbsizer.h
+++ b/include/wx/gbsizer.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gbsizer.h
+// Name: wx/gbsizer.h
// Purpose: wxGridBagSizer: A sizer that can lay out items in a grid,
// with items at specified cells, and with the option of row
// and/or column spanning
diff --git a/include/wx/generic/calctrlg.h b/include/wx/generic/calctrlg.h
index 02abe01210..8ef42977a3 100644
--- a/include/wx/generic/calctrlg.h
+++ b/include/wx/generic/calctrlg.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: generic/calctrlg.h
+// Name: wx/generic/calctrlg.h
// Purpose: generic implementation of date-picker control
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 83fd6e1aae..36380b6ea5 100644
--- a/include/wx/generic/caret.h
+++ b/include/wx/generic/caret.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: generic/caret.h
+// Name: wx/generic/caret.h
// Purpose: generic wxCaret class
// Author: Vadim Zeitlin (original code by Robert Roebling)
// Modified by:
diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 9e5c45aa89..6151d81b08 100644
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: generic/datectrl.h
+// Name: wx/generic/datectrl.h
// Purpose: generic wxDatePickerCtrl implementation
// Author: Andreas Pflug
// Modified by:
diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index e33773ddd3..afda6f2922 100644
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/generic/dcps.h
+// Name: wx/generic/dcpsg.h
// Purpose: wxPostScriptDC class
// Author: Julian Smart and others
// Modified by:
diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 9b8eeff566..3a8b46de1f 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dirctrlg.h
+// Name: wx/generic/dirctrlg.h
// Purpose: wxGenericDirCtrl class
// Builds on wxDirCtrl class written by Robert Roebling for the
// wxFile application, modified by Harm van der Heijden.
diff --git a/include/wx/generic/fdrepdlg.h b/include/wx/generic/fdrepdlg.h
index bb00d04009..69ae0d1ebc 100644
--- a/include/wx/generic/fdrepdlg.h
+++ b/include/wx/generic/fdrepdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/msw/fdrepdlg.h
+// Name: wx/generic/fdrepdlg.h
// Purpose: wxGenericFindReplaceDialog class
// Author: Markus Greither
// Modified by:
diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 375bbc95de..3ff43281fa 100644
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// Name: generic/gridctrl.h
+// Name: wx/generic/gridctrl.h
// Purpose: wxGrid controls
// Author: Paul Gammans, Roger Gammans
// Modified by:
diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 18b8acd9fc..76ec0a8f5a 100644
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: laywin.h
+// Name: wx/generic/laywin.h
// Purpose: Implements a simple layout algorithm, plus
// wxSashLayoutWindow which is an example of a window with
// layout-awareness (via event handlers). This is suited to
diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index 3f1a607d83..32deb7564d 100644
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: notebook.h
+// Name: wx/generic/notebook.h
// Purpose: wxNotebook class (a.k.a. property sheet, tabbed dialog)
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index aae2d1ed33..290f8942fa 100644
--- a/include/wx/generic/printps.h
+++ b/include/wx/generic/printps.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: printps.h
+// Name: wx/generic/printps.h
// Purpose: wxPostScriptPrinter, wxPostScriptPrintPreview
// wxGenericPageSetupDialog
// Author: Julian Smart
diff --git a/include/wx/generic/private/listctrl.h b/include/wx/generic/private/listctrl.h
index 52ef5aa075..4ee47ff1d4 100644
--- a/include/wx/generic/private/listctrl.h
+++ b/include/wx/generic/private/listctrl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: listctrl.h
+// Name: wx/generic/listctrl.h
// Purpose: private definitions of wxListCtrl helpers
// Author: Robert Roebling
// Vadim Zeitlin (virtual list control support)
diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 63f8139cc6..726f177b1a 100644
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: prntdlgg.h
+// Name: wx/generic/prntdlgg.h
// Purpose: wxGenericPrintDialog, wxGenericPrintSetupDialog,
// wxGenericPageSetupDialog
// Author: Julian Smart
diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 61a5f5d85e..713ee16d13 100644
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: progdlgg.h
+// Name: wx/generic/progdlgg.h
// Purpose: wxGenericProgressDialog class
// Author: Karsten Ballueder
// Modified by: Francesco Montorsi
diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h
index cbc56178db..88af9589e9 100644
--- a/include/wx/generic/sashwin.h
+++ b/include/wx/generic/sashwin.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: sashwin.h
+// Name: wx/generic/sashwin.h
// Purpose: wxSashWindow implementation. A sash window has an optional
// sash on each edge, allowing it to be dragged. An event
// is generated when the sash is released.
diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index b23e3ea1d5..77ea5dba03 100644
--- a/include/wx/generic/splash.h
+++ b/include/wx/generic/splash.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: splash.h
+// Name: wx/generic/splash.h
// Purpose: Splash screen class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 39df924f0c..cbb072eecc 100644
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/splitter.h
+// Name: wx/generic/splitter.h
// Purpose: wxSplitterWindow class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index bc1aa29429..814156c69b 100644
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: generic/statline.h
+// Name: wx/generic/statline.h
// Purpose: a generic wxStaticLine class
// Author: Vadim Zeitlin
// Created: 28.06.99
diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index 3899cadd94..ad11457a9d 100644
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: tabg.h
+// Name: wx/generic/tabg.h
// Purpose: Generic tabbed dialogs; used by wxMotif's wxNotebook
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index fab6bfeaf4..d779ad2ef5 100644
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: textdlgg.h
+// Name: wx/generic/textdlgg.h
// Purpose: wxTextEntryDialog class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/gtk/assertdlg_gtk.h b/include/wx/gtk/assertdlg_gtk.h
index 07d1b0f816..130403d455 100644
--- a/include/wx/gtk/assertdlg_gtk.h
+++ b/include/wx/gtk/assertdlg_gtk.h
@@ -1,5 +1,5 @@
/* ///////////////////////////////////////////////////////////////////////////
-// Name: assertdlg_gtk.h
+// Name: wx/gtk/assertdlg_gtk.h
// Purpose: GtkAssertDialog
// Author: Francesco Montorsi
// Id: $Id$
diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h
index 761d7c81ed..4af988f80c 100644
--- a/include/wx/gtk/clipbrd.h
+++ b/include/wx/gtk/clipbrd.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/clipboard.h
+// Name: wx/gtk/clipbrd.h
// Purpose: wxClipboard for wxGTK
// Author: Robert Roebling, Vadim Zeitlin
// Id: $Id$
diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index fdce88e008..594285f569 100644
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: control.h
+// Name: wx/gtk/control.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index 066125bb8e..533dc49847 100644
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cursor.h
+// Name: wx/gtk/cursor.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/dataform.h b/include/wx/gtk/dataform.h
index 86e0cd7838..efb2ba523f 100644
--- a/include/wx/gtk/dataform.h
+++ b/include/wx/gtk/dataform.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/dataform.h
+// Name: wx/gtk/dataform.h
// Purpose: declaration of the wxDataFormat class
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/gtk/dataobj.h b/include/wx/gtk/dataobj.h
index 2623777643..575309a689 100644
--- a/include/wx/gtk/dataobj.h
+++ b/include/wx/gtk/dataobj.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/dataobj.h
+// Name: wx/gtk/dataobj.h
// Purpose: declaration of the wxDataObject
// Author: Robert Roebling
// RCS-ID: $Id$
diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h
index b820f1c22c..4433cc933a 100644
--- a/include/wx/gtk/dataobj2.h
+++ b/include/wx/gtk/dataobj2.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/dataobj2.h
+// Name: wx/gtk/dataobj2.h
// Purpose: declaration of standard wxDataObjectSimple-derived classes
// Author: Robert Roebling
// Created: 19.10.99 (extracted from gtk/dataobj.h)
diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index cdd22dec1f..18451dae44 100644
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.h
+// Name: wx/gtk/dcclient.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 40e3ef2a2d..9a387dc697 100644
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcmemory.h
+// Name: wx/gtk/dcmemory.h
// Purpose:
// Author: Robert Roebling
// RCS-ID: $Id$
diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index fecc443bdb..e5c1fea746 100644
--- a/include/wx/gtk/dcscreen.h
+++ b/include/wx/gtk/dcscreen.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcscreen.h
+// Name: wx/gtk/dcscreen.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index ef76a636a9..8f2b3284ed 100644
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.h
+// Name: wx/gtk/dialog.h
// Purpose:
// Author: Robert Roebling
// Created:
diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h
index 74a105dcd7..e8f905c67e 100644
--- a/include/wx/gtk/dirdlg.h
+++ b/include/wx/gtk/dirdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dirdlg.h
+// Name: wx/gtk/dirdlg.h
// Purpose: wxDirDialog
// Author: Francesco Montorsi
// Id: $Id$
diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index 30e356ee61..56fc48de6a 100644
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: dnd.h
+// Name: wx/gtk/dnd.h
// Purpose: declaration of the wxDropTarget class
// Author: Robert Roebling
// RCS-ID: $Id$
diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index e588526f00..08854018e5 100644
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: filedlg.h
+// Name: wx/gtk/filedlg.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 6bc37e9eff..da9c9a474f 100644
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: font.h
+// Name: wx/gtk/font.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h
index e1ec055711..987241ec4c 100644
--- a/include/wx/gtk/fontdlg.h
+++ b/include/wx/gtk/fontdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/fontdlgg.h
+// Name: wx/gtk/fontdlg.h
// Purpose: wxFontDialog
// Author: Robert Roebling
// Created:
diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h
index 44cb105c93..be895a7a00 100644
--- a/include/wx/gtk/glcanvas.h
+++ b/include/wx/gtk/glcanvas.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: glcanvas.h
+// Name: wx/gtk/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
// Author: Robert Roebling
// Modified by:
diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 78d967612a..7f509584b0 100644
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: menuitem.h
+// Name: wx/gtk/menuitem.h
// Purpose: wxMenuItem class
// Author: Robert Roebling
// RCS-ID: $Id$
diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index 7cda4e3216..de339f016a 100644
--- a/include/wx/gtk/minifram.h
+++ b/include/wx/gtk/minifram.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: minifram.h
+// Name: wx/gtk/minifram.h
// Purpose: wxMiniFrame class
// Author: Robert Roebling
// RCS-ID: $Id$
diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index cbe01efb5a..bad2b59524 100644
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: notebook.h
+// Name: wx/gtk/notebook.h
// Purpose: wxNotebook class
// Author: Robert Roebling
// Modified by:
diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index ecc2e52679..97c9db64fb 100644
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: popupwin.h
+// Name: wx/gtk/popupwin.h
// Purpose:
// Author: Robert Roebling
// Created:
diff --git a/include/wx/gtk/private/messagetype.h b/include/wx/gtk/private/messagetype.h
index a2db2f29ff..d60aaba9ee 100644
--- a/include/wx/gtk/private/messagetype.h
+++ b/include/wx/gtk/private/messagetype.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/private/msgtype.h
+// Name: wx/gtk/private/messagetype.h
// Purpose: translate between wx and GtkMessageType
// Author: Vadim Zeitlin
// Created: 2009-09-27
diff --git a/include/wx/gtk/private/mnemonics.h b/include/wx/gtk/private/mnemonics.h
index 651a58e343..3ce567e127 100644
--- a/include/wx/gtk/private/mnemonics.h
+++ b/include/wx/gtk/private/mnemonics.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/private/mnemonics.h
+// Name: wx/gtk/private/mnemonics.h
// Purpose: helper functions for dealing with GTK+ mnemonics
// Author: Vadim Zeitlin
// Created: 2007-11-12
diff --git a/include/wx/gtk/private/timer.h b/include/wx/gtk/private/timer.h
index 53d51fc9d5..ada20184e0 100644
--- a/include/wx/gtk/private/timer.h
+++ b/include/wx/gtk/private/timer.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/private/gtk/timer.h
+// Name: wx/gtk/private/timer.h
// Purpose: wxTimerImpl for wxGTK
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/private/win_gtk.h b/include/wx/gtk/private/win_gtk.h
index db1ddc06f0..010afa0aa5 100644
--- a/include/wx/gtk/private/win_gtk.h
+++ b/include/wx/gtk/private/win_gtk.h
@@ -1,5 +1,5 @@
/* ///////////////////////////////////////////////////////////////////////////
-// Name: win_gtk.h
+// Name: wx/gtk/private/win_gtk.h
// Purpose: native GTK+ widget for wxWindow
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 8b8c61e32c..9f909f17aa 100644
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: scrolbar.h
+// Name: wx/gtk/scrolbar.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
index f9924ed224..15d663785c 100644
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: spinctrl.h
+// Name: wx/gtk/spinctrl.h
// Purpose: wxSpinCtrl class
// Author: Robert Roebling
// Modified by:
diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index 1edbbd9b2f..07729e8ffc 100644
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/stabox.h
+// Name: wx/gtk/statbox.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h
index db205f5f16..0135be8ee4 100644
--- a/include/wx/gtk/tooltip.h
+++ b/include/wx/gtk/tooltip.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: tooltip.h
+// Name: wx/gtk/tooltip.h
// Purpose: wxToolTip class
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk/treeentry_gtk.h b/include/wx/gtk/treeentry_gtk.h
index 0992d2174e..95127e89ab 100644
--- a/include/wx/gtk/treeentry_gtk.h
+++ b/include/wx/gtk/treeentry_gtk.h
@@ -1,5 +1,5 @@
/* ///////////////////////////////////////////////////////////////////////////
-// Name: treeentry_gtk.h
+// Name: wx/gtk/treeentry_gtk.h
// Purpose: GtkTreeEntry - a string/userdata combo for use with treeview
// Author: Ryan Norton
// Id: $Id$
diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index eb02404678..b75f628605 100644
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk1/clipboard.h
+// Name: wx/gtk1/clipbrd.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/gtk1/fontdlg.h b/include/wx/gtk1/fontdlg.h
index aebdeb52d3..34bb61eef1 100644
--- a/include/wx/gtk1/fontdlg.h
+++ b/include/wx/gtk1/fontdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk1/fontdlgg.h
+// Name: wx/gtk1/fontdlg.h
// Purpose: wxFontDialog
// Author: Robert Roebling
// Created:
diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 97ed7c677d..0700ed60c5 100644
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: glcanvas.h
+// Name: wx/gtk1/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
// Author: Robert Roebling
// Modified by:
diff --git a/include/wx/gtk1/private/mnemonics.h b/include/wx/gtk1/private/mnemonics.h
index 651a58e343..f240defdd0 100644
--- a/include/wx/gtk1/private/mnemonics.h
+++ b/include/wx/gtk1/private/mnemonics.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/private/mnemonics.h
+// Name: wx/gtk1/private/mnemonics.h
// Purpose: helper functions for dealing with GTK+ mnemonics
// Author: Vadim Zeitlin
// Created: 2007-11-12
diff --git a/include/wx/gtk1/statbox.h b/include/wx/gtk1/statbox.h
index 400f56377e..5dc0fa19ce 100644
--- a/include/wx/gtk1/statbox.h
+++ b/include/wx/gtk1/statbox.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk1/stabox.h
+// Name: wx/gtk1/statbox.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/include/wx/help.h b/include/wx/help.h
index 2bbf133418..7e414dc7d1 100644
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: help.h
+// Name: wx/help.h
// Purpose: wxHelpController base header
// Author: wxWidgets Team
// Modified by:
diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 47af76dd34..f16eafdead 100644
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helpbase.h
+// Name: wx/helpbase.h
// Purpose: Help system base classes
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/helphtml.h b/include/wx/helphtml.h
index b4fae9b7ae..b3d7e19491 100644
--- a/include/wx/helphtml.h
+++ b/include/wx/helphtml.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helphtml.h
+// Name: wx/helphtml.h
// Purpose: Includes wx/html/helpctrl.h, for wxHtmlHelpController.
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/helpwin.h b/include/wx/helpwin.h
index b6f3500fc8..6f5d332ef8 100644
--- a/include/wx/helpwin.h
+++ b/include/wx/helpwin.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helpwin.h
+// Name: wx/helpwin.h
// Purpose: Includes Windows or OS/2 help
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/html/forcelnk.h b/include/wx/html/forcelnk.h
index beee677d75..4a1a7d47ce 100644
--- a/include/wx/html/forcelnk.h
+++ b/include/wx/html/forcelnk.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: forcelnk.h
+// Name: wx/html/forcelnk.h
// Purpose: macros which force the linker to link apparently unused code
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index c266ae6fc1..059333bd05 100644
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helpctrl.h
+// Name: wx/html/helpctrl.h
// Purpose: wxHtmlHelpController
// Notes: Based on htmlhelp.cpp, implementing a monolithic
// HTML Help controller class, by Vaclav Slavik
diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index bafab9ecd5..09b1a46bce 100644
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helpdata.h
+// Name: wx/html/helpdata.h
// Purpose: wxHtmlHelpData
// Notes: Based on htmlhelp.cpp, implementing a monolithic
// HTML Help controller class, by Vaclav Slavik
diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 85056a86a5..bac1a1a778 100644
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helpfrm.h
+// Name: wx/html/helpfrm.h
// Purpose: wxHtmlHelpFrame
// Notes: Based on htmlhelp.cpp, implementing a monolithic
// HTML Help controller class, by Vaclav Slavik
diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 9a242b09a4..b215c4f588 100644
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: htmlcell.h
+// Name: wx/html/htmlcell.h
// Purpose: wxHtmlCell class is used by wxHtmlWindow/wxHtmlWinParser
// as a basic visual element of HTML page
// Author: Vaclav Slavik
diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h
index be385699f1..4b9d54e9ec 100644
--- a/include/wx/html/htmldefs.h
+++ b/include/wx/html/htmldefs.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: htmldefs.h
+// Name: wx/html/htmldefs.h
// Purpose: constants for wxhtml library
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h
index 4cddd88aea..fe97cbf983 100644
--- a/include/wx/html/htmlfilt.h
+++ b/include/wx/html/htmlfilt.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: htmlfilt.h
+// Name: wx/html/htmlfilt.h
// Purpose: filters
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index e9fd5e013a..58c56e5286 100644
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: htmlpars.h
+// Name: wx/html/htmlpars.h
// Purpose: wxHtmlParser class (generic parser)
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/html/htmlproc.h b/include/wx/html/htmlproc.h
index a9c1938263..3b20747348 100644
--- a/include/wx/html/htmlproc.h
+++ b/include/wx/html/htmlproc.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: htmlprep.h
+// Name: wx/html/htmlprep.h
// Purpose: HTML processor
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index 79dc4d6988..35ab27a6c5 100644
--- a/include/wx/html/htmltag.h
+++ b/include/wx/html/htmltag.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: htmltag.h
+// Name: wx/html/htmltag.h
// Purpose: wxHtmlTag class (represents single tag)
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 88a48f7184..298f19307e 100644
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: htmlwin.h
+// Name: wx/html/htmlwin.h
// Purpose: wxHtmlWindow class for parsing & displaying HTML
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 74024d433b..2ff79b9fdc 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: htmprint.h
+// Name: wx/html/htmprint.h
// Purpose: html printing classes
// Author: Vaclav Slavik
// Created: 25/09/99
diff --git a/include/wx/html/m_templ.h b/include/wx/html/m_templ.h
index df65329041..17ff701967 100644
--- a/include/wx/html/m_templ.h
+++ b/include/wx/html/m_templ.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: m_templ.h
+// Name: wx/html/m_templ.h
// Purpose: Modules template file
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index f155127cdf..75f4da2d7f 100644
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: winpars.h
+// Name: wx/html/winpars.h
// Purpose: wxHtmlWinParser class (parser to be used with wxHtmlWindow)
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h
index 7ac5c35e7d..ed43fad66a 100644
--- a/include/wx/imagiff.h
+++ b/include/wx/imagiff.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: imagiff.h
+// Name: wx/imagiff.h
// Purpose: wxImage handler for Amiga IFF images
// Author: Steffen Gutmann
// RCS-ID: $Id$
diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index 98eb3b0383..32f6db642c 100644
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: imagjpeg.h
+// Name: wx/imagjpeg.h
// Purpose: wxImage JPEG handler
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index c3e1b3ed9b..ac1c8c9440 100644
--- a/include/wx/imagpcx.h
+++ b/include/wx/imagpcx.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: imagpcx.h
+// Name: wx/imagpcx.h
// Purpose: wxImage PCX handler
// Author: Guillermo Rodriguez Garcia <guille@iies.es>
// RCS-ID: $Id$
diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index f0d96d3c74..693cd5ae29 100644
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: imagpng.h
+// Name: wx/imagpng.h
// Purpose: wxImage PNG handler
// Author: Robert Roebling
// RCS-ID: $Id$
diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h
index 89df0d0807..1c6eaec2f4 100644
--- a/include/wx/imagpnm.h
+++ b/include/wx/imagpnm.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: imagpnm.h
+// Name: wx/imagpnm.h
// Purpose: wxImage PNM handler
// Author: Sylvain Bougnoux
// RCS-ID: $Id$
diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 2c90bb5e57..3021a61e4a 100644
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: imagtiff.h
+// Name: wx/imagtiff.h
// Purpose: wxImage TIFF handler
// Author: Robert Roebling
// RCS-ID: $Id$
diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index 3918547141..521bef8595 100644
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: ipcbase.h
+// Name: wx/ipcbase.h
// Purpose: Base classes for IPC
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index d29ba50b25..8978710672 100644
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: joystick.h
+// Name: wx/joystick.h
// Purpose: wxJoystick base header
// Author: wxWidgets Team
// Modified by:
diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp
index 1027f4eaab..405ff6da9b 100644
--- a/include/wx/listimpl.cpp
+++ b/include/wx/listimpl.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: listimpl.cpp
+// Name: wx/listimpl.cpp
// Purpose: second-part of macro based implementation of template lists
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h
index f6392e5f8c..8e9d550ac2 100644
--- a/include/wx/mgl/bitmap.h
+++ b/include/wx/mgl/bitmap.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: bitmap.h
+// Name: wx/mgl/bitmap.h
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
diff --git a/include/wx/mgl/clipbrd.h b/include/wx/mgl/clipbrd.h
index 4a7e56896e..d0693667a4 100644
--- a/include/wx/mgl/clipbrd.h
+++ b/include/wx/mgl/clipbrd.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/mgl/clipboard.h
+// Name: wx/mgl/clipbrd.h
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
index df99b31b0e..bba7e590f2 100644
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cursor.h
+// Name: wx/mgl/cursor.h
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h
index ab5a3efc8f..a0deefd7fc 100644
--- a/include/wx/mgl/dc.h
+++ b/include/wx/mgl/dc.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dc.h
+// Name: wx/mgl/dc.h
// Purpose: wxDC class
// Author: Vaclav Slavik
// Created: 2001/03/09
diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h
index 6817219bff..fafaa01448 100644
--- a/include/wx/mgl/dcclient.h
+++ b/include/wx/mgl/dcclient.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.h
+// Name: wx/mgl/dcclient.h
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h
index 9ec0e6fd0f..1cf307b991 100644
--- a/include/wx/mgl/dcmemory.h
+++ b/include/wx/mgl/dcmemory.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcmemory.h
+// Name: wx/mgl/dcmemory.h
// Purpose:
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/mgl/dcscreen.h b/include/wx/mgl/dcscreen.h
index ccf1c218e9..6b5fd171cd 100644
--- a/include/wx/mgl/dcscreen.h
+++ b/include/wx/mgl/dcscreen.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcscreen.h
+// Name: wx/mgl/dcscreen.h
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h
index bc2bff6b8a..291b1d9a30 100644
--- a/include/wx/mgl/font.h
+++ b/include/wx/mgl/font.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: font.h
+// Name: wx/mgl/font.h
// Author: Vaclav Slavik
// Id: $Id$
// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
diff --git a/include/wx/mgl/private.h b/include/wx/mgl/private.h
index 04560002b6..7b8c86a31c 100644
--- a/include/wx/mgl/private.h
+++ b/include/wx/mgl/private.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: private.h
+// Name: wx/mgl/private.h
// Purpose: Private declarations: as this header is only included by
// wxWidgets itself, it may contain identifiers which don't start
// with "wx".
diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h
index 15591caedc..bf96f4eb01 100644
--- a/include/wx/motif/scrolbar.h
+++ b/include/wx/motif/scrolbar.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/motif/scrollbar.h
+// Name: wx/motif/scrolbar.h
// Purpose: wxScrollBar class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 04da533c8c..ca96fc7ff9 100644
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/msgdlgg.h
+// Name: wx/msgdlg.h
// Purpose: common header and base class for wxMessageDialog
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msgqueue.h b/include/wx/msgqueue.h
index 03d9f587c9..5a66fc82c7 100644
--- a/include/wx/msgqueue.h
+++ b/include/wx/msgqueue.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/thread.h
+// Name: wx/msqqueue.h
// Purpose: Message queues for inter-thread communication
// Author: Evgeniy Tarassov
// Created: 2007-10-31
diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index ab41124fab..5c54441e85 100644
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: app.h
+// Name: wx/msw/app.h
// Purpose: wxApp class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/caret.h b/include/wx/msw/caret.h
index d6468eb5b6..ab51bea025 100644
--- a/include/wx/msw/caret.h
+++ b/include/wx/msw/caret.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/caret.h
+// Name: wx/msw/caret.h
// Purpose: wxCaret class - the MSW implementation of wxCaret
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 6726151627..b57b5edbad 100644
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.h
+// Name: wx/msw/dcclient.h
// Purpose: wxClientDC class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h
index b05a4b4fbe..aad250fa8c 100644
--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dde.h
+// Name: wx/msw/dde.h
// Purpose: DDE class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/debughlp.h b/include/wx/msw/debughlp.h
index a4b945ee81..72776814b2 100644
--- a/include/wx/msw/debughlp.h
+++ b/include/wx/msw/debughlp.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/msw/wrapdbgh.h
+// Name: wx/msw/debughlp.h
// Purpose: wraps dbghelp.h standard file
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index a1fbe91034..86cb059e4c 100644
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helpchm.h
+// Name: wx/msw/helpchm.h
// Purpose: Help system: MS HTML Help implementation
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index 5af4f824e0..ee47885062 100644
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helpwin.h
+// Name: wx/msw/helpwin.h
// Purpose: Help system: WinHelp implementation
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/joystick.h b/include/wx/msw/joystick.h
index 7a655137a9..3d95663424 100644
--- a/include/wx/msw/joystick.h
+++ b/include/wx/msw/joystick.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: joystick.h
+// Name: wx/msw/joystick.h
// Purpose: wxJoystick class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index 4cfc3d058b..21be80c38f 100644
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: menuitem.h
+// Name: wx/msw/menuitem.h
// Purpose: wxMenuItem class
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/microwin.h b/include/wx/msw/microwin.h
index 83ef7a3ef1..206ce59131 100644
--- a/include/wx/msw/microwin.h
+++ b/include/wx/msw/microwin.h
@@ -1,6 +1,6 @@
/*
/////////////////////////////////////////////////////////////////////////////
-// Name: microwin.h
+// Name: wx/msw/microwin.h
// Purpose: Extra implementation for MicroWindows
// Author: Julian Smart
// Created: 2001-05-31
diff --git a/include/wx/msw/ole/access.h b/include/wx/msw/ole/access.h
index 1684ef72b2..956592c1a2 100644
--- a/include/wx/msw/ole/access.h
+++ b/include/wx/msw/ole/access.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: ole/access.h
+// Name: wx/msw/ole/access.h
// Purpose: declaration of the wxAccessible class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h
index beae01b33e..d38de41be7 100644
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: automtn.h
+// Name: wx/msw/ole/automtn.h
// Purpose: OLE automation utilities
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/ole/dataform.h b/include/wx/msw/ole/dataform.h
index d36edbfff9..90901bdd65 100644
--- a/include/wx/msw/ole/dataform.h
+++ b/include/wx/msw/ole/dataform.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/ole/dataform.h
+// Name: wx/msw/ole/dataform.h
// Purpose: declaration of the wxDataFormat class
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index 5115c22425..1b33e35ed9 100644
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/ole/dataobj.h
+// Name: wx/msw/ole/dataobj.h
// Purpose: declaration of the wxDataObject class
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/ole/dropsrc.h b/include/wx/msw/ole/dropsrc.h
index 7ef2818a0a..7004d82f7f 100644
--- a/include/wx/msw/ole/dropsrc.h
+++ b/include/wx/msw/ole/dropsrc.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: ole/dropsrc.h
+// Name: wx/msw/ole/dropsrc.h
// Purpose: declaration of the wxDropSource class
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/ole/droptgt.h b/include/wx/msw/ole/droptgt.h
index 0224655634..659bf39713 100644
--- a/include/wx/msw/ole/droptgt.h
+++ b/include/wx/msw/ole/droptgt.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: ole/droptgt.h
+// Name: wx/msw/ole/droptgt.h
// Purpose: declaration of the wxDropTarget class
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 655c938b68..1b4d5e6d7e 100644
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: oleutils.h
+// Name: wx/msw/ole/oleutils.h
// Purpose: OLE helper routines, OLE debugging support &c
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/ole/uuid.h b/include/wx/msw/ole/uuid.h
index ef82be0371..1b31d7373c 100644
--- a/include/wx/msw/ole/uuid.h
+++ b/include/wx/msw/ole/uuid.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: ole/uuid.h
+// Name: wx/msw/ole/uuid.h
// Purpose: encapsulates an UUID with some added helper functions
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 233ecdc603..754e212f9f 100644
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: printdlg.h
+// Name: wx/msw/printdlg.h
// Purpose: wxPrintDialog, wxPageSetupDialog classes
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index d902c42c46..14951384b3 100644
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: printwin.h
+// Name: wx/msw/printwin.h
// Purpose: wxWindowsPrinter, wxWindowsPrintPreview classes
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/private/button.h b/include/wx/msw/private/button.h
index a6c9b64374..1e6336197d 100644
--- a/include/wx/msw/private/button.h
+++ b/include/wx/msw/private/button.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/private/button.h
+// Name: wx/msw/private/button.h
// Purpose: helper functions used with native BUTTON control
// Author: Vadim Zeitlin
// Created: 2008-06-07
diff --git a/include/wx/msw/private/datecontrols.h b/include/wx/msw/private/datecontrols.h
index 08889d51c5..671877f04e 100644
--- a/include/wx/msw/private/datecontrols.h
+++ b/include/wx/msw/private/datecontrols.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/private/datecontrols.h
+// Name: wx/msw/private/datecontrols.h
// Purpose: implementation helpers for wxDatePickerCtrl and wxCalendarCtrl
// Author: Vadim Zeitlin
// Created: 2008-04-04
diff --git a/include/wx/msw/private/dc.h b/include/wx/msw/private/dc.h
index 0f4c428285..bd5475d062 100644
--- a/include/wx/msw/private/dc.h
+++ b/include/wx/msw/private/dc.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/private/dc.h
+// Name: wx/msw/private/dc.h
// Purpose: private wxMSW helpers for working with HDCs
// Author: Vadim Zeitlin
// Created: 2009-06-16 (extracted from src/msw/dc.cpp)
diff --git a/include/wx/msw/private/sockmsw.h b/include/wx/msw/private/sockmsw.h
index edfc84d911..24e393204e 100644
--- a/include/wx/msw/private/sockmsw.h
+++ b/include/wx/msw/private/sockmsw.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/msw/gsockmsw.h
+// Name: wx/msw/private/gsockmsw.h
// Purpose: MSW-specific socket implementation
// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin
// Created: April 1997
diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index 41d6ef1d3b..47bde0578a 100644
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: radiobut.h
+// Name: wx/msw/radiobut.h
// Purpose: wxRadioButton class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 02bc6c6f3f..504eb56cc2 100644
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/regconf.h
+// Name: wx/msw/regconf.h
// Purpose: Registry based implementation of wxConfigBase
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index 71368aa7b2..87d31b6e5c 100644
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: scrollbar.h
+// Name: wx/msw/scrolbar.h
// Purpose: wxScrollBar class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index 778db17f85..a9d5bf4117 100644
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/univ/spinbutt.h
+// Name: wx/msw/spinbutt.h
// Purpose: wxSpinButton class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index dd178b6c82..fcc3a80fb1 100644
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////
-// Name: msw/spinctrl.h
+// Name: wx/msw/spinctrl.h
// Purpose: wxSpinCtrl class declaration for Win32
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h
index 2a3528b604..5c684811bd 100644
--- a/include/wx/msw/statline.h
+++ b/include/wx/msw/statline.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/statline.h
+// Name: wx/msw/statline.h
// Purpose: MSW version of wxStaticLine class
// Author: Vadim Zeitlin
// Created: 28.06.99
diff --git a/include/wx/msw/statusbar.h b/include/wx/msw/statusbar.h
index 60eaf7d7fc..f637807f03 100644
--- a/include/wx/msw/statusbar.h
+++ b/include/wx/msw/statusbar.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/msw/statbr.h
+// Name: wx/msw/statusbar.h
// Purpose: native implementation of wxStatusBar
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/msw/tls.h b/include/wx/msw/tls.h
index 2ef70a2183..0ca7fdfc5e 100644
--- a/include/wx/msw/tls.h
+++ b/include/wx/msw/tls.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/unix/tls.h
+// Name: wx/msw/tls.h
// Purpose: Win32 implementation of wxTlsValue<>
// Author: Vadim Zeitlin
// Created: 2008-08-08
diff --git a/include/wx/msw/toolbar.h b/include/wx/msw/toolbar.h
index bef24a2ee4..4f45e40384 100644
--- a/include/wx/msw/toolbar.h
+++ b/include/wx/msw/toolbar.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/msw/tbar95.h
+// Name: wx/msw/toolbar.h
// Purpose: wxToolBar (Windows 95 toolbar) class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/msw/wince/missing.h b/include/wx/msw/wince/missing.h
index 4e50b0d87d..7099172c4e 100644
--- a/include/wx/msw/wince/missing.h
+++ b/include/wx/msw/wince/missing.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wince/missing.h
+// Name: wx/msw/wince/missing.h
// Purpose: Missing things in WinCE
// Author: Marco Cavallini
// Modified by:
diff --git a/include/wx/msw/wince/smartphone.rc b/include/wx/msw/wince/smartphone.rc
index 5512ca0edc..9fe2c101bc 100644
--- a/include/wx/msw/wince/smartphone.rc
+++ b/include/wx/msw/wince/smartphone.rc
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/msw/wince/smartphone.h
+// Name: wx/msw/wince/smartphone.rc
// Purpose: resources for MS Smartphone build
// Author: Wlodzimierz ABX Skiba
// Modified by:
diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 52347d1504..247de6b458 100644
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/wrapwin.h
+// Name: wx/msw/wrapwin.h
// Purpose: Wrapper around <windows.h>, to be included instead of it
// Author: Vaclav Slavik
// Created: 2003/07/22
diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index d0b9c02efc..30dde8404a 100644
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: accel.h
+// Name: wx/os2/accel.h
// Purpose: wxAcceleratorTable class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index f4d6fe2fa0..cf33821234 100644
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: app.h
+// Name: wx/os2/app.h
// Purpose: wxApp class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 6f4ef222e9..b65a642b8d 100644
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: bmpbuttn.h
+// Name: wx/os2/bmpbuttn.h
// Purpose: wxBitmapButton class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 463d0d87f5..e6e68407da 100644
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: button.h
+// Name: wx/os2/button.h
// Purpose: wxButton class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index f30a49a2f9..b7d4c9bcfd 100644
--- a/include/wx/os2/checkbox.h
+++ b/include/wx/os2/checkbox.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: checkbox.h
+// Name: wx/os2/checkbox.h
// Purpose: wxCheckBox class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/clipbrd.h b/include/wx/os2/clipbrd.h
index decb449531..153582a6c6 100644
--- a/include/wx/os2/clipbrd.h
+++ b/include/wx/os2/clipbrd.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: clipbrd.h
+// Name: wx/os2/clipbrd.h
// Purpose: Clipboard functionality.
// Note: this functionality is under review, and
// is derived from wxWidgets 1.xx code. Please contact
diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index b5e7d293cb..92039b8a37 100644
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: combobox.h
+// Name: wx/os2/combobox.h
// Purpose: wxComboBox class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h
index f00ca92c39..5bda492eb1 100644
--- a/include/wx/os2/cursor.h
+++ b/include/wx/os2/cursor.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cursor.h
+// Name: wx/os2/cursor.h
// Purpose: wxCursor class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/dataform.h b/include/wx/os2/dataform.h
index b28d059403..859ada2414 100644
--- a/include/wx/os2/dataform.h
+++ b/include/wx/os2/dataform.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: mac/dataform.h
+// Name: wx/os2/dataform.h
// Purpose: declaration of the wxDataFormat class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index 82ead95e43..dfe7c050a5 100644
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dc.h
+// Name: wx/os2/dc.h
// Purpose: wxDC class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h
index 3f0c81fc4a..f80673c34c 100644
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.h
+// Name: wx/os2/dcclient.h
// Purpose: wxClientDC class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index a67943ccc7..b4f268db1d 100644
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcmemory.h
+// Name: wx/os2/dcmemory.h
// Purpose: wxMemoryDC class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/dcscreen.h b/include/wx/os2/dcscreen.h
index 49435267f9..9b15277a43 100644
--- a/include/wx/os2/dcscreen.h
+++ b/include/wx/os2/dcscreen.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcscreen.h
+// Name: wx/os2/dcscreen.h
// Purpose: wxScreenDC class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/dirdlg.h b/include/wx/os2/dirdlg.h
index 756d6d41bc..8ddd29869d 100644
--- a/include/wx/os2/dirdlg.h
+++ b/include/wx/os2/dirdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dirdlg.h
+// Name: wx/os2/dirdlg.h
// Purpose: wxDirDialog class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/dnd.h b/include/wx/os2/dnd.h
index ee3c574515..9ead739ac4 100644
--- a/include/wx/os2/dnd.h
+++ b/include/wx/os2/dnd.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: dnd.h
+// Name: wx/os2/dnd.h
// Purpose: declaration of the wxDropTarget class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h
index e24836ad92..5613e1923a 100644
--- a/include/wx/os2/filedlg.h
+++ b/include/wx/os2/filedlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: filedlg.h
+// Name: wx/os2/filedlg.h
// Purpose: wxFileDialog class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 4b5e88ca4c..c79181518b 100644
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: frame.h
+// Name: wx/os2/frame.h
// Purpose: wxFrame class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index d289bc0f4c..4f2c392e99 100644
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: icon.h
+// Name: wx/os2/icon.h
// Purpose: wxIcon class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/iniconf.h b/include/wx/os2/iniconf.h
index da3ec325af..f3849403ff 100644
--- a/include/wx/os2/iniconf.h
+++ b/include/wx/os2/iniconf.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/msw/iniconf.h
+// Name: wx/os2/iniconf.h
// Purpose: INI-file based wxConfigBase implementation
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/joystick.h b/include/wx/os2/joystick.h
index ffd64308b8..e413692355 100644
--- a/include/wx/os2/joystick.h
+++ b/include/wx/os2/joystick.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: joystick.h
+// Name: wx/os2/joystick.h
// Purpose: wxJoystick class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/mdi.h b/include/wx/os2/mdi.h
index dfa7cfa50b..540fdb5528 100644
--- a/include/wx/os2/mdi.h
+++ b/include/wx/os2/mdi.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: mdi.h
+// Name: wx/os2/mdi.h
// Purpose: MDI (Multiple Document Interface) classes.
// This doesn't have to be implemented just like Windows,
// it could be a tabbed design as in wxGTK.
diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index 95ad8e33c9..dfc1df4947 100644
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: menu.h
+// Name: wx/os2/menu.h
// Purpose: wxMenu, wxMenuBar classes
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index ada9546705..157c3c417a 100644
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: metafile.h
+// Name: wx/os2/metafile.h
// Purpose: wxMetaFile, wxMetaFileDC classes.
// This probably should be restricted to Windows platforms,
// but if there is an equivalent on your platform, great.
diff --git a/include/wx/os2/minifram.h b/include/wx/os2/minifram.h
index b339730b0e..c7f705450e 100644
--- a/include/wx/os2/minifram.h
+++ b/include/wx/os2/minifram.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: minifram.h
+// Name: wx/os2/minifram.h
// Purpose: wxMiniFrame class. A small frame for e.g. floating toolbars.
// If there is no equivalent on your platform, just make it a
// normal frame.
diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h
index 405b1d2f0e..82a7601880 100644
--- a/include/wx/os2/notebook.h
+++ b/include/wx/os2/notebook.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: notebook.h
+// Name: wx/os2/notebook.h
// Purpose: MSW/GTK compatible notebook (a.k.a. property sheet)
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/print.h b/include/wx/os2/print.h
index 780d0cb16b..efd17ffdec 100644
--- a/include/wx/os2/print.h
+++ b/include/wx/os2/print.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: print.h
+// Name: wx/os2/print.h
// Purpose: wxPrinter, wxPrintPreview classes
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/printos2.h b/include/wx/os2/printos2.h
index 1a813cc91d..f066818cdb 100644
--- a/include/wx/os2/printos2.h
+++ b/include/wx/os2/printos2.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: print.h
+// Name: wx/os2/printos2.h
// Purpose: wxOS2Printer, wxOS2PrintPreview classes
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 7d1e8196fb..168967fa14 100644
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: radiobut.h
+// Name: wx/os2/radiobut.h
// Purpose: wxRadioButton class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h
index 856c1aa9ad..c02b992f44 100644
--- a/include/wx/os2/scrolbar.h
+++ b/include/wx/os2/scrolbar.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: scrollbar.h
+// Name: wx/os2/scrolbar.h
// Purpose: wxScrollBar class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index 92b7131037..05fc54887e 100644
--- a/include/wx/os2/slider.h
+++ b/include/wx/os2/slider.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: slider.h
+// Name: wx/os2/slider.h
// Purpose: wxSlider class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/sound.h b/include/wx/os2/sound.h
index bef454b460..43d09536ba 100644
--- a/include/wx/os2/sound.h
+++ b/include/wx/os2/sound.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: sound.h
+// Name: wx/os2/sound.h
// Purpose: wxSound class (loads and plays short Windows .wav files).
// Optional on non-Windows platforms.
// Author: David Webster
diff --git a/include/wx/os2/spinbutt.h b/include/wx/os2/spinbutt.h
index 1513ab8860..c4835c6a24 100644
--- a/include/wx/os2/spinbutt.h
+++ b/include/wx/os2/spinbutt.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.h
+// Name: wx/os2/spinbutt.h
// Purpose: wxSpinButton class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/spinctrl.h b/include/wx/os2/spinctrl.h
index 3b666a6452..18c478c72f 100644
--- a/include/wx/os2/spinctrl.h
+++ b/include/wx/os2/spinctrl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/spinctrl.h
+// Name: wx/os2/spinctrl.h
// Purpose: wxSpinCtrl class declaration for Win32
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h
index 0ea76ac9ce..724f23f859 100644
--- a/include/wx/os2/statbmp.h
+++ b/include/wx/os2/statbmp.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: statbmp.h
+// Name: wx/os2/statbmp.h
// Purpose: wxStaticBitmap class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/statbox.h b/include/wx/os2/statbox.h
index 7a2b733ecd..71fae0bf65 100644
--- a/include/wx/os2/statbox.h
+++ b/include/wx/os2/statbox.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: statbox.h
+// Name: wx/os2/statbox.h
// Purpose: wxStaticBox class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h
index 617e4ddf2e..1b0f6e99a6 100644
--- a/include/wx/os2/statline.h
+++ b/include/wx/os2/statline.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/statline.h
+// Name: wx/os2/statline.h
// Purpose: MSW version of wxStaticLine class
// Author: Vadim Zeitlin
// Created: 28.06.99
diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h
index 6832107804..c58cfe70c9 100644
--- a/include/wx/os2/stattext.h
+++ b/include/wx/os2/stattext.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: stattext.h
+// Name: wx/os2/stattext.h
// Purpose: wxStaticText class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/stdpaths.h b/include/wx/os2/stdpaths.h
index 7fb7fcf7fc..72ae2ea183 100644
--- a/include/wx/os2/stdpaths.h
+++ b/include/wx/os2/stdpaths.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/msw/stdpaths.h
+// Name: wx/os2/stdpaths.h
// Purpose: wxStandardPaths for OS/2
// Author: Stefan Neis
// Modified by:
diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index e00ff2433a..59a7570ad4 100644
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.h
+// Name: wx/os2/textctrl.h
// Purpose: wxTextCtrl class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index ab156e37f1..b38fb1579a 100644
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: toolbar.h
+// Name: wx/os2/toolbar.h
// Purpose: wxToolBar class
// Author: David Webster
// Modified by:
diff --git a/include/wx/os2/tooltip.h b/include/wx/os2/tooltip.h
index 7c4503d537..87368c4861 100644
--- a/include/wx/os2/tooltip.h
+++ b/include/wx/os2/tooltip.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/tooltip.h
+// Name: wx/os2/tooltip.h
// Purpose: wxToolTip class - tooltip control
// Author: David Webster
// Modified by:
diff --git a/include/wx/osx/accel.h b/include/wx/osx/accel.h
index 9434e19f6d..9df01e5230 100644
--- a/include/wx/osx/accel.h
+++ b/include/wx/osx/accel.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: accel.h
+// Name: wx/osx/accel.h
// Purpose: wxAcceleratorTable class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
index 901254c85f..47315c6b62 100644
--- a/include/wx/osx/app.h
+++ b/include/wx/osx/app.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: app.h
+// Name: wx/osx/app.h
// Purpose: wxApp class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index bcbeb51874..c799d9db5d 100644
--- a/include/wx/osx/bitmap.h
+++ b/include/wx/osx/bitmap.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: bitmap.h
+// Name: wx/osx/bitmap.h
// Purpose: wxBitmap class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index daf6081fbc..e55856496e 100644
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: bmpbuttn.h
+// Name: wx/osx/bmpbuttn.h
// Purpose: wxBitmapButton class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index 1d0353ef87..70b5054855 100644
--- a/include/wx/osx/button.h
+++ b/include/wx/osx/button.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: button.h
+// Name: wx/osx/button.h
// Purpose: wxButton class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/carbon/private/mactext.h b/include/wx/osx/carbon/private/mactext.h
index ff379bf991..f808348009 100644
--- a/include/wx/osx/carbon/private/mactext.h
+++ b/include/wx/osx/carbon/private/mactext.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: mactext.h
+// Name: wx/osx/carbon/private/mactext.h
// Purpose: private wxMacTextControl base class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h
index 282ee2a059..16546952fb 100644
--- a/include/wx/osx/carbon/region.h
+++ b/include/wx/osx/carbon/region.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: region.h
+// Name: wx/osx/carbon/region.h
// Purpose: wxRegion class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/carbon/statbmp.h b/include/wx/osx/carbon/statbmp.h
index 309d8c8a06..8666e780a1 100644
--- a/include/wx/osx/carbon/statbmp.h
+++ b/include/wx/osx/carbon/statbmp.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: statbmp.h
+// Name: wx/osx/carbon/statbmp.h
// Purpose: wxStaticBitmap class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h
index 871f1b9597..9d011c9553 100644
--- a/include/wx/osx/checkbox.h
+++ b/include/wx/osx/checkbox.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: checkbox.h
+// Name: wx/osx/checkbox.h
// Purpose: wxCheckBox class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/clipbrd.h b/include/wx/osx/clipbrd.h
index 930a5469c0..e5b6e07083 100644
--- a/include/wx/osx/clipbrd.h
+++ b/include/wx/osx/clipbrd.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: clipbrd.h
+// Name: wx/osx/clipbrd.h
// Purpose: Clipboard functionality.
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/cocoa/private/textimpl.h b/include/wx/osx/cocoa/private/textimpl.h
index 4404df8b3d..f50d555ca2 100644
--- a/include/wx/osx/cocoa/private/textimpl.h
+++ b/include/wx/osx/cocoa/private/textimpl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: textimpl.h
+// Name: wx/osx/cocoa/private/textimpl.h
// Purpose: textcontrol implementation classes that have to be exposed
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h
index 03311e0396..3d44ac1166 100644
--- a/include/wx/osx/config_xcode.h
+++ b/include/wx/osx/config_xcode.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: config_xcode.pch
+// Name: wx/osx/config_xcode.h
// Purpose: configurations for xcode builds
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/control.h b/include/wx/osx/control.h
index 123ab77554..5f1146aa33 100644
--- a/include/wx/osx/control.h
+++ b/include/wx/osx/control.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: control.h
+// Name: wx/osx/control.h
// Purpose: wxControl class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/core/joystick.h b/include/wx/osx/core/joystick.h
index a909070072..82fd638a62 100644
--- a/include/wx/osx/core/joystick.h
+++ b/include/wx/osx/core/joystick.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: joystick.h
+// Name: wx/osx/core/joystick.h
// Purpose: wxJoystick class
// Author: Ryan Norton
// Modified by:
diff --git a/include/wx/osx/dataform.h b/include/wx/osx/dataform.h
index 910dfc5fef..e7a3d5d58a 100644
--- a/include/wx/osx/dataform.h
+++ b/include/wx/osx/dataform.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: mac/dataform.h
+// Name: wx/osx/dataform.h
// Purpose: declaration of the wxDataFormat class
// Author: Stefan Csomor (lifted from dnd.h)
// Modified by:
diff --git a/include/wx/osx/dataobj.h b/include/wx/osx/dataobj.h
index 4b027bfe13..b01694a15e 100644
--- a/include/wx/osx/dataobj.h
+++ b/include/wx/osx/dataobj.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: mac/dataobj.h
+// Name: wx/osx/dataobj.h
// Purpose: declaration of the wxDataObject
// Author: Stefan Csomor (adapted from Robert Roebling's gtk port)
// Modified by:
diff --git a/include/wx/osx/dataobj2.h b/include/wx/osx/dataobj2.h
index 9b5d2e2dca..f967165309 100644
--- a/include/wx/osx/dataobj2.h
+++ b/include/wx/osx/dataobj2.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: mac/dataobj2.h
+// Name: wx/osx/dataobj2.h
// Purpose: declaration of standard wxDataObjectSimple-derived classes
// Author: David Webster (adapted from Robert Roebling's gtk port
// Modified by:
diff --git a/include/wx/osx/dc.h b/include/wx/osx/dc.h
index 1e66662f2c..524642cdcf 100644
--- a/include/wx/osx/dc.h
+++ b/include/wx/osx/dc.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dc.h
+// Name: wx/osx/dc.h
// Purpose: wxDC class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/dcclient.h b/include/wx/osx/dcclient.h
index a039a144ef..4be10a57f1 100644
--- a/include/wx/osx/dcclient.h
+++ b/include/wx/osx/dcclient.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.h
+// Name: wx/osx/dcclient.h
// Purpose: wxClientDC, wxPaintDC and wxWindowDC classes
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h
index 52a501715e..9725026777 100644
--- a/include/wx/osx/dcmemory.h
+++ b/include/wx/osx/dcmemory.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcmemory.h
+// Name: wx/osx/dcmemory.h
// Purpose: wxMemoryDC class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h
index 50e8221d86..fbcd9083d6 100644
--- a/include/wx/osx/dcscreen.h
+++ b/include/wx/osx/dcscreen.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcscreen.h
+// Name: wx/osx/dcscreen.h
// Purpose: wxScreenDC class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h
index 8b7a24f2bd..9efc8a59d2 100644
--- a/include/wx/osx/dialog.h
+++ b/include/wx/osx/dialog.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.h
+// Name: wx/osx/dialog.h
// Purpose: wxDialog class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/dirdlg.h b/include/wx/osx/dirdlg.h
index e88f4bfb4d..584527f622 100644
--- a/include/wx/osx/dirdlg.h
+++ b/include/wx/osx/dirdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dirdlg.h
+// Name: wx/osx/dirdlg.h
// Purpose: wxDirDialog class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h
index faf901a6d5..5ddc524e76 100644
--- a/include/wx/osx/filedlg.h
+++ b/include/wx/osx/filedlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: filedlg.h
+// Name: wx/osx/filedlg.h
// Purpose: wxFileDialog class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index 8791b4897a..7eb86a6809 100644
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: font.h
+// Name: wx/osx/font.h
// Purpose: wxFont class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index 171fe8ea66..21693f7cfc 100644
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: frame.h
+// Name: wx/osx/frame.h
// Purpose: wxFrame class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h
index e5df162c97..dae3b5c495 100644
--- a/include/wx/osx/gauge.h
+++ b/include/wx/osx/gauge.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gauge.h
+// Name: wx/osx/gauge.h
// Purpose: wxGauge class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/helpxxxx.h b/include/wx/osx/helpxxxx.h
index 7bb66c7cba..fddd578dd6 100644
--- a/include/wx/osx/helpxxxx.h
+++ b/include/wx/osx/helpxxxx.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helpxxxx.h
+// Name: wx/osx/helpxxxx.h
// Purpose: Help system: native implementation for your system. Replace
// XXXX with suitable name.
// Author: Stefan Csomor
diff --git a/include/wx/osx/icon.h b/include/wx/osx/icon.h
index d552bf8995..d0b2d80be8 100644
--- a/include/wx/osx/icon.h
+++ b/include/wx/osx/icon.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: icon.h
+// Name: wx/osx/icon.h
// Purpose: wxIcon class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/imaglist.h b/include/wx/osx/imaglist.h
index b56242db12..0405f4cd43 100644
--- a/include/wx/osx/imaglist.h
+++ b/include/wx/osx/imaglist.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: imaglist.h
+// Name: wx/osx/imaglist.h
// Purpose:
// Author: Robert Roebling, Stefan Csomor
// Created: 01/02/97
diff --git a/include/wx/osx/iphone/private/textimpl.h b/include/wx/osx/iphone/private/textimpl.h
index c56576e622..1bd750f996 100644
--- a/include/wx/osx/iphone/private/textimpl.h
+++ b/include/wx/osx/iphone/private/textimpl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: textimpl.h
+// Name: wx/osx/iphone/private/textimpl.h
// Purpose: textcontrol implementation classes that have to be exposed
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/joystick.h b/include/wx/osx/joystick.h
index 94de2470e1..da1ba5bf3c 100644
--- a/include/wx/osx/joystick.h
+++ b/include/wx/osx/joystick.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: joystick.h
+// Name: wx/osx/joystick.h
// Purpose: wxJoystick class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h
index de0ef92175..46b876f3b4 100644
--- a/include/wx/osx/listctrl.h
+++ b/include/wx/osx/listctrl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: listctrl.h
+// Name: wx/osx/listctrl.h
// Purpose: wxListCtrl class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h
index 97b4ce320d..55796749a1 100644
--- a/include/wx/osx/menu.h
+++ b/include/wx/osx/menu.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: menu.h
+// Name: wx/osx/menu.h
// Purpose: wxMenu, wxMenuBar classes
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h
index 383af9e2f4..01f8734b08 100644
--- a/include/wx/osx/metafile.h
+++ b/include/wx/osx/metafile.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: metafile.h
+// Name: wx/osx/metafile.h
// Purpose: wxMetaFile, wxMetaFileDC classes.
// This probably should be restricted to Windows platforms,
// but if there is an equivalent on your platform, great.
diff --git a/include/wx/osx/minifram.h b/include/wx/osx/minifram.h
index a71887c579..2baaa5a859 100644
--- a/include/wx/osx/minifram.h
+++ b/include/wx/osx/minifram.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: minifram.h
+// Name: wx/osx/minifram.h
// Purpose: wxMiniFrame class. A small frame for e.g. floating toolbars.
// If there is no equivalent on your platform, just make it a
// normal frame.
diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h
index 8082d3075b..3447388f95 100644
--- a/include/wx/osx/notebook.h
+++ b/include/wx/osx/notebook.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: notebook.h
+// Name: wx/osx/notebook.h
// Purpose: MSW/GTK compatible notebook (a.k.a. property sheet)
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/pnghand.h b/include/wx/osx/pnghand.h
index a91fd69c85..6d31539e29 100644
--- a/include/wx/osx/pnghand.h
+++ b/include/wx/osx/pnghand.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: pnghand.h
+// Name: wx/osx/pnghand.h
// Purpose: PNG bitmap handler
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/osx/printmac.h b/include/wx/osx/printmac.h
index d7f168c2eb..05a7ef48e6 100644
--- a/include/wx/osx/printmac.h
+++ b/include/wx/osx/printmac.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: printwin.h
+// Name: wx/osx/printmac.h
// Purpose: wxWindowsPrinter, wxWindowsPrintPreview classes
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h
index 54e4fa34d6..ec8360e4ab 100644
--- a/include/wx/osx/radiobut.h
+++ b/include/wx/osx/radiobut.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: radiobut.h
+// Name: wx/osx/radiobut.h
// Purpose: wxRadioButton class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/scrolbar.h b/include/wx/osx/scrolbar.h
index 0a5d126801..1fa577a94f 100644
--- a/include/wx/osx/scrolbar.h
+++ b/include/wx/osx/scrolbar.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: scrollbar.h
+// Name: wx/osx/scrolbar.h
// Purpose: wxScrollBar class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index 5ed9112a04..ab20a410fc 100644
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: setup.h
+// Name: wx/osx/setup.h
// Purpose: Configuration for the library
// Author: Stefan Csomor
// Modified by: Stefan Csomor
diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h
index f85fff7be2..b4f4cdf8b4 100644
--- a/include/wx/osx/slider.h
+++ b/include/wx/osx/slider.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: slider.h
+// Name: wx/osx/slider.h
// Purpose: wxSlider class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/sound.h b/include/wx/osx/sound.h
index edd8a03bfd..d9da4e1eca 100644
--- a/include/wx/osx/sound.h
+++ b/include/wx/osx/sound.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: sound.h
+// Name: wx/osx/sound.h
// Purpose: wxSound class (loads and plays short Windows .wav files).
// Optional on non-Windows platforms.
// Author: Ryan Norton, Stefan Csomor
diff --git a/include/wx/osx/spinbutt.h b/include/wx/osx/spinbutt.h
index e6668e2efc..69dd3af375 100644
--- a/include/wx/osx/spinbutt.h
+++ b/include/wx/osx/spinbutt.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.h
+// Name: wx/osx/spinbutt.h
// Purpose: wxSpinButton class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/spinctrl.h b/include/wx/osx/spinctrl.h
index c9bd5422a0..f95b0c10f2 100644
--- a/include/wx/osx/spinctrl.h
+++ b/include/wx/osx/spinctrl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/generic/spinctlg.h
+// Name: wx/osx/spinctrl.h
// Purpose: generic wxSpinCtrl class
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h
index 429cc1fd9d..ab105ea79a 100644
--- a/include/wx/osx/statbox.h
+++ b/include/wx/osx/statbox.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: statbox.h
+// Name: wx/osx/statbox.h
// Purpose: wxStaticBox class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/osx/statline.h b/include/wx/osx/statline.h
index 29de9f2a54..3049a15c78 100644
--- a/include/wx/osx/statline.h
+++ b/include/wx/osx/statline.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: mac/statline.h
+// Name: wx/osx/statline.h
// Purpose: a generic wxStaticLine class used for mac before adaptation
// Author: Vadim Zeitlin
// Created: 28.06.99
diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h
index fe366452a4..d83a51d874 100644
--- a/include/wx/osx/stattext.h
+++ b/include/wx/osx/stattext.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: stattext.h
+// Name: wx/osx/stattext.h
// Purpose: wxStaticText class
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 7fa15578a6..2c0fae9858 100644
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: ownerdrw.h
+// Name: wx/ownerdrw.h
// Purpose: interface for owner-drawn GUI elements
// Author: Vadim Zeitlin
// Modified by: Marcin Malich
diff --git a/include/wx/palmos/help.h b/include/wx/palmos/help.h
index 379c5bf7d9..438f77d8a1 100644
--- a/include/wx/palmos/help.h
+++ b/include/wx/palmos/help.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/palmos/helpwin.h
+// Name: wx/palmos/help.h
// Purpose: Help system: WinHelp implementation
// Author: William Osborne - minimal working wxPalmOS port
// Modified by:
diff --git a/include/wx/palmos/missing.h b/include/wx/palmos/missing.h
index 0d0105fb2f..3246415755 100644
--- a/include/wx/palmos/missing.h
+++ b/include/wx/palmos/missing.h
@@ -1,5 +1,5 @@
/******************************************************************************
- * Name: include/wx/palmos/missing.h
+ * Name: wx/palmos/missing.h
* Purpose: the missing declarations for wxPalm
* Author: Yunhui Fu
* Created: 2007-10-18
diff --git a/include/wx/palmos/scrolbar.h b/include/wx/palmos/scrolbar.h
index e0c3624fa9..d706e06052 100644
--- a/include/wx/palmos/scrolbar.h
+++ b/include/wx/palmos/scrolbar.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/palmos/scrollbar.h
+// Name: wx/palmos/scrolbar.h
// Purpose: wxScrollBar class
// Author: William Osborne - minimal working wxPalmOS port
// Modified by:
diff --git a/include/wx/paper.h b/include/wx/paper.h
index 5b42a80bed..1d65049146 100644
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: paper.h
+// Name: wx/paper.h
// Purpose: Paper database types and classes
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/private/sckaddr.h b/include/wx/private/sckaddr.h
index a0e0ec4ee1..2ad7b6b2df 100644
--- a/include/wx/private/sckaddr.h
+++ b/include/wx/private/sckaddr.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/private/sockaddr.h
+// Name: wx/private/sckaddr.h
// Purpose: wxSockAddressImpl
// Author: Vadim Zeitlin
// Created: 2008-12-28
diff --git a/include/wx/private/timer.h b/include/wx/private/timer.h
index ffc2758a72..37da967692 100644
--- a/include/wx/private/timer.h
+++ b/include/wx/private/timer.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/private/timerimpl.h
+// Name: wx/private/timer.h
// Purpose: Base class for wxTimer implementations
// Author: Lukasz Michalski <lmichalski@sf.net>
// Created: 31.10.2006
diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 5be24550c7..4c47b77512 100644
--- a/include/wx/propgrid/propgridiface.h
+++ b/include/wx/propgrid/propgridiface.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/propgeid/propgridiface.h
+// Name: wx/propgrid/propgridiface.h
// Purpose: wxPropertyGridInterface class
// Author: Jaakko Salli
// Modified by:
diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h
index b0e7e003a8..086ef75e3a 100644
--- a/include/wx/protocol/file.h
+++ b/include/wx/protocol/file.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: file.h
+// Name: wx/protocol/file.h
// Purpose: File protocol
// Author: Guilhem Lavaux
// Modified by:
diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index 186e21ffdd..67cebe1430 100644
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: ftp.h
+// Name: wx/protocol/ftp.h
// Purpose: FTP protocol
// Author: Vadim Zeitlin
// Modified by: Mark Johnson, wxWindows@mj10777.de
diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 9505acdb6d..8d3308b7f7 100644
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: http.h
+// Name: wx/protocol/http.h
// Purpose: HTTP protocol
// Author: Guilhem Lavaux
// Modified by: Simo Virokannas (authentication, Dec 2005)
diff --git a/include/wx/richtext/richtextbackgroundpage.h b/include/wx/richtext/richtextbackgroundpage.h
index f2b1cc8bd3..e73b427882 100644
--- a/include/wx/richtext/richtextbackgroundpage.h
+++ b/include/wx/richtext/richtextbackgroundpage.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: richtextbackgroundpage.h
+// Name: wx/richtext/richtextbackgroundpage.h
// Purpose:
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/richtext/richtextborderspage.h b/include/wx/richtext/richtextborderspage.h
index 4452d78921..2bd0f3bedc 100644
--- a/include/wx/richtext/richtextborderspage.h
+++ b/include/wx/richtext/richtextborderspage.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: richtextborderspage.h
+// Name: wx/richtext/richtextborderspage.h
// Purpose:
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/richtext/richtextfontpage.h b/include/wx/richtext/richtextfontpage.h
index 28e005d0a2..9123be10ea 100644
--- a/include/wx/richtext/richtextfontpage.h
+++ b/include/wx/richtext/richtextfontpage.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/richtext/richeditfontpage.h
+// Name: wx/richtext/richtextfontpage.h
// Purpose: Font page for wxRichTextFormattingDialog
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/richtext/richtextmarginspage.h b/include/wx/richtext/richtextmarginspage.h
index b05f385146..336316c269 100644
--- a/include/wx/richtext/richtextmarginspage.h
+++ b/include/wx/richtext/richtextmarginspage.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: richtextmarginspage.h
+// Name: wx/richtext/richtextmarginspage.h
// Purpose:
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/richtext/richtextsizepage.h b/include/wx/richtext/richtextsizepage.h
index ba2fb76733..42007fce1f 100644
--- a/include/wx/richtext/richtextsizepage.h
+++ b/include/wx/richtext/richtextsizepage.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: richtextsizepage.h
+// Name: wx/richtext/richtextsizepage.h
// Purpose:
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/richtext/richtextxml.h b/include/wx/richtext/richtextxml.h
index baf52c79a2..afe4e5ace2 100644
--- a/include/wx/richtext/richtextxml.h
+++ b/include/wx/richtext/richtextxml.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/richtext/richeditxml.h
+// Name: wx/richtext/richtextxml.h
// Purpose: XML and HTML I/O for wxRichTextCtrl
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 6eccefc84a..d446cc4700 100644
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: sckipc.h
+// Name: wx/sckipc.h
// Purpose: Interprocess communication implementation (wxSocket version)
// Author: Julian Smart
// Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 5ee90ae3dd..c33e6143b7 100644
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: sckstrm.h
+// Name: wx/sckstrm.h
// Purpose: wxSocket*Stream
// Author: Guilhem Lavaux
// Modified by:
diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 7e28e8936b..f63573c0cb 100644
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: scrolbar.h
+// Name: wx/scrolbar.h
// Purpose: wxScrollBar base header
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/socket.h b/include/wx/socket.h
index e978b5ca80..35370059e7 100644
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: socket.h
+// Name: wx/socket.h
// Purpose: Socket handling classes
// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia
// Modified by:
diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 489f076d81..91e9a39a05 100644
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: spinctrl.h
+// Name: wx/spinctrl.h
// Purpose: wxSpinCtrlBase class
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index 9b08f60a14..2a1c0ba412 100644
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: srchctrl.h
+// Name: wx/srchctrl.h
// Purpose: wxSearchCtrlBase class
// Author: Vince Harron
// Created: 2006-02-18
diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 2b3683d3d7..8c4043b23c 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: statbox.h
+// Name: wx/statbox.h
// Purpose: wxStaticBox base header
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 00a92105fe..2af37abf8b 100644
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: stattext.h
+// Name: wx/stattext.h
// Purpose: wxStaticText base header
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 7ebd113f08..9ec0cdbc61 100644
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: strconv.h
+// Name: wx/strconv.h
// Purpose: conversion routines for char sets any Unicode
// Author: Ove Kaaven, Robert Roebling, Vadim Zeitlin
// Modified by:
diff --git a/include/wx/sysopt.h b/include/wx/sysopt.h
index f0eee94229..5dde52c6dd 100644
--- a/include/wx/sysopt.h
+++ b/include/wx/sysopt.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: sysopt.h
+// Name: wx/sysopt.h
// Purpose: wxSystemOptions
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/textdlg.h b/include/wx/textdlg.h
index 26e322b73b..ab62572006 100644
--- a/include/wx/textdlg.h
+++ b/include/wx/textdlg.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: textdlg.h
+// Name: wx/textdlg.h
// Purpose: wxTextEntryDialog class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/thrimpl.cpp b/include/wx/thrimpl.cpp
index 3e3cb3cea8..0874cd186c 100644
--- a/include/wx/thrimpl.cpp
+++ b/include/wx/thrimpl.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: include/wx/thrimpl.cpp
+// Name: wx/thrimpl.cpp
// Purpose: common part of wxThread Implementations
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/tipdlg.h b/include/wx/tipdlg.h
index 5f5ecc6c30..3c99c6d135 100644
--- a/include/wx/tipdlg.h
+++ b/include/wx/tipdlg.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: tipdlg.h
+// Name: wx/tipdlg.h
// Purpose: declaration of wxTipDialog
// Author: Vadim Zeitlin
// Modified by:
diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index 4f9af4be4b..e761cfe2e4 100644
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: tooltip.h
+// Name: wx/tooltip.h
// Purpose: wxToolTip base header
// Author: Robert Roebling
// Modified by:
diff --git a/include/wx/types.h b/include/wx/types.h
index c7917efbe7..145b53ecbe 100644
--- a/include/wx/types.h
+++ b/include/wx/types.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: types.h
+// Name: wx/types.h
// Purpose: Type identifiers, used by resource system
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h
index 0f9d7f6758..07ac1bbca1 100644
--- a/include/wx/univ/dialog.h
+++ b/include/wx/univ/dialog.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.h
+// Name: wx/univ/dialog.h
// Purpose: wxDialog class
// Author: Vaclav Slavik
// Created: 2001/09/16
diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h
index c4d9e5b0d7..07b310cf30 100644
--- a/include/wx/univ/tglbtn.h
+++ b/include/wx/univ/tglbtn.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/univ/button.h
+// Name: wx/univ/tglbtn.h
// Purpose: wxToggleButton for wxUniversal
// Author: Vadim Zeitlin
// Modified by: David Bjorkevik
diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index 242a46dc38..bdfe00b274 100644
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/toplevel.h
+// Name: wx/univ/toplevel.h
// Purpose: Top level window, abstraction of wxFrame and wxDialog
// Author: Vaclav Slavik
// Id: $Id$
diff --git a/include/wx/unix/execute.h b/include/wx/unix/execute.h
index 9ef14902c5..418fa246d5 100644
--- a/include/wx/unix/execute.h
+++ b/include/wx/unix/execute.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: unix/execute.h
+// Name: wx/unix/execute.h
// Purpose: private details of wxExecute() implementation
// Author: Vadim Zeitlin
// Id: $Id$
diff --git a/include/wx/unix/private/epolldispatcher.h b/include/wx/unix/private/epolldispatcher.h
index e32df9cce6..dbffb924dc 100644
--- a/include/wx/unix/private/epolldispatcher.h
+++ b/include/wx/unix/private/epolldispatcher.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/private/epolldispatcher.h
+// Name: wx/unix/private/epolldispatcher.h
// Purpose: wxEpollDispatcher class
// Authors: Lukasz Michalski
// Created: April 2007
diff --git a/include/wx/url.h b/include/wx/url.h
index 71189f1830..171efe8562 100644
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: url.h
+// Name: wx/url.h
// Purpose: URL parser
// Author: Guilhem Lavaux
// Modified by: Ryan Norton
diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 63324a1962..b0adefaf17 100644
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: valgen.h
+// Name: wx/valgen.h
// Purpose: wxGenericValidator class
// Author: Kevin Smith
// Created: Jan 22 1999
diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 34efdbea5a..4b9be083ae 100644
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: valtext.h
+// Name: wx/valtext.h
// Purpose: wxTextValidator class
// Author: Julian Smart
// Modified by: Francesco Montorsi
diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index f1930176ae..0c2453ca83 100644
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wizard.h
+// Name: wx/wizard.h
// Purpose: wxWizard class: a GUI control presenting the user with a
// sequence of dialogs which allows to simply perform some task
// Author: Vadim Zeitlin (partly based on work by Ron Kuris and Kevin B.
diff --git a/include/wx/wx_cw.h b/include/wx/wx_cw.h
index 2c902ecf5e..0ac04aefed 100644
--- a/include/wx/wx_cw.h
+++ b/include/wx/wx_cw.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw.h
+// Name: wx/wx_cw.h
// Purpose: wxWidgets definitions for CodeWarrior builds
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wx_cw_d.h b/include/wx/wx_cw_d.h
index feb4c57fcc..8b95fd9b70 100644
--- a/include/wx/wx_cw_d.h
+++ b/include/wx/wx_cw_d.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw_d.h
+// Name: wx/wx_cw_d.h
// Purpose: wxWidgets definitions for CodeWarrior builds (Debug)
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h
index 0430251bd5..b9374e4eac 100644
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw.h
+// Name: wx/wx_cwc.h
// Purpose: wxWidgets definitions for CodeWarrior builds
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wx_cwc_d.h b/include/wx/wx_cwc_d.h
index 6ad6156616..6f14de1dfa 100644
--- a/include/wx/wx_cwc_d.h
+++ b/include/wx/wx_cwc_d.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw_d.h
+// Name: wx/wx_cwc_d.h
// Purpose: wxWidgets definitions for CodeWarrior builds (Debug)
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wx_cwu_d.h b/include/wx/wx_cwu_d.h
index fa3526ca85..8a63fc7030 100644
--- a/include/wx/wx_cwu_d.h
+++ b/include/wx/wx_cwu_d.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw_d.h
+// Name: wx/wx_cwu_d.h
// Purpose: wxWidgets definitions for CodeWarrior builds (Debug)
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wxhtml.h b/include/wx/wxhtml.h
index 532916f94c..61e168478d 100644
--- a/include/wx/wxhtml.h
+++ b/include/wx/wxhtml.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wxhtml.h
+// Name: wx/wxhtml.h
// Purpose: wxHTML library for wxWidgets
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/include/wx/wxshlb_cw.h b/include/wx/wxshlb_cw.h
index 8929cd51dd..8af777fcfe 100644
--- a/include/wx/wxshlb_cw.h
+++ b/include/wx/wxshlb_cw.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw.h
+// Name: wx/wxshlb_cw.h
// Purpose: wxWidgets definitions for CodeWarrior builds
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wxshlb_cw_d.h b/include/wx/wxshlb_cw_d.h
index 1bfce4de5b..234e9f73c1 100644
--- a/include/wx/wxshlb_cw_d.h
+++ b/include/wx/wxshlb_cw_d.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw_d.h
+// Name: wx/wxshlb_cw_d.h
// Purpose: wxWidgets definitions for CodeWarrior builds (Debug)
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wxshlb_cwc.h b/include/wx/wxshlb_cwc.h
index fa1f1cdeb6..de270482ff 100644
--- a/include/wx/wxshlb_cwc.h
+++ b/include/wx/wxshlb_cwc.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw.h
+// Name: wx/wxshlb_cwc.h
// Purpose: wxWidgets definitions for CodeWarrior builds
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wxshlb_cwc_d.h b/include/wx/wxshlb_cwc_d.h
index cefa8690e7..13a169eace 100644
--- a/include/wx/wxshlb_cwc_d.h
+++ b/include/wx/wxshlb_cwc_d.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw_d.h
+// Name: wx/wxshlb_cwc_d.h
// Purpose: wxWidgets definitions for CodeWarrior builds (Debug)
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wxshlba_cw.h b/include/wx/wxshlba_cw.h
index cdef0340ca..a9c9fcfaaa 100644
--- a/include/wx/wxshlba_cw.h
+++ b/include/wx/wxshlba_cw.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw.h
+// Name: wx/wxshlba_cw.h
// Purpose: wxWidgets definitions for CodeWarrior builds
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wxshlba_cw_d.h b/include/wx/wxshlba_cw_d.h
index 13ba33ff2e..6460efddde 100644
--- a/include/wx/wxshlba_cw_d.h
+++ b/include/wx/wxshlba_cw_d.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw_d.h
+// Name: wx/wxshlba_cw_d.h
// Purpose: wxWidgets definitions for CodeWarrior builds (Debug)
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wxshlba_cwc.h b/include/wx/wxshlba_cwc.h
index 32d97a6194..09234deb58 100644
--- a/include/wx/wxshlba_cwc.h
+++ b/include/wx/wxshlba_cwc.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw.h
+// Name: wx/wxshlba_cwc.h
// Purpose: wxWidgets definitions for CodeWarrior builds
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/wxshlba_cwc_d.h b/include/wx/wxshlba_cwc_d.h
index 88fcc0c882..200f014770 100644
--- a/include/wx/wxshlba_cwc_d.h
+++ b/include/wx/wxshlba_cwc_d.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx_cw_d.h
+// Name: wx/wxshlba_cwc_d.h
// Purpose: wxWidgets definitions for CodeWarrior builds (Debug)
// Author: Stefan Csomor
// Modified by:
diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 6ae61b96c2..8b5d956aca 100644
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: x11/bitmap.h
+// Name: wx/x11/bitmap.h
// Purpose: wxBitmap class
// Author: Julian Smart, Robert Roebling
// Modified by:
diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h
index 3c3152c732..66cfa711fa 100644
--- a/include/wx/x11/dataform.h
+++ b/include/wx/x11/dataform.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: motif/dataform.h
+// Name: wx/x11/dataform.h
// Purpose: declaration of the wxDataFormat class
// Author: Robert Roebling
// Modified by:
diff --git a/include/wx/x11/dataobj.h b/include/wx/x11/dataobj.h
index 068cedbbf0..3c7b53bb2f 100644
--- a/include/wx/x11/dataobj.h
+++ b/include/wx/x11/dataobj.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/motif/dataobj.h
+// Name: wx/x11/dataobj.h
// Purpose: declaration of the wxDataObject class for Motif
// Author: Julian Smart
// RCS-ID: $Id$
diff --git a/include/wx/x11/dataobj2.h b/include/wx/x11/dataobj2.h
index b1d027439c..4be7569fac 100644
--- a/include/wx/x11/dataobj2.h
+++ b/include/wx/x11/dataobj2.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/dataobj2.h
+// Name: wx/x11/dataobj2.h
// Purpose: declaration of standard wxDataObjectSimple-derived classes
// Author: Robert Roebling
// Created: 19.10.99 (extracted from gtk/dataobj.h)
diff --git a/include/wx/x11/dc.h b/include/wx/x11/dc.h
index c8fabd9225..c8d570bb32 100644
--- a/include/wx/x11/dc.h
+++ b/include/wx/x11/dc.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dc.h
+// Name: wx/x11/dc.h
// Purpose: wxDC class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index 951c030b12..9850e700ca 100644
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.h
+// Name: wx/x11/dcclient.h
// Purpose: wxClientDC, wxPaintDC and wxWindowDC classes
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h
index 30ed3ab846..fa2a806215 100644
--- a/include/wx/x11/dcmemory.h
+++ b/include/wx/x11/dcmemory.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dcmemory.h
+// Name: wx/x11/dcmemory.h
// Purpose: wxMemoryDC class
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/x11/dnd.h b/include/wx/x11/dnd.h
index 69ab60ddeb..07d88e2a3e 100644
--- a/include/wx/x11/dnd.h
+++ b/include/wx/x11/dnd.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: dnd.h
+// Name: wx/x11/dnd.h
// Purpose: declaration of wxDropTarget, wxDropSource classes
// Author: Julian Smart
// RCS-ID: $Id$
diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h
index 69feea7844..28a423dd41 100644
--- a/include/wx/x11/popupwin.h
+++ b/include/wx/x11/popupwin.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: popupwin.h
+// Name: wx/x11/popupwin.h
// Purpose:
// Author: Robert Roebling
// Created:
diff --git a/include/wx/x11/private.h b/include/wx/x11/private.h
index 6422308b63..0e8f9c6e15 100644
--- a/include/wx/x11/private.h
+++ b/include/wx/x11/private.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: private.h
+// Name: wx/x11/private.h
// Purpose: Private declarations for X11 port
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h
index 412e64e26c..7cfd8616ad 100644
--- a/include/wx/x11/privx.h
+++ b/include/wx/x11/privx.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: privx.h
+// Name: wx/x11/privx.h
// Purpose: Private declarations common to X11 and Motif ports
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index 500e2eaf49..32dc594797 100644
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: reparent.h
+// Name: wx/x11/reparent.h
// Purpose: Reparenting classes
// Author: Julian Smart
// Modified by:
diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h
index 6cac2aac77..c23a9bcd97 100644
--- a/include/wx/xml/xml.h
+++ b/include/wx/xml/xml.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: xml.h
+// Name: wx/xml/xml.h
// Purpose: wxXmlDocument - XML parser & data holder class
// Author: Vaclav Slavik
// Created: 2000/03/05
diff --git a/include/wx/xrc/xh_richtext.h b/include/wx/xrc/xh_richtext.h
index c1c30fc267..910d0fe0a5 100644
--- a/include/wx/xrc/xh_richtext.h
+++ b/include/wx/xrc/xh_richtext.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/xrc/xh_text.h
+// Name: wx/xrc/xh_richtext.h
// Purpose: XML resource handler for wxRichTextCtrl
// Author: Julian Smart
// Created: 2006-11-08
diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 505e809bf7..cb1903a287 100644
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/aui/dockart.cpp
+// Name: src/aui/auibar.cpp
// Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams
// Modified by:
diff --git a/src/cocoa/NSBox.mm b/src/cocoa/NSBox.mm
index c3a8657ace..03f820fee6 100644
--- a/src/cocoa/NSBox.mm
+++ b/src/cocoa/NSBox.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSBox.mm
+// Name: src/cocoa/NSBox.mm
// Purpose: wxCocoaNSBox
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/NSButton.mm b/src/cocoa/NSButton.mm
index dee81818a1..a7bc9d10a2 100644
--- a/src/cocoa/NSButton.mm
+++ b/src/cocoa/NSButton.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSButton.cpp
+// Name: src/cocoa/NSButton.mm
// Purpose: wxCocoaNSButton
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/NSControl.mm b/src/cocoa/NSControl.mm
index 9e1d550329..0bcac4f44b 100644
--- a/src/cocoa/NSControl.mm
+++ b/src/cocoa/NSControl.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSControl.cpp
+// Name: src/cocoa/NSControl.mm
// Purpose: wxCocoaNSControl
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index c5a55f9c3a..4060f544a5 100644
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSMenu.mm
+// Name: src/cocoa/NSMenu.mm
// Purpose: wxCocoaNSMenu implementation
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/NSScroller.mm b/src/cocoa/NSScroller.mm
index 356391e276..f3219bfbc1 100644
--- a/src/cocoa/NSScroller.mm
+++ b/src/cocoa/NSScroller.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSScroller.mm
+// Name: src/cocoa/NSScroller.mm
// Purpose: wxCocoaNSScroller
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/NSTabView.mm b/src/cocoa/NSTabView.mm
index 5bff3eda3e..1a36858eba 100644
--- a/src/cocoa/NSTabView.mm
+++ b/src/cocoa/NSTabView.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSTabView.mm
+// Name: src/cocoa/NSTabView.mm
// Purpose: wxCocoaNSTabView
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/NSTableView.mm b/src/cocoa/NSTableView.mm
index 45843570ba..1241a2c9da 100644
--- a/src/cocoa/NSTableView.mm
+++ b/src/cocoa/NSTableView.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSTableView.mm
+// Name: src/cocoa/NSTableView.mm
// Purpose: wxCocoaNSTableView / wxCocoaNSTableDataSource
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/NSTextField.mm b/src/cocoa/NSTextField.mm
index 9f49488832..d619ce2dac 100644
--- a/src/cocoa/NSTextField.mm
+++ b/src/cocoa/NSTextField.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSTextField.mm
+// Name: src/cocoa/NSTextField.mm
// Purpose: wxCocoaNSTextField
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm
index c37ebfb200..9e9dcd9ca5 100644
--- a/src/cocoa/NSView.mm
+++ b/src/cocoa/NSView.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSView.mm
+// Name: src/cocoa/NSView.mm
// Purpose: wxCocoaNSView
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/ObjcRef.mm b/src/cocoa/ObjcRef.mm
index 6bff7b69c9..5f3189bc74 100644
--- a/src/cocoa/ObjcRef.mm
+++ b/src/cocoa/ObjcRef.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/ObjcRef.mm
+// Name: src/cocoa/ObjcRef.mm
// Purpose: wxObjcAutoRefBase implementation
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/data.cpp b/src/cocoa/data.cpp
index 6880f7295c..28cfb91501 100644
--- a/src/cocoa/data.cpp
+++ b/src/cocoa/data.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: data.cpp
+// Name: src/cocoa/data.cpp
// Purpose: Various data
// Author: AUTHOR
// Modified by:
diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index b765007777..a017688edc 100644
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/evtloop.mm
+// Name: src/cocoa/evtloop.mm
// Purpose: implements wxEventLoop for Cocoa
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/font.mm b/src/cocoa/font.mm
index d46eae106c..c7297d8aa3 100644
--- a/src/cocoa/font.mm
+++ b/src/cocoa/font.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/cocoa/font.cpp
+// Name: src/cocoa/font.mm
// Purpose: wxFont class
// Author: AUTHOR
// Modified by:
diff --git a/src/cocoa/glcanvas.mm b/src/cocoa/glcanvas.mm
index c8ff4e1c63..612c05dddc 100644
--- a/src/cocoa/glcanvas.mm
+++ b/src/cocoa/glcanvas.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/glcanvas.mm
+// Name: src/cocoa/glcanvas.mm
// Purpose: wxGLContext, wxGLCanvas
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/mbarman.mm b/src/cocoa/mbarman.mm
index 460e2f1a95..1f0e5c71f8 100644
--- a/src/cocoa/mbarman.mm
+++ b/src/cocoa/mbarman.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/mbarman.cpp
+// Name: src/cocoa/mbarman.mm
// Purpose: wxMenuBarManager implementation
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/mediactrl.mm b/src/cocoa/mediactrl.mm
index 46f2ef177a..62348e0392 100644
--- a/src/cocoa/mediactrl.mm
+++ b/src/cocoa/mediactrl.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/cocoa/mediactrl.cpp
+// Name: src/cocoa/mediactrl.mm
// Purpose: Built-in Media Backends for Cocoa
// Author: Ryan Norton <wxprojects@comcast.net>
// Modified by:
diff --git a/src/cocoa/menu.mm b/src/cocoa/menu.mm
index 6cba68a8e6..b02bb35b34 100644
--- a/src/cocoa/menu.mm
+++ b/src/cocoa/menu.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/cocoa/menu.cpp
+// Name: src/cocoa/menu.mm
// Purpose: wxMenu and wxMenuBar implementation
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/notebook.mm b/src/cocoa/notebook.mm
index 78c3d9d7ce..0a892ca2f3 100644
--- a/src/cocoa/notebook.mm
+++ b/src/cocoa/notebook.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/notebook.mm
+// Name: src/cocoa/notebook.mm
// Purpose: wxNotebook
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/sound.mm b/src/cocoa/sound.mm
index b41f82dda9..aad32611f3 100644
--- a/src/cocoa/sound.mm
+++ b/src/cocoa/sound.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: sound.cpp
+// Name: src/cocoa/sound.mm
// Purpose: wxSound class implementation: optional
// Authors: David Elliott, Ryan Norton
// Modified by:
diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm
index 1be9d4f1ba..3f952dc3af 100644
--- a/src/cocoa/spinbutt.mm
+++ b/src/cocoa/spinbutt.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/spinbutt.mm
+// Name: src/cocoa/spinbutt.mm
// Purpose: wxSpinButton
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/statline2.mm b/src/cocoa/statline2.mm
index 3caac1b864..643ca84b0a 100644
--- a/src/cocoa/statline2.mm
+++ b/src/cocoa/statline2.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/statline.mm
+// Name: src/cocoa/statline2.mm
// Purpose: wxStaticLine
// Author: David Elliott
// Modified by:
diff --git a/src/cocoa/utils.mm b/src/cocoa/utils.mm
index 07deb46960..bc764949b5 100644
--- a/src/cocoa/utils.mm
+++ b/src/cocoa/utils.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/cocoa/utils.cpp
+// Name: src/cocoa/utils.mm
// Purpose: Various utilities
// Author: David Elliott
// Created: 2003/??/??
diff --git a/src/common/accesscmn.cpp b/src/common/accesscmn.cpp
index 037fc8edf5..ce89082367 100644
--- a/src/common/accesscmn.cpp
+++ b/src/common/accesscmn.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: common/accesscmn.cpp
+// Name: src/common/accesscmn.cpp
// Author: Julian Smart
// Modified by:
// Created: 2003-02-12
diff --git a/src/common/calctrlcmn.cpp b/src/common/calctrlcmn.cpp
index 2f68eae14c..b39628fb9a 100644
--- a/src/common/calctrlcmn.cpp
+++ b/src/common/calctrlcmn.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: common/calctrlcmn.cpp
+// Name: src/common/calctrlcmn.cpp
// Author: Marcin Wojdyr
// Created: 2008-03-26
// RCS-ID: $Id$
diff --git a/src/common/clntdata.cpp b/src/common/clntdata.cpp
index ca1e8b5f6f..fde025e64f 100644
--- a/src/common/clntdata.cpp
+++ b/src/common/clntdata.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: common/clntdata.cpp
+// Name: src/common/clntdata.cpp
// Purpose: A mixin class for holding a wxClientData or void pointer
// Author: Robin Dunn
// Modified by:
diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 49ca99e048..2e41b29a1c 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/common/graphcmn.cpp
+// Name: src/common/dcgraph.cpp
// Purpose: graphics context methods common to all platforms
// Author: Stefan Csomor
// Modified by:
diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index 648e7684b0..4d1074384a 100644
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: svg.cpp
+// Name: src/common/svg.cpp
// Purpose: SVG sample
// Author: Chris Elliott
// Modified by:
diff --git a/src/common/dndcmn.cpp b/src/common/dndcmn.cpp
index 4c43d1fb6c..cdc3a67fe2 100644
--- a/src/common/dndcmn.cpp
+++ b/src/common/dndcmn.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: common/dndcmn.cpp
+// Name: src/common/dndcmn.cpp
// Author: Robert Roebling
// Modified by:
// Created: 19.10.99
diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index efede1710e..fdfa64eb6a 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: encconv.cpp
+// Name: src/common/encconv.cpp
// Purpose: wxEncodingConverter class for converting between different
// font encodings
// Author: Vaclav Slavik
diff --git a/src/common/execcmn.cpp b/src/common/execcmn.cpp
index 2751344295..1d23ed6f1c 100644
--- a/src/common/execcmn.cpp
+++ b/src/common/execcmn.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: common/wxexec.cpp
+// Name: src/common/execcmn.cpp
// Purpose: defines wxStreamTempInputBuffer which is used by Unix and MSW
// implementations of wxExecute; this file is only used by the
// library and never by the user code
diff --git a/src/common/extended.c b/src/common/extended.c
index 6844663420..2b6f4eb3aa 100644
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -1,5 +1,5 @@
/*****************************************************************************
-** Name: extended.c
+** Name: src/common/extended.c
** Purpose: IEEE Extended<->Double routines to save floats to file
** Maintainer: Ryan Norton
** Modified by:
diff --git a/src/common/fddlgcmn.cpp b/src/common/fddlgcmn.cpp
index d1a6f9ab09..dc2ba56709 100644
--- a/src/common/fddlgcmn.cpp
+++ b/src/common/fddlgcmn.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/common/fdrepdlg.cpp
+// Name: src/common/fddlgcmn.cpp
// Purpose: common parts of wxFindReplaceDialog implementations
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 5957e34df2..5212066a63 100644
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: ffile.cpp
+// Name: src/common/ffile.cpp
// Purpose: wxFFile encapsulates "FILE *" IO stream
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp
index 6007d08ab1..bd6c244f4b 100644
--- a/src/common/fs_arc.cpp
+++ b/src/common/fs_arc.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: fs_arc.cpp
+// Name: src/common/fs_arc.cpp
// Purpose: wxArchive file system
// Author: Vaclav Slavik, Mike Wetherell
// Copyright: (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell
diff --git a/src/common/fswatchercmn.cpp b/src/common/fswatchercmn.cpp
index 295f7a105e..1f8946be9e 100644
--- a/src/common/fswatchercmn.cpp
+++ b/src/common/fswatchercmn.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: common/fswatchercmn.cpp
+// Name: src/common/fswatchercmn.cpp
// Purpose: wxMswFileSystemWatcher
// Author: Bartosz Bekier
// Created: 2009-05-26
diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 49cba58de6..17d9c5ce04 100644
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: common/ftp.cpp
+// Name: src/common/ftp.cpp
// Purpose: FTP protocol
// Author: Guilhem Lavaux
// Modified by: Mark Johnson, wxWindows@mj10777.de
diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp
index 3202fb575d..d9451c0983 100644
--- a/src/common/gbsizer.cpp
+++ b/src/common/gbsizer.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gbsizer.cpp
+// Name: src/common/gbsizer.cpp
// Purpose: wxGridBagSizer: A sizer that can lay out items in a grid,
// with items at specified cells, and with the option of row
// and/or column spanning
diff --git a/src/common/imagiff.cpp b/src/common/imagiff.cpp
index 16e0348a54..bf214b15c8 100644
--- a/src/common/imagiff.cpp
+++ b/src/common/imagiff.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/common/imagiff.h
+// Name: src/common/imagiff.cpp
// Purpose: wxImage handler for Amiga IFF images
// Author: Steffen Gutmann, Thomas Meyer
// RCS-ID: $Id$
diff --git a/src/common/imagtga.cpp b/src/common/imagtga.cpp
index 3d412ddeed..b5a583157e 100644
--- a/src/common/imagtga.cpp
+++ b/src/common/imagtga.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: imagtga.cpp
+// Name: src/common/imagtga.cpp
// Purpose: wxImage TGA handler
// Author: Seth Jackson
// CVS-ID: $Id$
diff --git a/src/common/languageinfo.cpp b/src/common/languageinfo.cpp
index 460b441aec..23266dd045 100644
--- a/src/common/languageinfo.cpp
+++ b/src/common/languageinfo.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/common/language.cpp
+// Name: src/common/languageinfo.cpp
// Purpose: wxLocale::InitLanguagesDB()
// Author: Vadim Zeitlin, Vaclav Slavik
// Created: 2010-04-23
diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp
index c1cf31c007..555c6e71e3 100644
--- a/src/common/mediactrlcmn.cpp
+++ b/src/common/mediactrlcmn.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/common/mediactrl.cpp
+// Name: src/common/mediactrlcmn.cpp
// Purpose: wxMediaCtrl common code
// Author: Ryan Norton <wxprojects@comcast.net>
// Modified by:
diff --git a/src/common/numformatter.cpp b/src/common/numformatter.cpp
index 898c1cf933..ab990d4d59 100644
--- a/src/common/numformatter.cpp
+++ b/src/common/numformatter.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: numformatter.cpp
+// Name: src/common/numformatter.cpp
// Purpose: wxNumberFormatter
// Author: Fulvio Senore, Vadim Zeitlin
// Created: 2010-11-06
diff --git a/src/common/process.cpp b/src/common/process.cpp
index db5eb5efad..210068e955 100644
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: process.cpp
+// Name: src/common/process.cpp
// Purpose: Process termination classes
// Author: Guilhem Lavaux
// Modified by: Vadim Zeitlin to check error codes, added Detach() method
diff --git a/src/common/sstream.cpp b/src/common/sstream.cpp
index 80091ed143..117b2f6919 100644
--- a/src/common/sstream.cpp
+++ b/src/common/sstream.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: common/sstream.cpp
+// Name: src/common/sstream.cpp
// Purpose: string-based streams implementation
// Author: Vadim Zeitlin
// Modified by: Ryan Norton (UTF8 UNICODE)
diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 9a02bdc8db..e421f3b26a 100644
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: common/stdpbase.cpp
+// Name: src/common/stdpbase.cpp
// Purpose: wxStandardPathsBase methods common to all ports
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/common/stdstream.cpp b/src/common/stdstream.cpp
index 54b18ad2dd..0f4fea1836 100644
--- a/src/common/stdstream.cpp
+++ b/src/common/stdstream.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/stdstream.h
+// Name: src/common/stdstream.cpp
// Purpose: Implementation of std::istream and std::ostream derived
// wrappers for wxInputStream and wxOutputStream
// Author: Jonathan Liu <net147@gmail.com>
diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index 96e4eaffdf..9a6d851a0e 100644
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: tarstrm.cpp
+// Name: src/common/tarstrm.cpp
// Purpose: Streams for Tar files
// Author: Mike Wetherell
// RCS-ID: $Id$
diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index e38a50629c..ee7a83f4b1 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: common/timercmn.cpp
+// Name: src/common/timercmn.cpp
// Purpose: wxTimerBase implementation
// Author: Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
// Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)
diff --git a/src/common/timerimpl.cpp b/src/common/timerimpl.cpp
index 5d8548329b..8c89ad68d9 100644
--- a/src/common/timerimpl.cpp
+++ b/src/common/timerimpl.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: common/timercmn.cpp
+// Name: src/common/timerimpl.cpp
// Purpose: wxTimerBase implementation
// Author: Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
// Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)
diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 57cfed1d19..483360b472 100644
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: treebase.cpp
+// Name: src/common/treebase.cpp
// Purpose: Base wxTreeCtrl classes
// Author: Julian Smart
// Created: 01/02/97
diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index aac7aec3d1..86faa7a62f 100644
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: uri.cpp
+// Name: src/common/uri.cpp
// Purpose: Implementation of a URI parser
// Author: Ryan Norton,
// Vadim Zeitlin (UTF-8 URI support, many other changes)
diff --git a/src/common/valnum.cpp b/src/common/valnum.cpp
index 8a84e4f7f3..4b12bbf531 100644
--- a/src/common/valnum.cpp
+++ b/src/common/valnum.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/common/valnumtext.cpp
+// Name: src/common/valnum.cpp
// Purpose: Numeric validator classes implementation
// Author: Vadim Zeitlin based on the submission of Fulvio Senore
// Created: 2010-11-06
diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index de2af11173..1eca40cd08 100644
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/common/fstream.cpp
+// Name: src/common/wfstream.cpp
// Purpose: "File stream" classes
// Author: Julian Smart
// Modified by:
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 2c58ce1ec1..eca7dd157a 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/common/window.cpp
+// Name: src/common/wincmn.cpp
// Purpose: common (to all ports) wxWindow functions
// Author: Julian Smart, Vadim Zeitlin
// Modified by:
diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp
index f49cf3c88b..f30e4be345 100644
--- a/src/dfb/region.cpp
+++ b/src/dfb/region.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/mgl/region.cpp
+// Name: src/dfb/region.cpp
// Purpose: Region handling for wxWidgets/DFB
// Author: Vaclav Slavik
// Created: 2006-08-08
diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp
index aa531dc103..82cb648ad0 100644
--- a/src/generic/animateg.cpp
+++ b/src/generic/animateg.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: animateg.cpp
+// Name: src/generic/animateg.cpp
// Purpose: wxAnimation and wxAnimationCtrl
// Author: Julian Smart and Guillermo Rodriguez Garcia
// Modified by: Francesco Montorsi
diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 9a9a7bd38e..8e7a8ec86b 100644
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: generic/caret.cpp
+// Name: src/generic/caret.cpp
// Purpose: generic wxCaret class implementation
// Author: Vadim Zeitlin (original code by Robert Roebling)
// Modified by:
diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 1222695add..5efbbf63ad 100644
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/generic/dirdlg.cpp
+// Name: src/generic/dirdlgg.cpp
// Purpose: wxDirDialog
// Author: Harm van der Heijden, Robert Roebling & Julian Smart
// Modified by:
diff --git a/src/generic/editlbox.cpp b/src/generic/editlbox.cpp
index 5ece81c5d3..cf5e5d1913 100644
--- a/src/generic/editlbox.cpp
+++ b/src/generic/editlbox.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: editlbox.cpp
+// Name: src/generic/editlbox.cpp
// Purpose: ListBox with editable items
// Author: Vaclav Slavik
// RCS-ID: $Id$
diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index 87a9ee5380..27289d6e37 100644
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/generic/fdrepgg.cpp
+// Name: src/generic/fdrepdlg.cpp
// Purpose: Find/Replace dialogs
// Author: Markus Greither and Vadim Zeitlin
// Modified by:
diff --git a/src/generic/fswatcherg.cpp b/src/generic/fswatcherg.cpp
index 858b60fa77..43b4e0b087 100644
--- a/src/generic/fswatcherg.cpp
+++ b/src/generic/fswatcherg.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: generic/fswatcherg.cpp
+// Name: src/generic/fswatcherg.cpp
// Purpose: wxPollingFileSystemWatcher
// Author: Bartosz Bekier
// Created: 2009-05-26
diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index 6d27bbfe53..b9743847ce 100644
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// Name: generic/gridctrl.cpp
+// Name: src/generic/gridctrl.cpp
// Purpose: wxGrid controls
// Author: Paul Gammans, Roger Gammans
// Modified by:
diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index bf063faeae..ccae40819f 100644
--- a/src/generic/htmllbox.cpp
+++ b/src/generic/htmllbox.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: generic/htmllbox.cpp
+// Name: src/generic/htmllbox.cpp
// Purpose: implementation of wxHtmlListBox
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index 786d662b16..c532a2c0d2 100644
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: laywin.cpp
+// Name: src/generic/laywin.cpp
// Purpose: Implements a simple layout algorithm, plus
// wxSashLayoutWindow which is an example of a window with
// layout-awareness (via event handlers). This is suited to
diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp
index 24d24e2bba..bc3a24f8e2 100644
--- a/src/generic/regiong.cpp
+++ b/src/generic/regiong.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/generic/region.cpp
+// Name: src/generic/regiong.cpp
// Purpose: generic wxRegion class
// Author: David Elliott
// Modified by:
diff --git a/src/generic/selstore.cpp b/src/generic/selstore.cpp
index b08f1e9b0a..9aece14443 100644
--- a/src/generic/selstore.cpp
+++ b/src/generic/selstore.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: generic/selstore.cpp
+// Name: src/generic/selstore.cpp
// Purpose: wxSelectionStore implementation
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index 2b561c7723..99142b5f15 100644
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/artstd.cpp
+// Name: src/gtk/artgtk.cpp
// Purpose: stock wxArtProvider instance with native GTK+ stock icons
// Author: Vaclav Slavik
// Modified by:
diff --git a/src/gtk/assertdlg_gtk.c b/src/gtk/assertdlg_gtk.c
index b1de25f36a..e71571bd75 100644
--- a/src/gtk/assertdlg_gtk.c
+++ b/src/gtk/assertdlg_gtk.c
@@ -1,5 +1,5 @@
/* ///////////////////////////////////////////////////////////////////////////
-// Name: assertdlg_gtk.c
+// Name: src/gtk/assertdlg_gtk.c
// Purpose: GtkAssertDialog
// Author: Francesco Montorsi
// Id: $Id$
diff --git a/src/gtk/bmpcbox.cpp b/src/gtk/bmpcbox.cpp
index 3ec26bd7c8..0a5f75fbe3 100644
--- a/src/gtk/bmpcbox.cpp
+++ b/src/gtk/bmpcbox.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/bmpcboxg.cpp
+// Name: src/gtk/bmpcbox.cpp
// Purpose: wxBitmapComboBox
// Author: Jaakko Salli
// Created: 2008-05-19
diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index eb8bdae88e..981d8527e3 100644
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/colordlg.cpp
+// Name: src/gtk/colordlg.cpp
// Purpose: Native wxColourDialog for GTK+
// Author: Vaclav Slavik
// Modified by:
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 5998f8b674..af0f5a57c9 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dc.cpp
+// Name: src/gtk/dc.cpp
// Purpose:
// Author: Robert Roebling
// RCS-ID: $Id$
diff --git a/src/gtk/hildon/notifmsg.cpp b/src/gtk/hildon/notifmsg.cpp
index e3e85d3725..58011398fe 100644
--- a/src/gtk/hildon/notifmsg.cpp
+++ b/src/gtk/hildon/notifmsg.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/hildon/notifmsg.cpp
+// Name: src/gtk/hildon/notifmsg.cpp
// Purpose: Hildon implementation of wxNotificationMessage
// Author: Vadim Zeitlin
// Created: 2007-11-21
diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index e81a1556ac..ca7eb49da4 100644
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/print.cpp
+// Name: src/gtk/print.cpp
// Author: Anthony Bretaudeau
// Purpose: GTK printing support
// Created: 2007-08-25
diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 9cb0c7fe16..d5c28e4574 100644
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: radiobut.cpp
+// Name: src/gtk/radiobut.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index dcdc24f8af..486545f115 100644
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/scrolwin.cpp
+// Name: src/gtk/scrolwin.cpp
// Purpose: wxScrolledWindow implementation
// Author: Robert Roebling
// Modified by: Ron Lee
diff --git a/src/gtk/sockgtk.cpp b/src/gtk/sockgtk.cpp
index e887cebb69..544ca1d3c5 100644
--- a/src/gtk/sockgtk.cpp
+++ b/src/gtk/sockgtk.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/gsockgtk.cpp
+// Name: src/gtk/sockgtk.cpp
// Purpose: implementation of wxGTK-specific socket event handling
// Author: Guilhem Lavaux, Vadim Zeitlin
// Created: 1999
diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 1d2b31a00c..a6d21769e5 100644
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/spinbutt.cpp
+// Name: src/gtk/spinctrl.cpp
// Purpose: wxSpinCtrl
// Author: Robert
// Modified by:
diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index a7e372c93d..dc9b639711 100644
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: statbmp.cpp
+// Name: src/gtk/statbmp.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 151f04d0fa..06c577699d 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/statbox.cpp
+// Name: src/gtk/statbox.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp
index d19a152ccb..c199ece70e 100644
--- a/src/gtk/statline.cpp
+++ b/src/gtk/statline.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: statline.cpp
+// Name: src/gtk/statline.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 7fd12e10ab..7e8bfead1e 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: stattext.cpp
+// Name: src/gtk/stattext.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index 86d5395f58..8f9fd46dc0 100644
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/timer.cpp
+// Name: src/gtk/timer.cpp
// Purpose: wxTimer implementation
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk1/artgtk.cpp b/src/gtk1/artgtk.cpp
index 959b3a455d..912bc198c0 100644
--- a/src/gtk1/artgtk.cpp
+++ b/src/gtk1/artgtk.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: artstd.cpp
+// Name: src/gtk1/artgtk.cpp
// Purpose: stock wxArtProvider instance with native GTK+ stock icons
// Author: Vaclav Slavik
// Modified by:
diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index eb51e38072..f6ae0e68c0 100644
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: dc.cpp
+// Name: src/gtk1/dc.cpp
// Purpose:
// Author: Robert Roebling
// RCS-ID: $Id$
diff --git a/src/gtk1/gnome/gprint.cpp b/src/gtk1/gnome/gprint.cpp
index 0c6c3f9478..f19d03e000 100644
--- a/src/gtk1/gnome/gprint.cpp
+++ b/src/gtk1/gnome/gprint.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/gnome/gprint.cpp
+// Name: src/gtk1/gnome/gprint.cpp
// Author: Robert Roebling
// Purpose: Implement GNOME printing support
// Created: 09/20/04
diff --git a/src/gtk1/main.cpp b/src/gtk1/main.cpp
index d12f7cda27..df13a094ef 100644
--- a/src/gtk1/main.cpp
+++ b/src/gtk1/main.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: main.cpp
+// Name: src/gtk1/main.cpp
// Purpose: Entry point
// Author: Julian Smart
// Modified by:
diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index 52e317f1f4..35c377163e 100644
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: radiobut.cpp
+// Name: src/gtk1/radiobut.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp
index e771fd7f0f..b265c36fe1 100644
--- a/src/gtk1/scrolwin.cpp
+++ b/src/gtk1/scrolwin.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/scrolwin.cpp
+// Name: src/gtk1/scrolwin.cpp
// Purpose: wxScrolledWindow implementation
// Author: Robert Roebling
// Modified by: Ron Lee
diff --git a/src/gtk1/sockgtk.cpp b/src/gtk1/sockgtk.cpp
index 71d26ace50..8bd6a56f84 100644
--- a/src/gtk1/sockgtk.cpp
+++ b/src/gtk1/sockgtk.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/gsockgtk.cpp
+// Name: src/gtk1/sockgtk.cpp
// Purpose: implementation of wxGTK-specific socket event handling
// Author: Guilhem Lavaux, Vadim Zeitlin
// Created: 1999
diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index f1f0db47dc..9bfab34a2b 100644
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk1/spinbutt.cpp
+// Name: src/gtk1/spinctrl.cpp
// Purpose: wxSpinCtrl
// Author: Robert
// Modified by:
diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index a1818129aa..6437e2b3fb 100644
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: statbmp.cpp
+// Name: src/gtk1/statbmp.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index b8a3d77256..29b36eb167 100644
--- a/src/gtk1/statbox.cpp
+++ b/src/gtk1/statbox.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/statbox.cpp
+// Name: src/gtk1/statbox.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk1/statline.cpp b/src/gtk1/statline.cpp
index 9dc3279b5c..ae6aa2dfed 100644
--- a/src/gtk1/statline.cpp
+++ b/src/gtk1/statline.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: statline.cpp
+// Name: src/gtk1/statline.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index c432146960..d3b0f138f0 100644
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: stattext.cpp
+// Name: src/gtk1/stattext.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index f099957c69..acd3e9747a 100644
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/timer.cpp
+// Name: src/gtk1/timer.cpp
// Purpose: wxTimer implementation
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index faad6fb6e0..66c903a364 100644
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helpctrl.cpp
+// Name: src/html/helpctrl.cpp
// Purpose: wxHtmlHelpController
// Notes: Based on htmlhelp.cpp, implementing a monolithic
// HTML Help controller class, by Vaclav Slavik
diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index f0a423682f..1152845843 100644
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: webkit.mm
+// Name: src/html/htmlctrl/webkit/webkit.mm
// Purpose: wxWebKitCtrl - embeddable web kit control
// Author: Jethro Grassie / Kevin Ollivier
// Modified by:
diff --git a/src/mgl/clipbrd.cpp b/src/mgl/clipbrd.cpp
index eafe64bd1b..81f12a67e9 100644
--- a/src/mgl/clipbrd.cpp
+++ b/src/mgl/clipbrd.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/clipbrd.cpp
+// Name: src/mgl/clipbrd.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp
index 8405be0bdd..8c1e79f339 100644
--- a/src/mgl/dirmgl.cpp
+++ b/src/mgl/dirmgl.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/mgl/dir.cpp
+// Name: src/mgl/dirmgl.cpp
// Purpose: wxDir implementation for MGL
// Author: Vaclav Slavik, Vadim Zeitlin
// Modified by:
diff --git a/src/motif/data.cpp b/src/motif/data.cpp
index 93fae931ee..daf23e6463 100644
--- a/src/motif/data.cpp
+++ b/src/motif/data.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: motif/data.cpp
+// Name: src/motif/data.cpp
// Purpose: Various Motif-specific global data
// Author: Julian Smart
// Modified by:
diff --git a/src/motif/main.cpp b/src/motif/main.cpp
index 9a50fb1d11..9873a4d456 100644
--- a/src/motif/main.cpp
+++ b/src/motif/main.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: main.cpp
+// Name: src/motif/main.cpp
// Purpose: Entry point
// Author: Julian Smart
// Modified by:
diff --git a/src/motif/sockmot.cpp b/src/motif/sockmot.cpp
index 7b5802743b..4dec63eb92 100644
--- a/src/motif/sockmot.cpp
+++ b/src/motif/sockmot.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: motif/sockmot.cpp
+// Name: src/motif/sockmot.cpp
// Purpose: implementation of wxMotif-specific socket event handling
// Author: Guilhem Lavaux, Vadim Zeitlin
// Created: 1999
diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp
index 1b47458ab4..52bfea46da 100644
--- a/src/msdos/utilsdos.cpp
+++ b/src/msdos/utilsdos.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/msdos/utils.cpp
+// Name: src/msdos/utilsdos.cpp
// Purpose: DOS implementations of utility functions
// Author: Vaclav Slavik, M.J.Wetherell
// Id: $Id$
diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index cce31919c2..1da9cb7597 100644
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/accel.cpp
+// Name: src/msw/accel.cpp
// Purpose: wxAcceleratorTable
// Author: Julian Smart
// Modified by:
diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp
index df0efce82c..91597dcb5f 100644
--- a/src/msw/basemsw.cpp
+++ b/src/msw/basemsw.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/basemsw.cpp
+// Name: src/msw/basemsw.cpp
// Purpose: misc stuff only used in console applications under MSW
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index 3ad1855abf..c2928c9657 100644
--- a/src/msw/bmpcbox.cpp
+++ b/src/msw/bmpcbox.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/msw/bmpcboxg.cpp
+// Name: src/msw/bmpcbox.cpp
// Purpose: wxBitmapComboBox
// Author: Jaakko Salli
// Created: 2008-04-06
diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index a7c7d63d90..4252a732f1 100644
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/caret.cpp
+// Name: src/msw/caret.cpp
// Purpose: MSW implementation of wxCaret
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index d57eac2f54..4bf374f676 100644
--- a/src/msw/crashrpt.cpp
+++ b/src/msw/crashrpt.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/crashrpt.cpp
+// Name: src/msw/crashrpt.cpp
// Purpose: code to generate crash dumps (minidumps)
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index e6dbde0816..9170ca4612 100644
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: data.cpp
+// Name: src/msw/data.cpp
// Purpose: Various data
// Author: Julian Smart
// Modified by:
diff --git a/src/msw/debughlp.cpp b/src/msw/debughlp.cpp
index f6aff5e53c..1cbdb25f81 100644
--- a/src/msw/debughlp.cpp
+++ b/src/msw/debughlp.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/debughlp.cpp
+// Name: src/msw/debughlp.cpp
// Purpose: various Win32 debug helpers
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index 48d4e4e0a5..672397394b 100644
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/dir.cpp
+// Name: src/msw/dir.cpp
// Purpose: wxDir implementation for Win32
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp
index 760a59629b..cdff7387ab 100644
--- a/src/msw/dlmsw.cpp
+++ b/src/msw/dlmsw.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/dlmsw.cpp
+// Name: src/msw/dlmsw.cpp
// Purpose: Win32-specific part of wxDynamicLibrary and related classes
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 2b8874377e..6e734bc53f 100644
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/evtloop.cpp
+// Name: src/msw/evtloop.cpp
// Purpose: implements wxEventLoop for MSW
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index e05c50de4d..03367c7bc3 100644
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/fontutil.cpp
+// Name: src/msw/fontutil.cpp
// Purpose: font-related helper functions for wxMSW
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/fswatcher.cpp b/src/msw/fswatcher.cpp
index c8dacc7df1..28c268e062 100644
--- a/src/msw/fswatcher.cpp
+++ b/src/msw/fswatcher.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/fswatcher.cpp
+// Name: src/msw/fswatcher.cpp
// Purpose: wxMSWFileSystemWatcher
// Author: Bartosz Bekier
// Created: 2009-05-26
diff --git a/src/msw/gauge.cpp b/src/msw/gauge.cpp
index 1ed1025408..58dc16dcb7 100644
--- a/src/msw/gauge.cpp
+++ b/src/msw/gauge.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/msw/gauge95.cpp
+// Name: src/msw/gauge.cpp
// Purpose: wxGauge class
// Author: Julian Smart
// Modified by:
diff --git a/src/msw/microwin.c b/src/msw/microwin.c
index 071cbb5ef6..345bbca928 100644
--- a/src/msw/microwin.c
+++ b/src/msw/microwin.c
@@ -1,6 +1,6 @@
/*
/////////////////////////////////////////////////////////////////////////////
-// Name: microwin.cpp
+// Name: src/msw/microwin.cpp
// Purpose: Extra implementation for MicroWindows
// Author: Julian Smart
// Created: 2001-05-31
diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index ee9c1f95f9..8281bdc86c 100644
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: minifram.cpp
+// Name: src/msw/minifram.cpp
// Purpose: wxMiniFrame
// Author: Julian Smart
// Modified by:
diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 540d2330bf..eadb8b1bfd 100644
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/ole/dataobj.cpp
+// Name: src/msw/ole/dataobj.cpp
// Purpose: implementation of wx[I]DataObject class
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/snglinst.cpp b/src/msw/snglinst.cpp
index 3771a77809..1c81a9b398 100644
--- a/src/msw/snglinst.cpp
+++ b/src/msw/snglinst.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/snglinst.cpp
+// Name: src/msw/snglinst.cpp
// Purpose: implements wxSingleInstanceChecker class for Win32 using
// named mutexes
// Author: Vadim Zeitlin
diff --git a/src/msw/sound.cpp b/src/msw/sound.cpp
index b870321469..334afd484d 100644
--- a/src/msw/sound.cpp
+++ b/src/msw/sound.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: sound.cpp
+// Name: src/msw/sound.cpp
// Purpose: wxSound
// Author: Julian Smart
// Modified by: 2005-07-29: Vadim Zeitlin: redesign
diff --git a/src/msw/stackwalk.cpp b/src/msw/stackwalk.cpp
index 9e87fc52a7..0002154583 100644
--- a/src/msw/stackwalk.cpp
+++ b/src/msw/stackwalk.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/stackwalk.cpp
+// Name: src/msw/stackwalk.cpp
// Purpose: wxStackWalker implementation for Win32
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index f5fdcebafb..a4a016c85b 100644
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/stdpaths.cpp
+// Name: src/msw/stdpaths.cpp
// Purpose: wxStandardPaths implementation for Win32
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/utilsgui.cpp b/src/msw/utilsgui.cpp
index 16564a29fd..6eb4e85148 100644
--- a/src/msw/utilsgui.cpp
+++ b/src/msw/utilsgui.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/utilsgui.cpp
+// Name: src/msw/utilsgui.cpp
// Purpose: Various utility functions only available in GUI
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/wince/crt.cpp b/src/msw/wince/crt.cpp
index 9afe12d6ee..87f781002f 100644
--- a/src/msw/wince/crt.cpp
+++ b/src/msw/wince/crt.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wince/crt.cpp
+// Name: src/msw/wince/crt.cpp
// Purpose: Implementation of CRT functions missing under Windows CE
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/msw/winestub.c b/src/msw/winestub.c
index 71e87ad01d..cc3f06ca1a 100644
--- a/src/msw/winestub.c
+++ b/src/msw/winestub.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Name: winestub.cpp
+ * Name: src/msw/winestub.cpp
* Purpose: wxWINE module mapping main() to WinMain()
* Author: Robert Roebling
* Created: 04/01/98
diff --git a/src/os2/data.cpp b/src/os2/data.cpp
index 28ba3f0884..d1b01efda7 100644
--- a/src/os2/data.cpp
+++ b/src/os2/data.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: data.cpp
+// Name: src/os2/data.cpp
// Purpose: Various OS/2-specific global data
// Author: David Webster
// Modified by:
diff --git a/src/os2/dir.cpp b/src/os2/dir.cpp
index 1b81050082..2b08bac7d1 100644
--- a/src/os2/dir.cpp
+++ b/src/os2/dir.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: os2/dir.cpp
+// Name: src/os2/dir.cpp
// Purpose: wxDir implementation for OS/2
// Author: Vadim Zeitlin
// Modified by: Stefan Neis
diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index ad94caff32..088d4424f1 100644
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/fontutil.cpp
+// Name: src/msw/fontutil.cpp
// Purpose: font-related helper functions for wxMSW
// Author: Modified by David Webster for OS/2
// Modified by:
diff --git a/src/os2/main.cpp b/src/os2/main.cpp
index 3a5802b172..2d1685e954 100644
--- a/src/os2/main.cpp
+++ b/src/os2/main.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: main.cpp
+// Name: src/os2/main.cpp
// Purpose: Entry point
// Author: David Webster
// Modified by:
diff --git a/src/os2/minifram.cpp b/src/os2/minifram.cpp
index fcef2ea256..12fda6e464 100644
--- a/src/os2/minifram.cpp
+++ b/src/os2/minifram.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: minifram.cpp
+// Name: src/os2/minifram.cpp
// Purpose: wxMiniFrame
// Author: Julian Smart
// Modified by:
diff --git a/src/os2/nativdlg.cpp b/src/os2/nativdlg.cpp
index 16c8294620..3c917fffe9 100644
--- a/src/os2/nativdlg.cpp
+++ b/src/os2/nativdlg.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: nativdlg.cpp
+// Name: src/os2/nativdlg.cpp
// Purpose: Native dialog loading code (part of wxWindow)
// Author: David Webster
// Modified by:
diff --git a/src/os2/popupwin.cpp b/src/os2/popupwin.cpp
index 0c36379c95..faf26b0cf0 100644
--- a/src/os2/popupwin.cpp
+++ b/src/os2/popupwin.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: os2/popupwin.cpp
+// Name: src/os2/popupwin.cpp
// Purpose: implements wxPopupWindow for OS2
// Author: Dave Webster
// Modified by:
diff --git a/src/os2/snglinst.cpp b/src/os2/snglinst.cpp
index fd03b774fd..8d66f31a3b 100644
--- a/src/os2/snglinst.cpp
+++ b/src/os2/snglinst.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: os2/snglinst.cpp
+// Name: src/os2/snglinst.cpp
// Purpose: implements wxSingleInstanceChecker class for OS/2 using
// named mutexes
// Author: Vadim Zeitlin
diff --git a/src/os2/sockpm.cpp b/src/os2/sockpm.cpp
index 8aa2c2f008..a06ad87081 100644
--- a/src/os2/sockpm.cpp
+++ b/src/os2/sockpm.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: os2/sockpm.cpp
+// Name: src/os2/sockpm.cpp
// Purpose: implementation of OS-2-specific handler event handling
// Author: Guilhem Lavaux, Vadim Zeitlin
// Created: 1999
diff --git a/src/os2/sound.cpp b/src/os2/sound.cpp
index 91d6c1206f..21d0498c1e 100644
--- a/src/os2/sound.cpp
+++ b/src/os2/sound.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: sound.cpp
+// Name: src/os2/sound.cpp
// Purpose: wxSound class implementation: optional
// Author: David Webster
// Modified by:
diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp
index 14fbeaa39c..19ea7af582 100644
--- a/src/os2/spinbutt.cpp
+++ b/src/os2/spinbutt.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.cpp
+// Name: src/os2/spinbutt.cpp
// Purpose: wxSpinButton
// Author: David Webster
// Modified by:
diff --git a/src/os2/stdpaths.cpp b/src/os2/stdpaths.cpp
index 593b70ae6e..3537d92e26 100644
--- a/src/os2/stdpaths.cpp
+++ b/src/os2/stdpaths.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: unix/stdpaths.cpp
+// Name: src/os2/stdpaths.cpp
// Purpose: wxStandardPaths implementation for OS/2 systems
// Author: Stefan Neis
// Modified by:
diff --git a/src/os2/tooltip.cpp b/src/os2/tooltip.cpp
index 685cf02339..3407b154e4 100644
--- a/src/os2/tooltip.cpp
+++ b/src/os2/tooltip.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/tooltip.cpp
+// Name: src/os2/tooltip.cpp
// Purpose: wxToolTip class implementation for MSW
// Author: David Webster
// Modified by:
diff --git a/src/osx/carbon/aboutdlg.cpp b/src/osx/carbon/aboutdlg.cpp
index 73696ef63d..0ca668b1ff 100644
--- a/src/osx/carbon/aboutdlg.cpp
+++ b/src/osx/carbon/aboutdlg.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: osx/carbon/aboutdlg.cpp
+// Name: src/osx/carbon/aboutdlg.cpp
// Purpose: native wxAboutBox() implementation for wxMac
// Author: Vadim Zeitlin
// Created: 2006-10-08
diff --git a/src/osx/carbon/colordlg.cpp b/src/osx/carbon/colordlg.cpp
index 07b4b05672..1d67843109 100644
--- a/src/osx/carbon/colordlg.cpp
+++ b/src/osx/carbon/colordlg.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: colordlg.cpp
+// Name: src/osx/carbon/colordlg.cpp
// Purpose: wxColourDialog class. NOTE: you can use the generic class
// if you wish, instead of implementing this.
// Author: Stefan Csomor
diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm
index df0c18b54f..1fdc0bee31 100644
--- a/src/osx/carbon/colordlgosx.mm
+++ b/src/osx/carbon/colordlgosx.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/colordlg.mm
+// Name: src/osx/carbon/colordlgosx.mm
// Purpose: wxColourDialog class. NOTE: you can use the generic class
// if you wish, instead of implementing this.
// Author: Ryan Norton
diff --git a/src/osx/carbon/dirmac.cpp b/src/osx/carbon/dirmac.cpp
index 1932960d97..71e6436625 100644
--- a/src/osx/carbon/dirmac.cpp
+++ b/src/osx/carbon/dirmac.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: mac/dirmac.cpp
+// Name: src/osx/carbon/dirmac.cpp
// Purpose: wxDir implementation for Mac
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/carbon/drawer.cpp b/src/osx/carbon/drawer.cpp
index 2bd0d8041b..d05251de16 100644
--- a/src/osx/carbon/drawer.cpp
+++ b/src/osx/carbon/drawer.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: drawer.cpp
+// Name: src/osx/carbon/drawer.cpp
// Purpose: Drawer child window classes.
// Drawer windows appear under their parent window and
// behave like a drawer, opening and closing to reveal
diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm
index a83b7d5e02..c5863ad7e3 100644
--- a/src/osx/carbon/fontdlgosx.mm
+++ b/src/osx/carbon/fontdlgosx.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/fontdlgosx.cpp
+// Name: src/osx/carbon/fontdlgosx.mm
// Purpose: wxFontDialog class.
// Author: Ryan Norton
// Modified by:
diff --git a/src/osx/carbon/gauge.cpp b/src/osx/carbon/gauge.cpp
index 9a74a41a7c..423cbc226b 100644
--- a/src/osx/carbon/gauge.cpp
+++ b/src/osx/carbon/gauge.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gauge.cpp
+// Name: src/osx/carbon/gauge.cpp
// Purpose: wxGauge class
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index 441f65c63f..9b5ba91636 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/dccg.cpp
+// Name: src/osx/carbon/graphics.cpp
// Purpose: wxDC class
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/carbon/helpxxxx.cpp b/src/osx/carbon/helpxxxx.cpp
index 984e0444de..a51dbd121c 100644
--- a/src/osx/carbon/helpxxxx.cpp
+++ b/src/osx/carbon/helpxxxx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: helpxxxx.cpp
+// Name: src/osx/carbon/helpxxxx.cpp
// Purpose: Help system: native implementation
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/carbon/main.cpp b/src/osx/carbon/main.cpp
index ad5bd33263..2b65ae26b7 100644
--- a/src/osx/carbon/main.cpp
+++ b/src/osx/carbon/main.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: main.cpp
+// Name: src/osx/carbon/main.cpp
// Purpose: Entry point
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/carbon/mimetmac.cpp b/src/osx/carbon/mimetmac.cpp
index 706a7f7335..3e23d60875 100644
--- a/src/osx/carbon/mimetmac.cpp
+++ b/src/osx/carbon/mimetmac.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/mimetype.cpp
+// Name: src/osx/carbon/mimetmac.cpp
// Purpose: Mac Carbon implementation for wx MIME-related classes
// Author: Ryan Norton
// Modified by:
diff --git a/src/osx/carbon/popupwin.cpp b/src/osx/carbon/popupwin.cpp
index 6095dc48c7..5f73691371 100644
--- a/src/osx/carbon/popupwin.cpp
+++ b/src/osx/carbon/popupwin.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/popupwin.cpp
+// Name: src/osx/carbon/popupwin.cpp
// Purpose: implements wxPopupWindow for wxMac
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/carbon/slider.cpp b/src/osx/carbon/slider.cpp
index b471a01680..60beb5b99d 100644
--- a/src/osx/carbon/slider.cpp
+++ b/src/osx/carbon/slider.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: slider.cpp
+// Name: src/osx/carbon/slider.cpp
// Purpose: wxSlider
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/carbon/spinbutt.cpp b/src/osx/carbon/spinbutt.cpp
index 8068d96cec..6b7a522a34 100644
--- a/src/osx/carbon/spinbutt.cpp
+++ b/src/osx/carbon/spinbutt.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.cpp
+// Name: src/osx/carbon/spinbutt.cpp
// Purpose: wxSpinButton
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index 115defc589..438a024c42 100644
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/utils.mm
+// Name: src/osx/carbon/utilscocoa.mm
// Purpose: various cocoa mixin utility functions
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp
index 1830c610d9..9d4191de73 100644
--- a/src/osx/checkbox_osx.cpp
+++ b/src/osx/checkbox_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/checkbox.cpp
+// Name: src/osx/checkbox_osx.cpp
// Purpose: wxCheckBox
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp
index 615b2592c5..bb3427a857 100644
--- a/src/osx/choice_osx.cpp
+++ b/src/osx/choice_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/choice.cpp
+// Name: src/osx/choice_osx.cpp
// Purpose: wxChoice
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/cocoa/aboutdlg.mm b/src/osx/cocoa/aboutdlg.mm
index 70d29090c9..e7cb94b3f1 100644
--- a/src/osx/cocoa/aboutdlg.mm
+++ b/src/osx/cocoa/aboutdlg.mm
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: osx/cocoa/aboutdlg.cpp
+// Name: src/osx/cocoa/aboutdlg.mm
// Purpose: native wxAboutBox() implementation for wxMac
// Author: Vadim Zeitlin
// Created: 2006-10-08
diff --git a/src/osx/cocoa/dialog.mm b/src/osx/cocoa/dialog.mm
index 63d796f3bc..6ae5bd86aa 100644
--- a/src/osx/cocoa/dialog.mm
+++ b/src/osx/cocoa/dialog.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/cocoa/dialog.cpp
+// Name: src/osx/cocoa/dialog.mm
// Purpose: wxDialog class
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/cocoa/gauge.mm b/src/osx/cocoa/gauge.mm
index d4beaa18a8..d748223702 100644
--- a/src/osx/cocoa/gauge.mm
+++ b/src/osx/cocoa/gauge.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gauge.mm
+// Name: src/osx/cocoa/gauge.mm
// Purpose: wxGauge class
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/cocoa/printdlg.mm b/src/osx/cocoa/printdlg.mm
index 0efddce852..83186372d3 100644
--- a/src/osx/cocoa/printdlg.mm
+++ b/src/osx/cocoa/printdlg.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/printdlg.cpp
+// Name: src/osx/cocoa/printdlg.mm
// Purpose: wxPrintDialog, wxPageSetupDialog
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/cocoa/spinbutt.mm b/src/osx/cocoa/spinbutt.mm
index e050702a2f..907fac8b14 100644
--- a/src/osx/cocoa/spinbutt.mm
+++ b/src/osx/cocoa/spinbutt.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.cpp
+// Name: src/osx/cocoa/spinbutt.mm
// Purpose: wxSpinButton
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/cocoa/srchctrl.mm b/src/osx/cocoa/srchctrl.mm
index 4dd1bcb4f1..c9b722d727 100644
--- a/src/osx/cocoa/srchctrl.mm
+++ b/src/osx/cocoa/srchctrl.mm
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/srchctrl.cpp
+// Name: src/osx/cocoa/srchctrl.mm
// Purpose: implements mac carbon wxSearchCtrl
// Author: Vince Harron
// Created: 2006-02-19
diff --git a/src/osx/cocoa/statbox.mm b/src/osx/cocoa/statbox.mm
index 3a9738ca61..93838c3b73 100644
--- a/src/osx/cocoa/statbox.mm
+++ b/src/osx/cocoa/statbox.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: statbox.cpp
+// Name: src/osx/cocoa/statbox.mm
// Purpose: wxStaticBox
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 8d442cd776..2f3fc49395 100644
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/toolbar.cpp
+// Name: src/osx/cocoa/toolbar.mm
// Purpose: wxToolBar
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/cocoa/tooltip.mm b/src/osx/cocoa/tooltip.mm
index b9ba88b11b..11c44b49b4 100644
--- a/src/osx/cocoa/tooltip.mm
+++ b/src/osx/cocoa/tooltip.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/tooltip.cpp
+// Name: src/osx/cocoa/tooltip.mm
// Purpose: wxToolTip implementation
// Author: Stefan Csomor
// Id: $Id$
diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp
index fa1840f44c..c3bfcce19b 100644
--- a/src/osx/core/cfstring.cpp
+++ b/src/osx/core/cfstring.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/corefoundation/cfstring.cpp
+// Name: src/osx/core/cfstring.cpp
// Purpose: wxCFStringHolder and other string functions
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index 92bddd08be..c30e8bdc6f 100644
--- a/src/osx/core/colour.cpp
+++ b/src/osx/core/colour.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/colour.cpp
+// Name: src/osx/core/colour.cpp
// Purpose: wxColour class
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp
index 0f00fca275..2a096f714a 100644
--- a/src/osx/core/hid.cpp
+++ b/src/osx/core/hid.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/corefoundation/hid.cpp
+// Name: src/osx/core/hid.cpp
// Purpose: DARWIN HID layer for WX Implementation
// Author: Ryan Norton
// Modified by:
diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp
index 3bd17b1f33..ed6ccabde4 100644
--- a/src/osx/core/hidjoystick.cpp
+++ b/src/osx/core/hidjoystick.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/corefoundation/joystick.cpp
+// Name: src/osx/core/joystick.cpp
// Purpose: wxJoystick class
// Author: Ryan Norton
// Modified by:
diff --git a/src/osx/core/sockosx.cpp b/src/osx/core/sockosx.cpp
index 08711a0980..cf1da2c7f8 100644
--- a/src/osx/core/sockosx.cpp
+++ b/src/osx/core/sockosx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: osx/core/gsockosx.cpp
+// Name: src/osx/core/gsockosx.cpp
// Purpose: wxSocketImpl implementation for OS X
// Authors: Brian Victor, Vadim Zeitlin
// Created: February 2002
diff --git a/src/osx/core/stdpaths_cf.cpp b/src/osx/core/stdpaths_cf.cpp
index e48de3c9b1..de312789c9 100644
--- a/src/osx/core/stdpaths_cf.cpp
+++ b/src/osx/core/stdpaths_cf.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: mac/corefoundation/stdpaths.cpp
+// Name: src/osx/core/stdpaths_cf.cpp
// Purpose: wxStandardPaths implementation for CoreFoundation systems
// Author: David Elliott
// Modified by:
diff --git a/src/osx/core/strconv_cf.cpp b/src/osx/core/strconv_cf.cpp
index 5f37413386..f4bd30f334 100644
--- a/src/osx/core/strconv_cf.cpp
+++ b/src/osx/core/strconv_cf.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/corefoundation/strconv.cpp
+// Name: src/osx/core/strconv_cf.cpp
// Purpose: Unicode conversion classes
// Author: David Elliott
// Modified by:
diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp
index c9380d7195..bf7e95b6a5 100644
--- a/src/osx/core/utilsexc_base.cpp
+++ b/src/osx/core/utilsexc_base.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: mac/corefoundation/utilsexc_base.cpp
+// Name: src/osx/core/utilsexc_base.cpp
// Purpose: wxMacLaunch
// Author: Ryan Norton
// Modified by:
diff --git a/src/osx/core/utilsexc_cf.cpp b/src/osx/core/utilsexc_cf.cpp
index 95f8bd51d2..fe010f63be 100644
--- a/src/osx/core/utilsexc_cf.cpp
+++ b/src/osx/core/utilsexc_cf.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/corefoundation/utilsexec_cf.cpp
+// Name: src/osx/core/utilsexc_cf.cpp
// Purpose: Execution-related utilities for Darwin
// Author: David Elliott, Ryan Norton (wxMacExecute)
// Modified by: Stefan Csomor (added necessary wxT for unicode builds)
diff --git a/src/osx/dnd_osx.cpp b/src/osx/dnd_osx.cpp
index 7fb1c922cc..fc2e684f2d 100644
--- a/src/osx/dnd_osx.cpp
+++ b/src/osx/dnd_osx.cpp
@@ -36,7 +36,7 @@ wxDragResult wxDropTarget::OnDragOver(
wxDataFormat wxDropTarget::GetMatchingPair()
{
- wxFAIL_MSG("wxDropTarget::GetMatchingPair() not implemented in src/osx/carbon/dnd.cpp");
+ wxFAIL_MSG("wxDropTarget::GetMatchingPair() not implemented in src/osx/dnd_osx.cpp");
return wxDF_INVALID;
}
diff --git a/src/osx/iphone/dialog.mm b/src/osx/iphone/dialog.mm
index 5c43be13f9..a1a728e11f 100644
--- a/src/osx/iphone/dialog.mm
+++ b/src/osx/iphone/dialog.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/cocoa/dialog.cpp
+// Name: src/osx/iphone/dialog.mm
// Purpose: wxDialog class
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/iphone/gauge.mm b/src/osx/iphone/gauge.mm
index b327f66bd7..7c87934a1e 100644
--- a/src/osx/iphone/gauge.mm
+++ b/src/osx/iphone/gauge.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: gauge.mm
+// Name: src/osx/iphone/gauge.mm
// Purpose: wxGauge class
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/iphone/nonownedwnd.mm b/src/osx/iphone/nonownedwnd.mm
index 995ab9e5ab..2f10c57c35 100644
--- a/src/osx/iphone/nonownedwnd.mm
+++ b/src/osx/iphone/nonownedwnd.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/cocoa/nonownedwnd.mm
+// Name: src/osx/iphone/nonownedwnd.mm
// Purpose: non owned window for iphone
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/iphone/stattext.mm b/src/osx/iphone/stattext.mm
index 07b1f479d7..d63502f1e1 100644
--- a/src/osx/iphone/stattext.mm
+++ b/src/osx/iphone/stattext.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/cocoa/stattext.mm
+// Name: src/osx/iphone/stattext.mm
// Purpose: wxStaticText
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/iphone/textctrl.mm b/src/osx/iphone/textctrl.mm
index 7ad585bd7f..d8f65b39a7 100644
--- a/src/osx/iphone/textctrl.mm
+++ b/src/osx/iphone/textctrl.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/cocoa/textctrl.mm
+// Name: src/osx/iphone/textctrl.mm
// Purpose: wxTextCtrl
// Author: Stefan Csomor
// Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm
index 5cb6b9aefc..449a92e572 100644
--- a/src/osx/iphone/toolbar.mm
+++ b/src/osx/iphone/toolbar.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/toolbar.cpp
+// Name: src/osx/iphone/toolbar.mm
// Purpose: wxToolBar
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/iphone/utils.mm b/src/osx/iphone/utils.mm
index 0d27bc80a8..e1e80ad5eb 100644
--- a/src/osx/iphone/utils.mm
+++ b/src/osx/iphone/utils.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/cocoa/utils.mm
+// Name: src/osx/iphone/utils.mm
// Purpose: various cocoa utility functions
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 9c6830eafb..26e6f307a0 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/listbox.cpp
+// Name: src/osx/listbox_osx.cpp
// Purpose: wxListBox
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index 1bd23582ef..bc209286cb 100644
--- a/src/osx/radiobox_osx.cpp
+++ b/src/osx/radiobox_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/radiobox.cpp
+// Name: src/osx/radiobox_osx.cpp
// Purpose: wxRadioBox
// Author: Stefan Csomor
// Modified by: JS Lair (99/11/15) first implementation
diff --git a/src/osx/radiobut_osx.cpp b/src/osx/radiobut_osx.cpp
index 573ee1e62e..12f51b5b5b 100644
--- a/src/osx/radiobut_osx.cpp
+++ b/src/osx/radiobut_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: radiobut.cpp
+// Name: src/osx/radiobut.cpp
// Purpose: wxRadioButton
// Author: AUTHOR
// Modified by: JS Lair (99/11/15) adding the cyclic group notion for radiobox
diff --git a/src/osx/scrolbar_osx.cpp b/src/osx/scrolbar_osx.cpp
index ca041ec530..9b71f0e436 100644
--- a/src/osx/scrolbar_osx.cpp
+++ b/src/osx/scrolbar_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/scrolbar.cpp
+// Name: src/osx/scrolbar_osx.cpp
// Purpose: wxScrollBar
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/spinbutt_osx.cpp b/src/osx/spinbutt_osx.cpp
index 3d6245c007..b8ef24b732 100644
--- a/src/osx/spinbutt_osx.cpp
+++ b/src/osx/spinbutt_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.cpp
+// Name: src/osx/spinbutt_osx.cpp
// Purpose: wxSpinButton
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/spinctrl_osx.cpp b/src/osx/spinctrl_osx.cpp
index 27bb861628..aaba05cb43 100644
--- a/src/osx/spinctrl_osx.cpp
+++ b/src/osx/spinctrl_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/spinbutt.cpp
+// Name: src/osx/spinctrl_osx.cpp
// Purpose: wxSpinCtrl
// Author: Robert
// Modified by: Mark Newsam (Based on GTK file)
diff --git a/src/osx/statline_osx.cpp b/src/osx/statline_osx.cpp
index 6d53cd7752..39522f252c 100644
--- a/src/osx/statline_osx.cpp
+++ b/src/osx/statline_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/statlmac.cpp
+// Name: src/osx/statline_osx.cpp
// Purpose: a generic wxStaticLine class
// Author: Vadim Zeitlin
// Created: 28.06.99
diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp
index ad7b76bc7f..9c163f8b59 100644
--- a/src/osx/stattext_osx.cpp
+++ b/src/osx/stattext_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/stattext.cpp
+// Name: src/osx/stattext_osx.cpp
// Purpose: wxStaticText
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/toolbar_osx.cpp b/src/osx/toolbar_osx.cpp
index 5c5ed25a56..13e2adf1c4 100644
--- a/src/osx/toolbar_osx.cpp
+++ b/src/osx/toolbar_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/toolbar.cpp
+// Name: src/osx/toolbar_osx.cpp
// Purpose: wxToolBar
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/toplevel_osx.cpp b/src/osx/toplevel_osx.cpp
index ae5df2881b..4f3d1a6d3a 100644
--- a/src/osx/toplevel_osx.cpp
+++ b/src/osx/toplevel_osx.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/toplevel.cpp
+// Name: src/osx/toplevel_osx.cpp
// Purpose: implements wxTopLevelWindow for Mac
// Author: Stefan Csomor
// Modified by:
diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index f2f2539c3a..8f6d0e6629 100644
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/window.cpp
+// Name: src/osx/window_osx.cpp
// Purpose: wxWindowMac
// Author: Stefan Csomor
// Modified by:
diff --git a/src/palmos/base.cpp b/src/palmos/base.cpp
index e7dc5bb9e5..2feeb27b12 100644
--- a/src/palmos/base.cpp
+++ b/src/palmos/base.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/palmos/basemsw.cpp
+// Name: src/palmos/base.cpp
// Purpose: misc stuff only used in applications under PalmOS
// Author: William Osborne - minimal working wxPalmOS port
// Modified by:
diff --git a/src/palmos/help.cpp b/src/palmos/help.cpp
index 6264c29822..e2af8e10a6 100644
--- a/src/palmos/help.cpp
+++ b/src/palmos/help.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/palmos/helpwin.cpp
+// Name: src/palmos/help.cpp
// Purpose: Help system: WinHelp implementation
// Author: William Osborne - minimal working wxPalmOS port
// Modified by:
diff --git a/src/richtext/richtextbackgroundpage.cpp b/src/richtext/richtextbackgroundpage.cpp
index 5775a74a43..0a585bd5f5 100644
--- a/src/richtext/richtextbackgroundpage.cpp
+++ b/src/richtext/richtextbackgroundpage.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: richtextbackgroundpage.cpp
+// Name: src/richtext/richtextbackgroundpage.cpp
// Purpose:
// Author: Julian Smart
// Modified by:
diff --git a/src/richtext/richtextborderspage.cpp b/src/richtext/richtextborderspage.cpp
index 6e11d9a63c..1bc46b2510 100644
--- a/src/richtext/richtextborderspage.cpp
+++ b/src/richtext/richtextborderspage.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: richtextborderspage.cpp
+// Name: src/richtext/richtextborderspage.cpp
// Purpose:
// Author: Julian Smart
// Modified by:
diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 14266aa8c1..d66ac66938 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/richtext/richeditctrl.cpp
+// Name: src/richtext/richtextctrl.cpp
// Purpose: A rich edit control
// Author: Julian Smart
// Modified by:
diff --git a/src/richtext/richtextfontpage.cpp b/src/richtext/richtextfontpage.cpp
index 08b6854967..61f4bf5145 100644
--- a/src/richtext/richtextfontpage.cpp
+++ b/src/richtext/richtextfontpage.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/richtext/richeditfontpage.cpp
+// Name: src/richtext/richtextfontpage.cpp
// Purpose: Font page for wxRichTextFormattingDialog
// Author: Julian Smart
// Modified by:
diff --git a/src/richtext/richtextmarginspage.cpp b/src/richtext/richtextmarginspage.cpp
index bd0bdd8262..6bb8dcf0ef 100644
--- a/src/richtext/richtextmarginspage.cpp
+++ b/src/richtext/richtextmarginspage.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: richtextmarginspage.cpp
+// Name: src/richtext/richtextmarginspage.cpp
// Purpose:
// Author: Julian Smart
// Modified by:
diff --git a/src/richtext/richtextsizepage.cpp b/src/richtext/richtextsizepage.cpp
index 7cb8f2ab0e..5425a95bfd 100644
--- a/src/richtext/richtextsizepage.cpp
+++ b/src/richtext/richtextsizepage.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: richtextsizepage.cpp
+// Name: src/richtext/richtextsizepage.cpp
// Purpose:
// Author: Julian Smart
// Modified by:
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index d69d494f1b..11de4291e3 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////
-// Name: ScintillaWX.cxx
+// Name: src/stc/ScintillaWX.cpp
// Purpose: A wxWidgets implementation of Scintilla. A class derived
// from ScintillaBase that uses the "wx platform" defined in
// PlatformWX.cxx This class is one end of a bridge between
diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index dfb9b6965b..df5ad6748a 100644
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////
-// Name: ScintillaWX.h
+// Name: src/stc/ScintillaWX.h
// Purpose: A wxWidgets implementation of Scintilla. A class derived
// from ScintillaBase that uses the "wx platform" defined in
// PlatWX.cpp. This class is one end of a bridge between
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index b0a98e41ee..58f5ab5d41 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////
-// Name: stc.cpp
+// Name: src/stc/stc.cpp
// Purpose: A wxWidgets implementation of Scintilla. This class is the
// one meant to be used directly by wx applications. It does not
// derive directly from the Scintilla classes, but instead
diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index 788196ca61..b26b313082 100644
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: univ/button.cpp
+// Name: src/univ/button.cpp
// Purpose: wxButton
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 67a653c8cc..0d08d019ce 100644
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/univ/frame.cpp
+// Name: src/univ/framuniv.cpp
// Purpose: wxFrame class for wxUniversal
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp
index f34de9ab82..663a8ffe8e 100644
--- a/src/univ/gauge.cpp
+++ b/src/univ/gauge.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/gauge/gaugecmn.cpp
+// Name: src/gauge/gauge.cpp
// Purpose: wxGauge for wxUniversal
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/univ/inphand.cpp b/src/univ/inphand.cpp
index 325a9b36f0..0c05592dab 100644
--- a/src/univ/inphand.cpp
+++ b/src/univ/inphand.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: univ/inphand.cpp
+// Name: src/univ/inphand.cpp
// Purpose: (trivial) wxInputHandler implementation
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp
index 499f53a1ec..08ef3db11e 100644
--- a/src/univ/spinbutt.cpp
+++ b/src/univ/spinbutt.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: univ/spinbutt.cpp
+// Name: src/univ/spinbutt.cpp
// Purpose: implementation of the universal version of wxSpinButton
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/univ/statbox.cpp b/src/univ/statbox.cpp
index 1241fe2638..8e60fbad47 100644
--- a/src/univ/statbox.cpp
+++ b/src/univ/statbox.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: univ/statbox.cpp
+// Name: src/univ/statbox.cpp
// Purpose: wxStaticBox implementation
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/univ/statline.cpp b/src/univ/statline.cpp
index 980af6185a..b353bf7474 100644
--- a/src/univ/statline.cpp
+++ b/src/univ/statline.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: univ/statline.cpp
+// Name: src/univ/statline.cpp
// Purpose: wxStaticLine implementation
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/univ/tglbtn.cpp b/src/univ/tglbtn.cpp
index 91a90ac238..f9d541af6d 100644
--- a/src/univ/tglbtn.cpp
+++ b/src/univ/tglbtn.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: univ/tglbtn.cpp
+// Name: src/univ/tglbtn.cpp
// Purpose: wxToggleButton
// Author: Vadim Zeitlin
// Modified by: David Bjorkevik
diff --git a/src/univ/theme.cpp b/src/univ/theme.cpp
index 28119dd6a9..9aef4355b9 100644
--- a/src/univ/theme.cpp
+++ b/src/univ/theme.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: univ/theme.cpp
+// Name: src/univ/theme.cpp
// Purpose: implementation of wxTheme
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 1f86e4861c..2cfba82d83 100644
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/univ/window.cpp
+// Name: src/univ/winuniv.cpp
// Purpose: implementation of extra wxWindow methods for wxUniv port
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/unix/appunix.cpp b/src/unix/appunix.cpp
index 4bf75e675b..5c59dec71c 100644
--- a/src/unix/appunix.cpp
+++ b/src/unix/appunix.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/unix/appunix.cpp
+// Name: src/unix/appunix.cpp
// Purpose: wxAppConsole with wxMainLoop implementation
// Author: Lukasz Michalski
// Created: 28/01/2005
diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index d016047cb1..9e71c8a40f 100644
--- a/src/unix/dir.cpp
+++ b/src/unix/dir.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: unix/dir.cpp
+// Name: src/unix/dir.cpp
// Purpose: wxDir implementation for Unix/POSIX systems
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp
index 413c51201d..5ca297a067 100644
--- a/src/unix/dlunix.cpp
+++ b/src/unix/dlunix.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: unix/dlunix.cpp
+// Name: src/unix/dlunix.cpp
// Purpose: Unix-specific part of wxDynamicLibrary and related classes
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/unix/epolldispatcher.cpp b/src/unix/epolldispatcher.cpp
index 7d06f6da87..47f4dd4f56 100644
--- a/src/unix/epolldispatcher.cpp
+++ b/src/unix/epolldispatcher.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/common/epolldispatcher.cpp
+// Name: src/unix/epolldispatcher.cpp
// Purpose: implements dispatcher for epoll_wait() call
// Author: Lukasz Michalski
// Created: April 2007
diff --git a/src/unix/glx11.cpp b/src/unix/glx11.cpp
index 803a8c88ae..05f9625a8c 100644
--- a/src/unix/glx11.cpp
+++ b/src/unix/glx11.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: src/univ/glx11.cpp
+// Name: src/unix/glx11.cpp
// Purpose: code common to all X11-based wxGLCanvas implementations
// Author: Vadim Zeitlin
// Created: 2007-04-15
diff --git a/src/unix/net.cpp b/src/unix/net.cpp
index 2b1ea3cede..268eb46b06 100644
--- a/src/unix/net.cpp
+++ b/src/unix/net.cpp
@@ -1,5 +1,5 @@
// -*- c++ -*- ///////////////////////////////////////////////////////////////
-// Name: unix/net.cpp
+// Name: src/unix/net.cpp
// Purpose: Network related wxWindows classes and functions
// Author: Karsten Ballüder
// Modified by:
diff --git a/src/unix/stackwalk.cpp b/src/unix/stackwalk.cpp
index ad78765094..6c234adbea 100644
--- a/src/unix/stackwalk.cpp
+++ b/src/unix/stackwalk.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/stackwalk.cpp
+// Name: src/unix/stackwalk.cpp
// Purpose: wxStackWalker implementation for Unix/glibc
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index c26f6d706c..d65bb8dd7f 100644
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
-// Name: unix/stdpaths.cpp
+// Name: src/unix/stdpaths.cpp
// Purpose: wxStandardPaths implementation for Unix & OpenVMS systems
// Author: Vadim Zeitlin
// Modified by:
diff --git a/src/x11/data.cpp b/src/x11/data.cpp
index 9a16dd6c4a..e1ecec4bd7 100644
--- a/src/x11/data.cpp
+++ b/src/x11/data.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: x11/data.cpp
+// Name: src/x11/data.cpp
// Purpose: Various X11-specific global data
// Author: Julian Smart
// Modified by:
diff --git a/src/x11/minifram.cpp b/src/x11/minifram.cpp
index e2b1df4090..df61a05f48 100644
--- a/src/x11/minifram.cpp
+++ b/src/x11/minifram.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: minifram.cpp
+// Name: src/x11/minifram.cpp
// Purpose: wxMiniFrame. Optional; identical to wxFrame if not supported.
// Author: Julian Smart
// Modified by:
diff --git a/src/xrc/xh_datectrl.cpp b/src/xrc/xh_datectrl.cpp
index f0426209e3..4c0225b57f 100644
--- a/src/xrc/xh_datectrl.cpp
+++ b/src/xrc/xh_datectrl.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_datectrl.cpp
+// Name: src/xrc/xh_datectrl.cpp
// Purpose: XML resource handler for wxDatePickerCtrl
// Author: Vaclav Slavik
// Created: 2005-02-07
diff --git a/src/xrc/xh_grid.cpp b/src/xrc/xh_grid.cpp
index e3031ee27f..b2d570c6da 100644
--- a/src/xrc/xh_grid.cpp
+++ b/src/xrc/xh_grid.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_grid.h
+// Name: src/xrc/xh_grid.cpp
// Purpose: XML resource handler for the grid control
// Author: Agron Selimaj
// Created: 2005/08/11
diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp
index 9ad368cd86..efdc7c727c 100644
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_html.cpp
+// Name: src/xrc/xh_html.cpp
// Purpose: XRC resource for wxHtmlWindow
// Author: Bob Mitchell
// Created: 2000/03/21
diff --git a/src/xrc/xh_htmllbox.cpp b/src/xrc/xh_htmllbox.cpp
index d70fc0d4a8..5753a21324 100644
--- a/src/xrc/xh_htmllbox.cpp
+++ b/src/xrc/xh_htmllbox.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_simplehtmllbox.cpp
+// Name: src/xrc/xh_simplehtmllbox.cpp
// Purpose: XML resource handler for wxSimpleHtmlListBox
// Author: Francesco Montorsi
// Created: 2006/10/21
diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index 5684e74777..01b0a057b0 100644
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_spin.cpp
+// Name: src/xrc/xh_spin.cpp
// Purpose: XRC resource for wxSpinButton
// Author: Bob Mitchell
// Created: 2000/03/21
diff --git a/src/xrc/xh_stlin.cpp b/src/xrc/xh_stlin.cpp
index 4db3dc7c89..3fdb95f8ea 100644
--- a/src/xrc/xh_stlin.cpp
+++ b/src/xrc/xh_stlin.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_stbox.cpp
+// Name: src/xrc/xh_stlin.cpp
// Purpose: XRC resource for wxStaticLine
// Author: Brian Gavin
// Created: 2000/09/09
diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index be031f7565..62cb16edb1 100644
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_tglbtn.cpp
+// Name: src/xrc/xh_tglbtn.cpp
// Purpose: XRC resource for wxToggleButton
// Author: Bob Mitchell
// Created: 2000/03/21
diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index dc7e178161..b2db5a257e 100644
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_tree.cpp
+// Name: src/xrc/xh_tree.cpp
// Purpose: XRC resource for wxTreeCtrl
// Author: Brian Gavin
// Created: 2000/09/09
--
2.47.2