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

diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h
index 98e56353358fb591dfbcb6c80ba8744b097b0431..1ed7ee9be2845f49c54615f7990440f478de5338 100644 (file)
--- 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
 @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
 
 @itemdef{wxUSE_WEBKIT, Use wxWebKitCtrl class.}
 @endDefList
 

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index 2ab5d743dbd01331be24691c7df45cc3f4a0a36a..107d594eff6ab7fa979b8f2ac4cbe4aebd629567 100644 (file)
--- 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:
 // Purpose:     #include after STL headers
 // Author:      Vadim Zeitlin
 // Modified by:

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 9fe25c6b0a4bf259779bfab68620472f7cd4d8fb..f9e297dd33d949acc43625a3aa77b2875d7126a9 100644 (file)
--- 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:
 // Purpose:     wxArrayString class
 // Author:      Mattia Barbon and Vadim Zeitlin
 // Modified by:

diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
index 832a7ee4e8a13733f06c9eaf254274a4bd456a2f..d4b8d940ce8cc9b23020e938d0c133d7b305249b 100644 (file)
--- 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:
 // 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 5d2977999685b2bc6ffd1c065518e57f2b76fe5a..10810cf42b500fac84cd76f2a606b38a63bc0985 100644 (file)
--- 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
 // 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 dc30fd3aa7ad460bfc29f79625ae4ed7982aeb80..e65baba61da1416944847d3347658d3e74cfcd6e 100644 (file)
--- 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:
 // 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 896947c4f4ce5413a45109c75e408e258e2a2a39..da3ec325af86357e6e86a97c4984abe4c41325ee 100644 (file)
--- 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:
 // 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 ea9b70b15a0578eb08367a3044902eeddae8e964..d6835737854eee389895fd1061d5955cf9a8695a 100644 (file)
--- 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
 // 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 94dc0fa5ef84c845a55ff6dd473c89bfc5af5978..c5393d8b8c7c9b88baad480fd3de5b1bb682ddb7 100644 (file)
--- 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:
 // 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 594834ece5bee759787c2dbacabb312b21972904..b084c484c44912c94e48c61c48aef15107dfee1a 100644 (file)
--- 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:
 // 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 60dd892c06fe25c16a164ce007946fae1488f7fc..8daa11d3515d968372239b8a52c63ed75d54bd43 100644 (file)
--- 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:
 // 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 53a0af85aa4ba54f36b69b0f2221ae13bc7bd940..8f6f10c758abc0793ab1234aa7a468c87430a658 100644 (file)
--- 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
 // 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 00477c6b25aaedaed6fabb758d3a62f401d51331..814e5b625334eb9b5a9fbfbac9a99340215072f0 100644 (file)
--- 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:
 // Purpose:     Universal MacOS API
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/include/wx/osx/checklst.h b/include/wx/osx/checklst.h
index 5927fbabd32f5b34ba06df958e141482aa12b408..f2d547c5055ec927f83667776d4584def8b6e4d1 100644 (file)
--- 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
 // 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 20421e046cdc6b023959bcf333871b1cbfba999e..e6c49aada957aae7070c95d4fcbbe6ad088000c4 100644 (file)
--- 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:
 // 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 ed79f03b94478f0a65b53c94ad609d7625003e26..09fa842aa7e8ce99fe3c04ec93e82abcad835ac7 100644 (file)
--- 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
 // 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 219e1b4e192347e4a8a6f40deba114564a17393a..f4ff9c5d800225a854eb36ce2a54e427d164604b 100644 (file)
--- 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
 // 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 8ae84173001cf0cadf2fe5065519a6deb9594bcf..b1b9cc77710a4b7fe24f45ba8ae6f11bdcead747 100644 (file)
--- 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:
 // 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
 /////////////////////////////////////////////////////////////////////////////
 // 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
 */
 
     @abstract   wxCFDataRef template class
 */
 

diff --git a/include/wx/osx/core/cfref.h b/include/wx/osx/core/cfref.h
index cb4f6364986b02f800125a951d35a03f73a41e9c..90c7ae415831d80529e73fa3adeea678422c23e6 100644 (file)
--- 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 <dfe@cox.net>
 // Modified by: Stefan Csomor
 // Purpose:     wxCFRef template class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by: Stefan Csomor


@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 // Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFMemoryMgmt/index.html
 /////////////////////////////////////////////////////////////////////////////
 // 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++
 */
     @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 60949ad65e6f9be483f33509427d84040d7711ee..66a86760da827ad661f9041c222ca3d7baa1ce4b 100644 (file)
--- 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:
 // 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 bbc72012221ed50a852b686d29fbad63ce9c87b2..cdb0f83a2c80b8fba3954311d5de2d2fd128be76 100644 (file)
--- 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:
 // 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 e6df5cb45ff7dd21fd445123c416fc77ac438553..e7d237a38ec5ab6a27161739cc50368474d0cbd1 100644 (file)
--- 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:
 // 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 07a98a1de034c7cb6e5e8224d4c30bacba5909f2..1c49cc391971e391a93150285c294bf44662d4af 100644 (file)
--- 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:
 // 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 a456571e83ebd0ae9244d7be5baca206faec5f1c..4c48407f7befb7b88ce157625542a30809951a5b 100644 (file)
--- 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:
 // 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 4380f4f4f2ef83bb91bd576cd94be8aebacc748a..f2fd5090d15dbc00ba3dd51d86734b854bea1d95 100644 (file)
--- 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:
 // Purpose:     wxPrinterDC class
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h
index 0bb4e9daf96500d802f84ef723b335ae2a2ab740..982e41b21903efc068c2f91a5c62f0d1091e466a 100644 (file)
--- 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$
 // 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 45b411e9031084ff919f70840f7131bfd6160faf..35768078ad0241d273a2d3244bc7dda24c264665 100644 (file)
--- 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
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-01-12

diff --git a/include/wx/osx/fontdlg.h b/include/wx/osx/fontdlg.h
index ca96ff10c9ff054863113019bfe86d0a8a9edb4f..f57bb32b99932e2f2d0a3d11e53a1701df90e962 100644 (file)
--- 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:
 // 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 ff97bdf0eff8576305b445ec284286fd6da94cfd..3377084b264a5002c23d5875054e8b77eba02bda 100644 (file)
--- 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:
 // 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 bb0e176251621e8522f12b01f6dda3991dc585ab..870fe8f2729ac520b53ae4c64808c1b6cb1e55cf 100644 (file)
--- 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:
 // Purpose:     wxListBox class
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h
index cea49387eb9b4cda50819b26e411332c043dcfd3..3dd21bf6469b6349b9ce6d7da7e972c36aadf9ce 100644 (file)
--- 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
 // 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 3e7c246bf711321b39c29599306228cf1872d54b..875831f0ab652e1964401ba7494e3549adfc77f6 100644 (file)
--- 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:
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Modified by:

diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h
index 00b54b7df0962291b5ba5452b698bf1e11e2e199..a3f7a4dcf8bd82f379d959fad5f61f30f8a05a87 100644 (file)
--- 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
 // 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 8a82458f8ebba64ff3a127f8dc80cc658f3e3228..843b7589b8b20bf0c0c4ccbdc65a4cd9865cd420 100644 (file)
--- 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:
 // Purpose:     declares wxNonOwnedWindow class
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/include/wx/osx/palette.h b/include/wx/osx/palette.h
index 5c6aa4740f2006f03cfab9abff4a802dac683850..94be93471086bd9c7b7b20298c329779f750529c 100644 (file)
--- 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:
 // Purpose:     wxPalette class
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h
index 58b591d0a8dc2dab0ae2371b75f314533056907f..e6840871c6c3efbc77883124db129ca15a547f70 100644 (file)
--- 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:
 // 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 dc1cf5c72aadc581466100b6b4877e1e4894c3ca..1b976619fab202ec6c49498678f2c1e92a0c7043 100644 (file)
--- 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.
 // 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 47652ec4872889257a24c4d6ee9159f526d568d3..6f9dcd42684bc2d433a086c6cf95169d117ea9f5 100644 (file)
--- 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:
 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/include/wx/osx/srchctrl.h b/include/wx/osx/srchctrl.h
index 6166be7dda58c13ace56294d30b150b9a7b41a23..ecbc925f6e8b41a3592745e1743d48063b24f52c 100644 (file)
--- 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
 // 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 b1c73a7dbbf04d43de41cfc0345342341ac6a506..f2b70c477fb746fef616b86c61b9e2d117109322 100644 (file)
--- 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
 // 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 1116b4def81556ef8e2da849149e5ed2738c6bd4..c2d2ae2eddd59330040192c9a5ce2b68df49c3cb 100644 (file)
--- 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:
 // Purpose:     wxTextCtrl class
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h
index df388af6eb3635fe6caa4fb05799911e7eb1f758..2ad7deafdc47682c4c229cb1960e4e71f0d0432e 100644 (file)
--- 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:
 // Purpose:     wxToolBar class
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/include/wx/osx/tooltip.h b/include/wx/osx/tooltip.h
index df51d47ffbba8047f982d5c33ae1fc56c47e9f5b..0a1b9b58123fdc25e4a4a4fcd2a8be635185a052 100644 (file)
--- 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:
 // 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 8ddac703e8d748b8ad9ba959a56faa2fccf1e476..675c5af2fcfb5744fd09afcd0aa3a00b4f1078c1 100644 (file)
--- 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:
 // 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 626471f77dc457500c89ba55766cc4c1be9551e0..38844c7b65f3cbc9340fb6968b7c803ed7276199 100644 (file)
--- 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:
 // Purpose:     wxTreeCtrl class
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 54446478ad4a8f5554208bcdf6761728245a21df..4740a116865c3878755da8c8b0c080317159cbcb 100644 (file)
--- 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:
 // Purpose:     wxWindowMac class
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/include/wx/position.h b/include/wx/position.h
index 7b7cdbf38e4e44c19f7e94ff10e063515221ffa6..f35203b1606096866087a847480a32823321daea 100644 (file)
--- 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
 // 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 9698fbc82545b1082c1da96c181d926607e8c6f0..11244e9a8d9f63d7d787c2119d222d6cb28bfab2 100644 (file)
--- 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$
 // 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 ac2bbd3242f39fe354524b6b19b4bbed79406b1e..3ed734b4b76cf04d135eb6fc67faf7890838dcf9 100644 (file)
--- 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:
 // 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 8c8966d64cf9d478ad625a3684c000c84d19201a..69ddc9081a7babff2dd47fa87a6ef347e8ca3d9e 100644 (file)
--- 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)
 // 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 f1ca429ffffbd89dbf061859fab9bfb61377c5f7..6360fd721b1d5d45e82c2aac06055ce9c0fb755f 100644 (file)
--- 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:
 // Purpose:     wxScrolledWindow, wxScrolledControl and wxScrollHelper
 // Author:      Vadim Zeitlin
 // Modified by:

diff --git a/include/wx/uiaction.h b/include/wx/uiaction.h
index a11bb347eb988015b4c55b26e9efa75548397233..a08aea76aa2e0bdda4f7a442f40baee5ce29a43d 100644 (file)
--- 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:
 // Purpose:     wxUIActionSimulator interface
 // Author:      Kevin Ollivier
 // Modified by:

diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index bfb1b252afbbb279117a63fdee431520ae235874..f32e90adc71c57560a48270c899b61f5af6a9110 100644 (file)
--- 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
 // 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 eaf8dfba699cf267130dd8347b3a8c84f7b0a431..6f557ce1462a80d4bd07bee9326e418891191796 100644 (file)
--- 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
 // 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 df94434a3e2abf3e1b3ba7367aaf7041ac34f6b3..54c9c53d466bdb796dd70d77e67dfccf17259be7 100644 (file)
--- 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:
 // 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 0de70821ca1aa04cb0e3f855ab83cb7b80414e56..d6fcb4fc4e0782da3d8a84ac6dac11877bf9e930 100644 (file)
--- 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
 // 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 59192ca436e7a63886eeccee6b15374b7bee9842..6f6ecbc8456797a93c984cb19eeaeb2b2f602ff8 100644 (file)
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -57,7 +57,7 @@ END_EVENT_TABLE()
 // Carbon Events handlers
 // ----------------------------------------------------------------------------
 
 // 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[] =
 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 51b40889b007012c5a3215d6addb08fc0d0ba00f..73696ef63dbc34758a35be40150bdced385464c0 100644 (file)
--- 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
 // 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 9a6226dd9a74499565ff277d3465fd3112e82bac..f8483e844ecef6f7888c452f6acadcee2f711912 100644 (file)
--- 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:
 // 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 28630b83d97715fb5c5237635874b71b5b38dbdf..2d5fad856963736fb2fd0eb0d741e09757c68848 100644 (file)
--- 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
 // 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 62abfd106afd947fe72679132024c72ae50d2c3f..ca968e6c08821d72705f70b7e03b0390e562375c 100644 (file)
--- 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
 // 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 4ed70d9c93c242a2995b291996554f1a55328645..7f56a843108d6c2cf1e1a39ceeaf728903694f35 100644 (file)
--- 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:
 // Purpose:     wxTimer implementation
 // Author:      Stefan Csomor
 // Modified by:

diff --git a/src/osx/glcanvas_osx.cpp b/src/osx/glcanvas_osx.cpp
index 56f74a7f4139ec433a2509a5f8651c23a151a714..8ef310d796a71bfe09df4b350847022423193cfb 100644 (file)
--- 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:
 // Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by: