]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5fb4b6c)
Move include/wx/osx/private/objcid.h to include/wx/osx/core.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 26 May 2012 12:29:39 +0000 (12:29 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 26 May 2012 12:29:39 +0000 (12:29 +0000)
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.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile.in patch | blob | blame | history
build/bakefiles/files.bkl patch | blob | blame | history
include/wx/osx/core/objcid.h [new file with mode: 0644] patch | blob
include/wx/osx/private/objcid.h [deleted file] patch | blob | blame | history
include/wx/osx/webview_webkit.h patch | blob | blame | history
include/wx/osx/webviewhistoryitem_webkit.h patch | blob | blame | history

diff --git a/Makefile.in b/Makefile.in
index 6f406b55870646af01711983c7edae6f8f3fceef..0781fd86f6ab9123cf11f952cbafc7c93cbe8003 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2332,6 +2332,7 @@ COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR =  \
        wx/osx/core/cfref.h \
        wx/osx/core/cfstring.h \
        wx/osx/core/hid.h \
        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 \
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \
        wx/osx/core/private/strconv_cf.h \
@@ -2352,6 +2353,7 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR =  \
        wx/osx/core/cfref.h \
        wx/osx/core/cfstring.h \
        wx/osx/core/hid.h \
        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 \
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \
        wx/osx/core/private/strconv_cf.h \
@@ -2385,6 +2387,7 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR =  \
        wx/osx/core/cfref.h \
        wx/osx/core/cfstring.h \
        wx/osx/core/hid.h \
        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
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \
        wx/osx/core/private/strconv_cf.h
@@ -2407,6 +2410,7 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
        wx/osx/core/cfref.h \
        wx/osx/core/cfstring.h \
        wx/osx/core/hid.h \
        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
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \
        wx/osx/core/private/strconv_cf.h
@@ -2429,6 +2433,7 @@ COND_TOOLKIT_X11_BASE_OSX_HDR =  \
        wx/osx/core/cfref.h \
        wx/osx/core/cfstring.h \
        wx/osx/core/hid.h \
        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
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \
        wx/osx/core/private/strconv_cf.h
@@ -2451,6 +2456,7 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
        wx/osx/core/cfref.h \
        wx/osx/core/cfstring.h \
        wx/osx/core/hid.h \
        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
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \
        wx/osx/core/private/strconv_cf.h
@@ -2473,6 +2479,7 @@ COND_TOOLKIT__BASE_OSX_HDR =  \
        wx/osx/core/cfref.h \
        wx/osx/core/cfstring.h \
        wx/osx/core/hid.h \
        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
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \
        wx/osx/core/private/strconv_cf.h
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d5782a7b23e2036c267e3f4050d3648c57e41ed3..95db06d3235c6f544d5606413da35e7884d3b232 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -197,6 +197,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/cfref.h
     wx/osx/core/cfstring.h
     wx/osx/core/hid.h
     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
     wx/osx/core/private.h
     wx/osx/core/stdpaths.h
     wx/osx/core/private/strconv_cf.h
diff --git a/include/wx/osx/core/objcid.h b/include/wx/osx/core/objcid.h
new file mode 100644 (file)
index 0000000..ba10ed6
--- /dev/null
+++ b/include/wx/osx/core/objcid.h
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/core/objcid.h
+// Purpose:     Define wxObjCID working in both C++ and Objective-C.
+// Author:      Vadim Zeitlin
+// Created:     2012-05-20
+// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_OSX_CORE_OBJCID_H_
+#define _WX_OSX_CORE_OBJCID_H_
+
+// ----------------------------------------------------------------------------
+// wxObjCID: Equivalent of Objective-C "id" that works in C++ code.
+// ----------------------------------------------------------------------------
+
+#ifdef __OBJC__
+    #define wxObjCID id
+#else
+    typedef struct objc_object* wxObjCID;
+#endif
+
+#endif // _WX_OSX_CORE_OBJCID_H_
diff --git a/include/wx/osx/private/objcid.h b/include/wx/osx/private/objcid.h
deleted file mode 100644 (file)
index 59d044d..0000000
--- a/include/wx/osx/private/objcid.h
+++ /dev/null
@@ -1,24 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        osx/private/objcid.h
-// Purpose:     Define wxObjCID working in both C++ and Objective-C.
-// Author:      Vadim Zeitlin
-// Created:     2012-05-20
-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_PRIVATE_OBJCID_H_
-#define _WX_OSX_PRIVATE_OBJCID_H_
-
-// ----------------------------------------------------------------------------
-// wxObjCID: Equivalent of Objective-C "id" that works in C++ code.
-// ----------------------------------------------------------------------------
-
-#ifdef __OBJC__
-    #define wxObjCID id
-#else
-    typedef struct objc_object* wxObjCID;
-#endif
-
-#endif // _WX_OSX_PRIVATE_OBJCID_H_
diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 76b66e19ae42d77b1db8ad87ad41e9c682c95900..3edc601c84f9b5a2d53f8c4319dc8d812a5fdd03 100644 (file)
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -21,7 +21,7 @@
 #include "wx/control.h"
 #include "wx/webview.h"
 
 #include "wx/control.h"
 #include "wx/webview.h"
 
-#include "wx/osx/private/objcid.h"
+#include "wx/osx/core/objcid.h"
 
 // ----------------------------------------------------------------------------
 // Web Kit Control
 
 // ----------------------------------------------------------------------------
 // Web Kit Control
diff --git a/include/wx/osx/webviewhistoryitem_webkit.h b/include/wx/osx/webviewhistoryitem_webkit.h
index 13cddf5f3053743795b32a532a2529b7b5b373f1..deeea9ba418c1580beefd33a3c14741bdee2ce6b 100644 (file)
--- a/include/wx/osx/webviewhistoryitem_webkit.h
+++ b/include/wx/osx/webviewhistoryitem_webkit.h
@@ -15,7 +15,7 @@
 #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
                                           ||  defined(__WXOSX_CARBON__))
 
 #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
 {
 
 class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
 {
wxWidgets (Impactor)