From 233f573883834b6c86ad5a9d72fdb6a260f74f81 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 13 Jul 2010 13:29:58 +0000 Subject: [PATCH] Fix file paths in the header comments. Consistently use only "wx/foo.h" instead of "include/wx/foo.h" ("include" is always implicit anyhow). Also use "src/osx" instead of "src/mac" for the files in this directory. See #12165. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/doxygen/mainpages/const_wxusedef.h | 6 +++--- include/wx/afterstd.h | 2 +- include/wx/arrstr.h | 2 +- include/wx/beforestd.h | 2 +- include/wx/msw/gdiimage.h | 2 +- include/wx/msw/iniconf.h | 2 +- include/wx/os2/iniconf.h | 2 +- include/wx/osx/carbon/drawer.h | 2 +- include/wx/osx/carbon/evtloop.h | 2 +- include/wx/osx/carbon/mimetype.h | 2 +- include/wx/osx/carbon/private/overlay.h | 2 +- include/wx/osx/carbon/private/timer.h | 2 +- include/wx/osx/carbon/uma.h | 2 +- include/wx/osx/checklst.h | 2 +- include/wx/osx/choice.h | 2 +- include/wx/osx/cocoa/dataview.h | 2 +- include/wx/osx/colordlg.h | 2 +- include/wx/osx/core/cfdataref.h | 4 ++-- include/wx/osx/core/cfref.h | 4 ++-- include/wx/osx/core/cfstring.h | 2 +- include/wx/osx/core/colour.h | 2 +- include/wx/osx/core/hid.h | 2 +- include/wx/osx/core/private/strconv_cf.h | 2 +- include/wx/osx/core/stdpaths.h | 2 +- include/wx/osx/dcprint.h | 2 +- include/wx/osx/dnd.h | 2 +- include/wx/osx/evtloop.h | 7 ++++--- include/wx/osx/fontdlg.h | 2 +- include/wx/osx/glcanvas.h | 2 +- include/wx/osx/listbox.h | 2 +- include/wx/osx/mdi.h | 2 +- include/wx/osx/menuitem.h | 2 +- include/wx/osx/msgdlg.h | 2 +- include/wx/osx/nonownedwnd.h | 2 +- include/wx/osx/palette.h | 2 +- include/wx/osx/popupwin.h | 2 +- include/wx/osx/printdlg.h | 2 +- include/wx/osx/radiobox.h | 2 +- include/wx/osx/srchctrl.h | 2 +- include/wx/osx/statusbr.h | 2 +- include/wx/osx/textctrl.h | 2 +- include/wx/osx/toolbar.h | 2 +- include/wx/osx/tooltip.h | 2 +- include/wx/osx/toplevel.h | 2 +- include/wx/osx/treectrl.h | 2 +- include/wx/osx/window.h | 2 +- include/wx/position.h | 2 +- include/wx/private/fileback.h | 2 +- include/wx/private/filename.h | 2 +- include/wx/private/stattext.h | 2 +- include/wx/scrolwin.h | 2 +- include/wx/uiaction.h | 2 +- include/wx/vscroll.h | 2 +- include/wx/wx_cwcocoa.h | 2 +- include/wx/wx_cwcocoa_cm.h | 2 +- include/wx/wx_cwcocoa_d.h | 2 +- src/html/htmlctrl/webkit/webkit.mm | 2 +- src/osx/carbon/aboutdlg.cpp | 2 +- src/osx/carbon/glcanvas.cpp | 2 +- src/osx/carbon/region.cpp | 2 +- src/osx/carbon/statline.cpp | 2 +- src/osx/carbon/timer.cpp | 2 +- src/osx/glcanvas_osx.cpp | 2 +- 63 files changed, 70 insertions(+), 69 deletions(-) diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h index 98e5635335..1ed7ee9be2 100644 --- a/docs/doxygen/mainpages/const_wxusedef.h +++ b/docs/doxygen/mainpages/const_wxusedef.h @@ -296,9 +296,9 @@ library: @section page_wxusedef_mac wxUSE preprocessor symbols used only in wxMac port @beginDefList -@itemdef{wxUSE_MAC_CRITICAL_REGION_MUTEX, See src/mac/carbon/thread.cpp file.} -@itemdef{wxUSE_MAC_PTHREADS_MUTEX, See src/mac/carbon/thread.cpp file.} -@itemdef{wxUSE_MAC_SEMAPHORE_MUTEX, See src/mac/carbon/thread.cpp file.} +@itemdef{wxUSE_MAC_CRITICAL_REGION_MUTEX, See src/osx/carbon/thread.cpp file.} +@itemdef{wxUSE_MAC_PTHREADS_MUTEX, See src/osx/carbon/thread.cpp file.} +@itemdef{wxUSE_MAC_SEMAPHORE_MUTEX, See src/osx/carbon/thread.cpp file.} @itemdef{wxUSE_WEBKIT, Use wxWebKitCtrl class.} @endDefList diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h index 2ab5d743db..107d594eff 100644 --- a/include/wx/afterstd.h +++ b/include/wx/afterstd.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: include/wx/afterstd.h +// Name: wx/afterstd.h // Purpose: #include after STL headers // Author: Vadim Zeitlin // Modified by: diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h index 9fe25c6b0a..f9e297dd33 100644 --- a/include/wx/arrstr.h +++ b/include/wx/arrstr.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: include/wx/arrstr.h +// Name: wx/arrstr.h // Purpose: wxArrayString class // Author: Mattia Barbon and Vadim Zeitlin // Modified by: diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h index 832a7ee4e8..d4b8d940ce 100644 --- a/include/wx/beforestd.h +++ b/include/wx/beforestd.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: include/wx/beforestd.h +// Name: wx/beforestd.h // Purpose: #include before STL headers // Author: Vadim Zeitlin // Modified by: diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h index 5d29779996..10810cf42b 100644 --- a/include/wx/msw/gdiimage.h +++ b/include/wx/msw/gdiimage.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: include/wx/msw/gdiimage.h +// Name: wx/msw/gdiimage.h // Purpose: wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor // under MSW // Author: Vadim Zeitlin diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h index dc30fd3aa7..e65baba61d 100644 --- a/include/wx/msw/iniconf.h +++ b/include/wx/msw/iniconf.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: include/wx/msw/iniconf.h +// Name: wx/msw/iniconf.h // Purpose: INI-file based wxConfigBase implementation // Author: Vadim Zeitlin // Modified by: diff --git a/include/wx/os2/iniconf.h b/include/wx/os2/iniconf.h index 896947c4f4..da3ec325af 100644 --- a/include/wx/os2/iniconf.h +++ b/include/wx/os2/iniconf.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: include/wx/msw/iniconf.h +// Name: wx/msw/iniconf.h // Purpose: INI-file based wxConfigBase implementation // Author: David Webster // Modified by: diff --git a/include/wx/osx/carbon/drawer.h b/include/wx/osx/carbon/drawer.h index ea9b70b15a..d683573785 100644 --- a/include/wx/osx/carbon/drawer.h +++ b/include/wx/osx/carbon/drawer.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/drawer.h +// Name: wx/osx/carbon/drawer.h // Purpose: Drawer child window class. // Drawer windows appear under their parent window and // behave like a drawer, opening and closing to reveal diff --git a/include/wx/osx/carbon/evtloop.h b/include/wx/osx/carbon/evtloop.h index 94dc0fa5ef..c5393d8b8c 100644 --- a/include/wx/osx/carbon/evtloop.h +++ b/include/wx/osx/carbon/evtloop.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/evtloop.h +// Name: wx/osx/carbon/evtloop.h // Purpose: declaration of wxEventLoop for wxMac // Author: Vadim Zeitlin // Modified by: diff --git a/include/wx/osx/carbon/mimetype.h b/include/wx/osx/carbon/mimetype.h index 594834ece5..b084c484c4 100644 --- a/include/wx/osx/carbon/mimetype.h +++ b/include/wx/osx/carbon/mimetype.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/mimetype.h +// Name: wx/osx/carbon/mimetype.h // Purpose: Mac Carbon implementation for wx mime-related classes // Author: Ryan Norton // Modified by: diff --git a/include/wx/osx/carbon/private/overlay.h b/include/wx/osx/carbon/private/overlay.h index 60dd892c06..8daa11d351 100644 --- a/include/wx/osx/carbon/private/overlay.h +++ b/include/wx/osx/carbon/private/overlay.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/private/overlay.h +// Name: wx/osx/carbon/private/overlay.h // Purpose: wxOverlayImpl declaration // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/carbon/private/timer.h b/include/wx/osx/carbon/private/timer.h index 53a0af85aa..8f6f10c758 100644 --- a/include/wx/osx/carbon/private/timer.h +++ b/include/wx/osx/carbon/private/timer.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/private/timer.h +// Name: wx/osx/carbon/private/timer.h // Purpose: wxTimer class // Author: Stefan Csomor // Created: 1998-01-01 diff --git a/include/wx/osx/carbon/uma.h b/include/wx/osx/carbon/uma.h index 00477c6b25..814e5b6253 100644 --- a/include/wx/osx/carbon/uma.h +++ b/include/wx/osx/carbon/uma.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/uma.h +// Name: wx/osx/carbon/uma.h // Purpose: Universal MacOS API // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/checklst.h b/include/wx/osx/checklst.h index 5927fbabd3..f2d547c505 100644 --- a/include/wx/osx/checklst.h +++ b/include/wx/osx/checklst.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/checklst.h +// Name: wx/osx/checklst.h // Purpose: wxCheckListBox class - a listbox with checkable items // Note: this is an optional class. // Author: Stefan Csomor diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h index 20421e046c..e6c49aada9 100644 --- a/include/wx/osx/choice.h +++ b/include/wx/osx/choice.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/choice.h +// Name: wx/osx/choice.h // Purpose: wxChoice class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h index ed79f03b94..09fa842aa7 100644 --- a/include/wx/osx/cocoa/dataview.h +++ b/include/wx/osx/cocoa/dataview.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/carbon/dataview.h +// Name: wx/osx/cocoa/dataview.h // Purpose: wxDataViewCtrl native implementation header for carbon // Author: // Id: $Id: dataview.h 57374 2009-01-27 diff --git a/include/wx/osx/colordlg.h b/include/wx/osx/colordlg.h index 219e1b4e19..f4ff9c5d80 100644 --- a/include/wx/osx/colordlg.h +++ b/include/wx/osx/colordlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/colordlg.h +// Name: wx/osx/colordlg.h // Purpose: wxColourDialog class. Use generic version if no // platform-specific implementation. // Author: Stefan Csomor diff --git a/include/wx/osx/core/cfdataref.h b/include/wx/osx/core/cfdataref.h index 8ae8417300..b1b9cc7771 100644 --- a/include/wx/osx/core/cfdataref.h +++ b/include/wx/osx/core/cfdataref.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/corefoundation/cfdata.h +// Name: wx/osx/core/cfdataref.h // Purpose: wxCFDataRef class // Author: Stefan Csomor // Modified by: @@ -9,7 +9,7 @@ // Licence: wxWindows licence // Notes: See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBinaryData/index.html ///////////////////////////////////////////////////////////////////////////// -/*! @header wx/mac/corefoundation/cfref.h +/*! @header wx/osx/core/cfdataref.h @abstract wxCFDataRef template class */ diff --git a/include/wx/osx/core/cfref.h b/include/wx/osx/core/cfref.h index cb4f636498..90c7ae4158 100644 --- a/include/wx/osx/core/cfref.h +++ b/include/wx/osx/core/cfref.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/corefoundation/cfref.h +// Name: wx/osx/core/cfref.h // Purpose: wxCFRef template class // Author: David Elliott // Modified by: Stefan Csomor @@ -9,7 +9,7 @@ // Licence: wxWindows licence // Notes: See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFMemoryMgmt/index.html ///////////////////////////////////////////////////////////////////////////// -/*! @header wx/mac/corefoundation/cfref.h +/*! @header wx/osx/core/cfref.h @abstract wxCFRef template class @discussion FIXME: Convert doc tags to something less buggy with C++ */ diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h index 60949ad65e..66a86760da 100644 --- a/include/wx/osx/core/cfstring.h +++ b/include/wx/osx/core/cfstring.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/corefoundation/cfstring.h +// Name: wx/osx/core/cfstring.h // Purpose: wxCFStringRef and other string functions // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h index bbc7201222..cdb0f83a2c 100644 --- a/include/wx/osx/core/colour.h +++ b/include/wx/osx/core/colour.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/colour.h +// Name: wx/osx/core/colour.h // Purpose: wxColour class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/core/hid.h b/include/wx/osx/core/hid.h index e6df5cb45f..e7d237a38e 100644 --- a/include/wx/osx/core/hid.h +++ b/include/wx/osx/core/hid.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/corefoundation/hid.h +// Name: wx/osx/core/hid.h // Purpose: DARWIN HID layer for WX // Author: Ryan Norton // Modified by: diff --git a/include/wx/osx/core/private/strconv_cf.h b/include/wx/osx/core/private/strconv_cf.h index 07a98a1de0..1c49cc3919 100644 --- a/include/wx/osx/core/private/strconv_cf.h +++ b/include/wx/osx/core/private/strconv_cf.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/mac/corefoundation/strconv_cf.h +// Name: wx/osx/core/private/strconv_cf.h // Purpose: Unicode conversion classes // Author: David Elliott, Ryan Norton // Modified by: diff --git a/include/wx/osx/core/stdpaths.h b/include/wx/osx/core/stdpaths.h index a456571e83..4c48407f7b 100644 --- a/include/wx/osx/core/stdpaths.h +++ b/include/wx/osx/core/stdpaths.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/corefoundation/stdpaths.h +// Name: wx/osx/core/stdpaths.h // Purpose: wxStandardPaths for CoreFoundation systems // Author: David Elliott // Modified by: diff --git a/include/wx/osx/dcprint.h b/include/wx/osx/dcprint.h index 4380f4f4f2..f2fd5090d1 100644 --- a/include/wx/osx/dcprint.h +++ b/include/wx/osx/dcprint.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/dcprint.h +// Name: wx/osx/dcprint.h // Purpose: wxPrinterDC class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h index 0bb4e9daf9..982e41b219 100644 --- a/include/wx/osx/dnd.h +++ b/include/wx/osx/dnd.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/dnd.h +// Name: wx/osx/dnd.h // Purpose: Declaration of the wxDropTarget, wxDropSource class etc. // Author: Stefan Csomor // RCS-ID: $Id$ diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h index 45b411e903..35768078ad 100644 --- a/include/wx/osx/evtloop.h +++ b/include/wx/osx/evtloop.h @@ -1,7 +1,8 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: include/wx/osx/evtloop.h -// Purpose: simply forwards to wx/mac/carbon/evtloop.h for consistency with -// the other Mac headers +// Name: wx/osx/evtloop.h +// Purpose: simply forwards to wx/osx/carbon/evtloop.h or +// wx/osx/cocoa/evtloop.h for consistency with the other Mac +// headers // Author: Vadim Zeitlin // Modified by: // Created: 2006-01-12 diff --git a/include/wx/osx/fontdlg.h b/include/wx/osx/fontdlg.h index ca96ff10c9..f57bb32b99 100644 --- a/include/wx/osx/fontdlg.h +++ b/include/wx/osx/fontdlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/fontdlg.h +// Name: wx/osx/fontdlg.h // Purpose: wxFontDialog class using fonts window services (10.2+). // Author: Ryan Norton // Modified by: diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h index ff97bdf0ef..3377084b26 100644 --- a/include/wx/osx/glcanvas.h +++ b/include/wx/osx/glcanvas.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/glcanvas.h +// Name: wx/osx/glcanvas.h // Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h index bb0e176251..870fe8f272 100644 --- a/include/wx/osx/listbox.h +++ b/include/wx/osx/listbox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/listbox.h +// Name: wx/osx/listbox.h // Purpose: wxListBox class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h index cea49387eb..3dd21bf646 100644 --- a/include/wx/osx/mdi.h +++ b/include/wx/osx/mdi.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/carbon/mdi.h +// Name: wx/osx/mdi.h // Purpose: MDI (Multiple Document Interface) classes. // Author: Stefan Csomor // Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h index 3e7c246bf7..875831f0ab 100644 --- a/include/wx/osx/menuitem.h +++ b/include/wx/osx/menuitem.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/menuitem.h +// Name: wx/osx/menuitem.h // Purpose: wxMenuItem class // Author: Vadim Zeitlin // Modified by: diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h index 00b54b7df0..a3f7a4dcf8 100644 --- a/include/wx/osx/msgdlg.h +++ b/include/wx/osx/msgdlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/msgdlg.h +// Name: wx/osx/msgdlg.h // Purpose: wxMessageDialog class. Use generic version if no // platform-specific implementation. // Author: Stefan Csomor diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h index 8a82458f8e..843b7589b8 100644 --- a/include/wx/osx/nonownedwnd.h +++ b/include/wx/osx/nonownedwnd.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/nonownedwnd.h +// Name: wx/osx/nonownedwnd.h // Purpose: declares wxNonOwnedWindow class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/palette.h b/include/wx/osx/palette.h index 5c6aa4740f..94be934710 100644 --- a/include/wx/osx/palette.h +++ b/include/wx/osx/palette.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/palette.h +// Name: wx/osx/palette.h // Purpose: wxPalette class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h index 58b591d0a8..e6840871c6 100644 --- a/include/wx/osx/popupwin.h +++ b/include/wx/osx/popupwin.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/popupwin.h +// Name: wx/osx/popupwin.h // Purpose: wxPopupWindow class for wxMac // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h index dc1cf5c72a..1b976619fa 100644 --- a/include/wx/osx/printdlg.h +++ b/include/wx/osx/printdlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/printdlg.h +// Name: wx/osx/printdlg.h // Purpose: wxPrintDialog, wxPageSetupDialog classes. // Use generic, PostScript version if no // platform-specific implementation. diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h index 47652ec487..6f9dcd4268 100644 --- a/include/wx/osx/radiobox.h +++ b/include/wx/osx/radiobox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/radiobox.h +// Name: wx/osx/radiobox.h // Purpose: wxRadioBox class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/srchctrl.h b/include/wx/osx/srchctrl.h index 6166be7dda..ecbc925f6e 100644 --- a/include/wx/osx/srchctrl.h +++ b/include/wx/osx/srchctrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/srchctrl.h +// Name: wx/osx/srchctrl.h // Purpose: mac carbon wxSearchCtrl class // Author: Vince Harron // Created: 2006-02-19 diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h index b1c73a7dbb..f2b70c477f 100644 --- a/include/wx/osx/statusbr.h +++ b/include/wx/osx/statusbr.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/statusbr.h +// Name: wx/osx/statusbr.h // Purpose: native implementation of wxStatusBar. // Optional: can use generic version instead. // Author: Stefan Csomor diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h index 1116b4def8..c2d2ae2edd 100644 --- a/include/wx/osx/textctrl.h +++ b/include/wx/osx/textctrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/textctrl.h +// Name: wx/osx/textctrl.h // Purpose: wxTextCtrl class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h index df388af6eb..2ad7deafdc 100644 --- a/include/wx/osx/toolbar.h +++ b/include/wx/osx/toolbar.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/toolbar.h +// Name: wx/osx/toolbar.h // Purpose: wxToolBar class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/tooltip.h b/include/wx/osx/tooltip.h index df51d47ffb..0a1b9b5812 100644 --- a/include/wx/osx/tooltip.h +++ b/include/wx/osx/tooltip.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/tooltip.h +// Name: wx/osx/tooltip.h // Purpose: wxToolTip class - tooltip control // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h index 8ddac703e8..675c5af2fc 100644 --- a/include/wx/osx/toplevel.h +++ b/include/wx/osx/toplevel.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/toplevel.h +// Name: wx/osx/toplevel.h // Purpose: wxTopLevelWindowMac is the Mac implementation of wxTLW // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/treectrl.h b/include/wx/osx/treectrl.h index 626471f77d..38844c7b65 100644 --- a/include/wx/osx/treectrl.h +++ b/include/wx/osx/treectrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/treectrl.h +// Name: wx/osx/treectrl.h // Purpose: wxTreeCtrl class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h index 54446478ad..4740a11686 100644 --- a/include/wx/osx/window.h +++ b/include/wx/osx/window.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/mac/carbon/window.h +// Name: wx/osx/window.h // Purpose: wxWindowMac class // Author: Stefan Csomor // Modified by: diff --git a/include/wx/position.h b/include/wx/position.h index 7b7cdbf38e..f35203b160 100644 --- a/include/wx/position.h +++ b/include/wx/position.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/position.h +// Name: wx/position.h // Purpose: Common structure and methods for positional information. // Author: Vadim Zeitlin, Robin Dunn, Brad Anderson, Bryan Petty // Created: 2007-03-13 diff --git a/include/wx/private/fileback.h b/include/wx/private/fileback.h index 9698fbc825..11244e9a8d 100644 --- a/include/wx/private/fileback.h +++ b/include/wx/private/fileback.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/private/fileback.h +// Name: wx/private/fileback.h // Purpose: Back an input stream with memory or a file // Author: Mike Wetherell // RCS-ID: $Id$ diff --git a/include/wx/private/filename.h b/include/wx/private/filename.h index ac2bbd3242..3ed734b4b7 100644 --- a/include/wx/private/filename.h +++ b/include/wx/private/filename.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/private/filename.h +// Name: wx/private/filename.h // Purpose: Internal declarations for src/common/filename.cpp // Author: Mike Wetherell // Modified by: diff --git a/include/wx/private/stattext.h b/include/wx/private/stattext.h index 8c8966d64c..69ddc9081a 100644 --- a/include/wx/private/stattext.h +++ b/include/wx/private/stattext.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/private/stattext.h +// Name: wx/private/stattext.h // Purpose: Internal declarations for dlgcmn.cpp and stattextcmn.cpp // Author: Francesco Montorsi // Created: 2007-01-07 (extracted from dlgcmn.cpp) diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index f1ca429fff..6360fd721b 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/scrolwin.h +// Name: wx/scrolwin.h // Purpose: wxScrolledWindow, wxScrolledControl and wxScrollHelper // Author: Vadim Zeitlin // Modified by: diff --git a/include/wx/uiaction.h b/include/wx/uiaction.h index a11bb347eb..a08aea76aa 100644 --- a/include/wx/uiaction.h +++ b/include/wx/uiaction.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/uiaction.cpp +// Name: wx/uiaction.h // Purpose: wxUIActionSimulator interface // Author: Kevin Ollivier // Modified by: diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h index bfb1b252af..f32e90adc7 100644 --- a/include/wx/vscroll.h +++ b/include/wx/vscroll.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/vscroll.h +// Name: wx/vscroll.h // Purpose: Variable scrolled windows (wx[V/H/HV]ScrolledWindow) // Author: Vadim Zeitlin // Modified by: Brad Anderson, Bryan Petty diff --git a/include/wx/wx_cwcocoa.h b/include/wx/wx_cwcocoa.h index eaf8dfba69..6f557ce146 100644 --- a/include/wx/wx_cwcocoa.h +++ b/include/wx/wx_cwcocoa.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/wx_cwcocoa.h +// Name: wx/wx_cwcocoa.h // Purpose: Metrowerks Prefix Header File (wxCocoa Release) // Author: Tommy Tian (tommy.tian@webex.com) // Modified by: David Elliott diff --git a/include/wx/wx_cwcocoa_cm.h b/include/wx/wx_cwcocoa_cm.h index df94434a3e..54c9c53d46 100644 --- a/include/wx/wx_cwcocoa_cm.h +++ b/include/wx/wx_cwcocoa_cm.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/wx_cwcocoa_cm.h +// Name: wx/wx_cwcocoa_cm.h // Purpose: Metrowerks wxCocoa PCH common definitions // Author: Tommy Tian (tommy.tian@webex.com) // Modified by: diff --git a/include/wx/wx_cwcocoa_d.h b/include/wx/wx_cwcocoa_d.h index 0de70821ca..d6fcb4fc4e 100644 --- a/include/wx/wx_cwcocoa_d.h +++ b/include/wx/wx_cwcocoa_d.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/wx_cwcocoa_d.h +// Name: wx/wx_cwcocoa_d.h // Purpose: Metrowerks Prefix Header File (wxCocoa Debug) // Author: Tommy Tian (tommy.tian@webex.com) // Modified by: David Elliott diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm index 59192ca436..6f6ecbc845 100644 --- a/src/html/htmlctrl/webkit/webkit.mm +++ b/src/html/htmlctrl/webkit/webkit.mm @@ -57,7 +57,7 @@ END_EVENT_TABLE() // Carbon Events handlers // ---------------------------------------------------------------------------- -// prototype for function in src/mac/carbon/toplevel.cpp +// prototype for function in src/osx/carbon/nonownedwnd.cpp void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ); static const EventTypeSpec eventList[] = diff --git a/src/osx/carbon/aboutdlg.cpp b/src/osx/carbon/aboutdlg.cpp index 51b40889b0..73696ef63d 100644 --- a/src/osx/carbon/aboutdlg.cpp +++ b/src/osx/carbon/aboutdlg.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: mac/carbon/aboutdlg.cpp +// Name: osx/carbon/aboutdlg.cpp // Purpose: native wxAboutBox() implementation for wxMac // Author: Vadim Zeitlin // Created: 2006-10-08 diff --git a/src/osx/carbon/glcanvas.cpp b/src/osx/carbon/glcanvas.cpp index 9a6226dd9a..f8483e844e 100644 --- a/src/osx/carbon/glcanvas.cpp +++ b/src/osx/carbon/glcanvas.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: src/mac/carbon/glcanvas.cpp +// Name: src/osx/carbon/glcanvas.cpp // Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh // Author: Stefan Csomor // Modified by: diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp index 28630b83d9..2d5fad8569 100644 --- a/src/osx/carbon/region.cpp +++ b/src/osx/carbon/region.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// File: src/mac/carbon/region.cpp +// File: src/osx/carbon/region.cpp // Purpose: Region class // Author: Stefan Csomor // Created: Fri Oct 24 10:46:34 MET 1997 diff --git a/src/osx/carbon/statline.cpp b/src/osx/carbon/statline.cpp index 62abfd106a..ca968e6c08 100644 --- a/src/osx/carbon/statline.cpp +++ b/src/osx/carbon/statline.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mac/carbon/statline.cpp +// Name: src/osx/carbon/statline.cpp // Purpose: wxStaticLine class // Author: Vadim Zeitlin // Created: 28.06.99 diff --git a/src/osx/carbon/timer.cpp b/src/osx/carbon/timer.cpp index 4ed70d9c93..7f56a84310 100644 --- a/src/osx/carbon/timer.cpp +++ b/src/osx/carbon/timer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sec/mac/carbon/timer.cpp +// Name: src/osx/carbon/timer.cpp // Purpose: wxTimer implementation // Author: Stefan Csomor // Modified by: diff --git a/src/osx/glcanvas_osx.cpp b/src/osx/glcanvas_osx.cpp index 56f74a7f41..8ef310d796 100644 --- a/src/osx/glcanvas_osx.cpp +++ b/src/osx/glcanvas_osx.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: src/mac/carbon/glcanvas.cpp +// Name: src/osx/glcanvas_osx.cpp // Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh // Author: Stefan Csomor // Modified by: -- 2.45.2