Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged 48068 from trunk:

Browse Source 
Install wx/cocoa/objc/objc_uniquifying.h for wxCocoa and add a usage note
to the header.
Copyright 2007 Software 2000 Ltd.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-08-14 20:56:47 +00:00
parent 6292769c37
commit e62c4f3047
3 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.in
View File

@@ -1338,6 +1338,7 @@ XRCDLL_OBJECTS = \
xrcdll_xh_notbk.o \
xrcdll_xh_odcombo.o \
xrcdll_xh_panel.o \
xrcdll_xh_propdlg.o \
xrcdll_xh_radbt.o \
xrcdll_xh_radbx.o \
xrcdll_xh_scrol.o \
@@ -1399,6 +1400,7 @@ XRCLIB_OBJECTS = \
xrclib_xh_notbk.o \
xrclib_xh_odcombo.o \
xrclib_xh_panel.o \
xrclib_xh_propdlg.o \
xrclib_xh_radbt.o \
xrclib_xh_radbx.o \
xrclib_xh_scrol.o \
@@ -1999,6 +2001,7 @@ COND_TOOLKIT_COCOA_GUI_HDR = \
wx/cocoa/tooltip.h \
wx/cocoa/toplevel.h \
wx/cocoa/window.h \
wx/cocoa/objc/objc_uniquifying.h \
wx/generic/caret.h \
wx/generic/fdrepdlg.h \
wx/generic/fontdlgg.h \
@@ -3087,6 +3090,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/xrc/xh_notbk.h \
wx/xrc/xh_odcombo.h \
wx/xrc/xh_panel.h \
wx/xrc/xh_propdlg.h \
wx/xrc/xh_radbt.h \
wx/xrc/xh_radbx.h \
wx/xrc/xh_scrol.h \
@@ -3401,6 +3405,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_xh_notbk.o \
monodll_xh_odcombo.o \
monodll_xh_panel.o \
monodll_xh_propdlg.o \
monodll_xh_radbt.o \
monodll_xh_radbx.o \
monodll_xh_scrol.o \
@@ -5185,6 +5190,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_xh_notbk.o \
monolib_xh_odcombo.o \
monolib_xh_panel.o \
monolib_xh_propdlg.o \
monolib_xh_radbt.o \
monolib_xh_radbx.o \
monolib_xh_scrol.o \
@@ -13217,6 +13223,9 @@ monodll_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONODLL_ODEP)
monodll_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
monodll_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
monodll_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
@@ -17339,6 +17348,9 @@ monolib_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONOLIB_ODEP)
monolib_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
monolib_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
monolib_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
@@ -28796,6 +28808,9 @@ xrcdll_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(XRCDLL_ODEP)
xrcdll_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
xrcdll_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
xrcdll_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
@@ -28961,6 +28976,9 @@ xrclib_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(XRCLIB_ODEP)
xrclib_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
xrclib_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
xrclib_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp

2
build/bakefiles/files.bkl
View File

@@ -2525,6 +2525,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/cocoa/tooltip.h
wx/cocoa/toplevel.h
wx/cocoa/window.h
<!-- Semi-private headers -->
wx/cocoa/objc/objc_uniquifying.h
<!-- Generic implementations used by wxCocoa: -->
wx/generic/caret.h
wx/generic/fdrepdlg.h

22
include/wx/cocoa/objc/objc_uniquifying.h
View File

@@ -15,6 +15,28 @@
#ifndef __WX_COCOA_OBJC_CLASS_H__
#define __WX_COCOA_OBJC_CLASS_H__
/* A note about this header:
Nothing in here is guaranteed to exist in future versions of wxCocoa. There
are other ways of adding Objective-C classes at runtime and a future wxCocoa
might use these instead of this ugly hack. You may use this header file in
your own wxCocoa code if you need your own Objective-C classes to be
unqiuified.
You cannot turn this on for 64-bit mode. It will not compile due to opaque
Objective-C data structures and it is not needed because it is a workaround
for a bug that does not exist in the 64-bit runtime.
You should not use this when wxCocoa is built as a dynamic library. This has
only been tested for the case when wxCocoa is built as a static library and
statically linked to user code to form a loadable bundle (e.g. a Cocoa plugin).
It forces each plugin (when multiple wxCocoa-using plugins are used) to use
its own internal Objective-C classes which is desirable when wxCocoa is
statically linked to the rest of the code.
Do not use uniquifying on your principal class. That one should be named
differently for different bundles.
*/
#if wxUSE_OBJC_UNIQUIFYING
// objc_getClass and stuff