projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MSLU with DMC build fix [#1469456].
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
ObjcRef.h
diff --git
a/include/wx/cocoa/ObjcRef.h
b/include/wx/cocoa/ObjcRef.h
index 2af1c2598a16715c39bb1d3c5cc3de9faccd7819..17493d14dab1f81d685d2036024699136cfb48fe 100644
(file)
--- a/
include/wx/cocoa/ObjcRef.h
+++ b/
include/wx/cocoa/ObjcRef.h
@@
-9,6
+9,8
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+#ifndef _WX_COCOA_OBJCREF_H__
+#define _WX_COCOA_OBJCREF_H__
/*
wxObjcAutoRefFromAlloc: construct a reference to an object that was
[NSObject -alloc]'ed and thus does not need a retain
/*
wxObjcAutoRefFromAlloc: construct a reference to an object that was
[NSObject -alloc]'ed and thus does not need a retain
@@
-23,7
+25,7
@@
class wxObjcAutoRefBase
{
protected:
static struct objc_object* ObjcRetain(struct objc_object*);
{
protected:
static struct objc_object* ObjcRetain(struct objc_object*);
- static
struct objc_object*
ObjcRelease(struct objc_object*);
+ static
void
ObjcRelease(struct objc_object*);
};
// T should be a pointer like NSObject*
};
// T should be a pointer like NSObject*
@@
-62,7
+64,7
@@
class wxObjcAutoRef: public wxObjcAutoRefFromAlloc<T>
public:
wxObjcAutoRef(T p = 0)
: wxObjcAutoRefFromAlloc<T>(p)
public:
wxObjcAutoRef(T p = 0)
: wxObjcAutoRefFromAlloc<T>(p)
- { ObjcRetain(m_ptr); }
+ { ObjcRetain(
wxObjcAutoRefFromAlloc<T>::
m_ptr); }
~wxObjcAutoRef() {}
wxObjcAutoRef(const wxObjcAutoRef& otherRef)
: wxObjcAutoRefFromAlloc<T>(otherRef)
~wxObjcAutoRef() {}
wxObjcAutoRef(const wxObjcAutoRef& otherRef)
: wxObjcAutoRefFromAlloc<T>(otherRef)
@@
-74,3
+76,4
@@
public:
{ return wxObjcAutoRefFromAlloc<T>::operator=(otherRef); }
};
{ return wxObjcAutoRefFromAlloc<T>::operator=(otherRef); }
};
+#endif //ndef _WX_COCOA_OBJCREF_H__