X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80332672ab36153aa2424cff2a06b434287488c8..2fa73716ca5cf002bdd570a86da5d1cb09d7e3b0:/include/wx/containr.h

diff --git a/include/wx/containr.h b/include/wx/containr.h
index e44b507a33..375caff127 100644
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -15,6 +15,9 @@
 
 #include "wx/defs.h"
 
+class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxWindowBase;
+
 /*
    Implementation note: wxControlContainer is not a real mix-in but rather
    a class meant to be aggregated with (and not inherited from). Although
@@ -61,10 +64,10 @@ protected:
     // return true if we should be focusable
     bool ShouldAcceptFocus() const;
 
-private:
     // the parent window we manage the children for
     wxWindow *m_winParent;
 
+private:
     // value returned by AcceptsFocus(), should be changed using SetCanFocus()
     // only
     bool m_acceptsFocus;
@@ -140,8 +143,6 @@ class WXDLLEXPORT wxControlContainer : public wxControlContainerBase
 
 class WXDLLEXPORT wxFocusEvent;
 class WXDLLEXPORT wxNavigationKeyEvent;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxWindowBase;
 
 // ----------------------------------------------------------------------------
 // wxControlContainer for TAB navigation implemented in wx itself
@@ -162,9 +163,6 @@ public:
     // the focus and the default processing should take place
     bool DoSetFocus();
 
-    // can our child get the focus?
-    bool AcceptsFocus() const;
-
     // called from OnChildFocus() handler, i.e. when one of our (grand)
     // children gets the focus
     void SetLastFocus(wxWindow *win);
@@ -191,18 +189,14 @@ extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
 // ----------------------------------------------------------------------------
 
 // declare the methods to be forwarded
-#define WX_DECLARE_CONTROL_CONTAINER() \
-public: \
-    void OnNavigationKey(wxNavigationKeyEvent& event); \
-    void OnFocus(wxFocusEvent& event); \
-    void SetFocusIgnoringChildren(); \
-    virtual void OnChildFocus(wxChildFocusEvent& event); \
-    virtual void SetFocus(); \
-    virtual void RemoveChild(wxWindowBase *child); \
-    virtual bool AcceptsFocus() const; \
-\
-protected: \
-    wxControlContainer m_container
+#define WX_DECLARE_CONTROL_CONTAINER()                                        \
+    WX_DECLARE_CONTROL_CONTAINER_BASE();                                      \
+                                                                              \
+public:                                                                       \
+    void OnNavigationKey(wxNavigationKeyEvent& event);                        \
+    void OnFocus(wxFocusEvent& event);                                        \
+    virtual void OnChildFocus(wxChildFocusEvent& event);                      \
+    virtual void SetFocus()
 
 // implement the event table entries for wxControlContainer
 #define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \