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

Revert the addition of WXDLLIMPEXP_CORE to all wxNavigationEnabled methods.

Browse Source 
This reverts commit r70787 as it broke DLL build with MSVC.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-03-04 00:43:19 +00:00
parent acfe040282
commit 865dab5da9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/containr.h
View File

@@ -179,29 +179,29 @@ public:
#endif // !wxHAS_NATIVE_TAB_TRAVERSAL #endif // !wxHAS_NATIVE_TAB_TRAVERSAL
} }
WXDLLIMPEXP_CORE virtual bool AcceptsFocus() const virtual bool AcceptsFocus() const
{ {
return m_container.AcceptsFocus(); return m_container.AcceptsFocus();
} }
WXDLLIMPEXP_CORE virtual bool AcceptsFocusRecursively() const virtual bool AcceptsFocusRecursively() const
{ {
return m_container.AcceptsFocusRecursively(); return m_container.AcceptsFocusRecursively();
} }
WXDLLIMPEXP_CORE virtual bool AcceptsFocusFromKeyboard() const virtual bool AcceptsFocusFromKeyboard() const
{ {
return m_container.AcceptsFocusFromKeyboard(); return m_container.AcceptsFocusFromKeyboard();
} }
WXDLLIMPEXP_CORE virtual void AddChild(wxWindowBase *child) virtual void AddChild(wxWindowBase *child)
{ {
BaseWindowClass::AddChild(child); BaseWindowClass::AddChild(child);
m_container.UpdateCanFocus(); m_container.UpdateCanFocus();
} }
WXDLLIMPEXP_CORE virtual void RemoveChild(wxWindowBase *child) virtual void RemoveChild(wxWindowBase *child)
{ {
#ifndef wxHAS_NATIVE_TAB_TRAVERSAL #ifndef wxHAS_NATIVE_TAB_TRAVERSAL
m_container.HandleOnWindowDestroy(child); m_container.HandleOnWindowDestroy(child);
@@ -212,7 +212,7 @@ public:
m_container.UpdateCanFocus(); m_container.UpdateCanFocus();
} }
WXDLLIMPEXP_CORE virtual void SetFocus() virtual void SetFocus()
{ {
if ( !m_container.DoSetFocus() ) if ( !m_container.DoSetFocus() )
BaseWindowClass::SetFocus(); BaseWindowClass::SetFocus();