supporting clang memory management annotations

[wxWidgets.git] / include / wx / containr.h

diff --git a/include/wx/containr.h b/include/wx/containr.h
index 29dba36d6b65bf0ab4af04cd9549be4bfe9b22aa..d4eb907682fd0b18309322f7ecb99ceaffa77cee 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -148,7 +148,7 @@ protected:
 #endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL
 
 // this function is for wxWidgets internal use only
 #endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL
 
 // this function is for wxWidgets internal use only

-extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
+extern WXDLLIMPEXP_CORE bool wxSetFocusToChild(wxWindow *win, wxWindow **child);

 
 // ----------------------------------------------------------------------------
 // wxNavigationEnabled: Derive from this class to support keyboard navigation
 
 // ----------------------------------------------------------------------------
 // wxNavigationEnabled: Derive from this class to support keyboard navigation


@@ -179,29 +179,29 @@ public:
 #endif // !wxHAS_NATIVE_TAB_TRAVERSAL
     }
 
 #endif // !wxHAS_NATIVE_TAB_TRAVERSAL
     }
 

-    virtual bool AcceptsFocus() const
+    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const

     {
         return m_container.AcceptsFocus();
     }
 
     {
         return m_container.AcceptsFocus();
     }
 

-    virtual bool AcceptsFocusRecursively() const
+    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const

     {
         return m_container.AcceptsFocusRecursively();
     }
 
     {
         return m_container.AcceptsFocusRecursively();
     }
 

-    virtual bool AcceptsFocusFromKeyboard() const
+    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const

     {
         return m_container.AcceptsFocusFromKeyboard();
     }
 
     {
         return m_container.AcceptsFocusFromKeyboard();
     }
 

-    virtual void AddChild(wxWindowBase *child)
+    WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child)

     {
         BaseWindowClass::AddChild(child);
 
         m_container.UpdateCanFocus();
     }
 
     {
         BaseWindowClass::AddChild(child);
 
         m_container.UpdateCanFocus();
     }
 

-    virtual void RemoveChild(wxWindowBase *child)
+    WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child)

     {
 #ifndef wxHAS_NATIVE_TAB_TRAVERSAL
         m_container.HandleOnWindowDestroy(child);
     {
 #ifndef wxHAS_NATIVE_TAB_TRAVERSAL
         m_container.HandleOnWindowDestroy(child);


@@ -212,7 +212,7 @@ public:
         m_container.UpdateCanFocus();
     }
 
         m_container.UpdateCanFocus();
     }
 

-    virtual void SetFocus()
+    WXDLLIMPEXP_INLINE_CORE virtual void SetFocus()

     {
         if ( !m_container.DoSetFocus() )
             BaseWindowClass::SetFocus();
     {
         if ( !m_container.DoSetFocus() )
             BaseWindowClass::SetFocus();


@@ -258,7 +258,7 @@ protected:
 // look at them.
 // ----------------------------------------------------------------------------
 
 // look at them.
 // ----------------------------------------------------------------------------
 

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

 
 // common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases,
 // it should be used in the wxWindow-derived class declaration
 
 // common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases,
 // it should be used in the wxWindow-derived class declaration