]> git.saurik.com Git - wxWidgets.git/commitdiff
Compile fix
authorJulian Smart <julian@anthemion.co.uk>
Sat, 18 Aug 2007 11:34:16 +0000 (11:34 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Sat, 18 Aug 2007 11:34:16 +0000 (11:34 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/containr.h

index 2d4cd3d0993b15ea50c390d3e9a87bbb871ad186..41a8bbe336826daff6914ba4d93412c5f284f231 100644 (file)
@@ -86,6 +86,9 @@ protected:
     // the parent window we manage the children for
     wxWindow *m_winParent;
 
     // the parent window we manage the children for
     wxWindow *m_winParent;
 
+    // the child which had the focus last time this panel was activated
+    wxWindow *m_winLastFocused;
+
 private:
     // value returned by AcceptsFocus(), should be changed using SetCanFocus()
     // only
 private:
     // value returned by AcceptsFocus(), should be changed using SetCanFocus()
     // only
@@ -93,10 +96,6 @@ private:
 
     // a guard against infinite recursion
     bool m_inSetFocus;
 
     // a guard against infinite recursion
     bool m_inSetFocus;
-
-    // the child which had the focus last time this panel was activated
-    wxWindow *m_winLastFocused;
-
 };
 
 // common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases,
 };
 
 // common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases,
@@ -261,7 +260,7 @@ public:                                                                       \
     void classname::OnFocus(wxFocusEvent& event)                              \
     {                                                                         \
         m_container.HandleOnFocus(event);                                     \
     void classname::OnFocus(wxFocusEvent& event)                              \
     {                                                                         \
         m_container.HandleOnFocus(event);                                     \
-    } 
+    }
 
 #endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL
 
 
 #endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL