SVN:(VZ)[71567] Move include/wx/osx/private/objcid.h to include/wx/osx/core .

0 views

Skip to first unread message

nor...@wxsite.net

unread,

May 26, 2012, 8:29:40 AM5/26/12

to wx-commi...@googlegroups.com

Revision: 71567
Author: VZ
Date: 2012-05-26 05:29:39 -0700 (Sat, 26 May 2012)

Log Message

Move include/wx/osx/private/objcid.h to include/wx/osx/core.

This header is used by public headers and hence is not really private, move it to a better place and add it to the list of OSX headers in the bakefile.

Closes 14339.

Diff

Modified: wxWidgets/trunk/Makefile.in (71566 => 71567)


--- wxWidgets/trunk/Makefile.in	2012-05-25 21:35:14 UTC (rev 71566)
+++ wxWidgets/trunk/Makefile.in	2012-05-26 12:29:39 UTC (rev 71567)
@@ -2332,6 +2332,7 @@
 	wx/osx/core/cfref.h \
 	wx/osx/core/cfstring.h \
 	wx/osx/core/hid.h \
+	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/stdpaths.h \
 	wx/osx/core/private/strconv_cf.h \
@@ -2352,6 +2353,7 @@
 	wx/osx/core/cfref.h \
 	wx/osx/core/cfstring.h \
 	wx/osx/core/hid.h \
+	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/stdpaths.h \
 	wx/osx/core/private/strconv_cf.h \
@@ -2385,6 +2387,7 @@
 	wx/osx/core/cfref.h \
 	wx/osx/core/cfstring.h \
 	wx/osx/core/hid.h \
+	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/stdpaths.h \
 	wx/osx/core/private/strconv_cf.h
@@ -2407,6 +2410,7 @@
 	wx/osx/core/cfref.h \
 	wx/osx/core/cfstring.h \
 	wx/osx/core/hid.h \
+	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/stdpaths.h \
 	wx/osx/core/private/strconv_cf.h
@@ -2429,6 +2433,7 @@
 	wx/osx/core/cfref.h \
 	wx/osx/core/cfstring.h \
 	wx/osx/core/hid.h \
+	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/stdpaths.h \
 	wx/osx/core/private/strconv_cf.h
@@ -2451,6 +2456,7 @@
 	wx/osx/core/cfref.h \
 	wx/osx/core/cfstring.h \
 	wx/osx/core/hid.h \
+	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/stdpaths.h \
 	wx/osx/core/private/strconv_cf.h
@@ -2473,6 +2479,7 @@
 	wx/osx/core/cfref.h \
 	wx/osx/core/cfstring.h \
 	wx/osx/core/hid.h \
+	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/stdpaths.h \
 	wx/osx/core/private/strconv_cf.h

Modified: wxWidgets/trunk/build/bakefiles/files.bkl (71566 => 71567)


--- wxWidgets/trunk/build/bakefiles/files.bkl	2012-05-25 21:35:14 UTC (rev 71566)
+++ wxWidgets/trunk/build/bakefiles/files.bkl	2012-05-26 12:29:39 UTC (rev 71567)
@@ -197,6 +197,7 @@
     wx/osx/core/cfref.h
     wx/osx/core/cfstring.h
     wx/osx/core/hid.h
+    wx/osx/core/objcid.h
     wx/osx/core/private.h
     wx/osx/core/stdpaths.h
     wx/osx/core/private/strconv_cf.h

Property changes: wxWidgets/trunk/include/wx/osx/core/objcid.h

Added: svn:keywords

Added: svn:eol-style

Modified: wxWidgets/trunk/include/wx/osx/webview_webkit.h (71566 => 71567)


--- wxWidgets/trunk/include/wx/osx/webview_webkit.h	2012-05-25 21:35:14 UTC (rev 71566)
+++ wxWidgets/trunk/include/wx/osx/webview_webkit.h	2012-05-26 12:29:39 UTC (rev 71567)
@@ -21,7 +21,7 @@
 #include "wx/control.h"
 #include "wx/webview.h"
 
-#include "wx/osx/private/objcid.h"
+#include "wx/osx/core/objcid.h"
 
 // ----------------------------------------------------------------------------
 // Web Kit Control

Modified: wxWidgets/trunk/include/wx/osx/webviewhistoryitem_webkit.h (71566 => 71567)


--- wxWidgets/trunk/include/wx/osx/webviewhistoryitem_webkit.h	2012-05-25 21:35:14 UTC (rev 71566)
+++ wxWidgets/trunk/include/wx/osx/webviewhistoryitem_webkit.h	2012-05-26 12:29:39 UTC (rev 71567)
@@ -15,7 +15,7 @@
 #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
                                           ||  defined(__WXOSX_CARBON__))
 
-#include "wx/osx/private/objcid.h"
+#include "wx/osx/core/objcid.h"
 
 class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
 {

Reply all

Reply to author

Forward

0 new messages