Add wxHAS_BITMAPTOGGLEBUTTON and test for it in the unit test.

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

diff --git a/include/wx/containr.h b/include/wx/containr.h
index 710078dc0cad154960c3526e69e9162cfa5f1a97..594af01367b3466c2261a8fb0f46ce759a17051e 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -31,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 // wxControlContainerBase: common part used in both native and generic cases
 // ----------------------------------------------------------------------------
 
 // wxControlContainerBase: common part used in both native and generic cases
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxControlContainerBase
+class WXDLLIMPEXP_CORE wxControlContainerBase

 {
 public:
     // default ctor, SetContainerWindow() must be called later
 {
 public:
     // default ctor, SetContainerWindow() must be called later


@@ -49,7 +49,7 @@ public:
 
     void SetContainerWindow(wxWindow *winParent)
     {
 
     void SetContainerWindow(wxWindow *winParent)
     {

-        wxASSERT_MSG( !m_winParent, _T("shouldn't be called twice") );
+        wxASSERT_MSG( !m_winParent, wxT("shouldn't be called twice") );

 
         m_winParent = winParent;
     }
 
         m_winParent = winParent;
     }


@@ -70,6 +70,11 @@ public:
     // wxListCtrl) and so should get focus for ourselves
     bool AcceptsFocusRecursively() const { return true; }
 
     // wxListCtrl) and so should get focus for ourselves
     bool AcceptsFocusRecursively() const { return true; }
 

+    // this is used to determine whether we can accept focus when Tab or
+    // another navigation key is pressed -- we alsways can, for the same reason
+    // as mentioned above for AcceptsFocusRecursively()
+    bool AcceptsFocusFromKeyboard() const { return true; }
+

     // Call this when the number of children of the window changes.
     // If we have any children, this panel (used just as container for
     // them) shouldn't get focus for itself.
     // Call this when the number of children of the window changes.
     // If we have any children, this panel (used just as container for
     // them) shouldn't get focus for itself.


@@ -103,6 +108,7 @@ private:
 public:                                                                       \
     virtual bool AcceptsFocus() const;                                        \
     virtual bool AcceptsFocusRecursively() const;                             \
 public:                                                                       \
     virtual bool AcceptsFocus() const;                                        \
     virtual bool AcceptsFocusRecursively() const;                             \

+    virtual bool AcceptsFocusFromKeyboard() const;                            \

     virtual void AddChild(wxWindowBase *child);                               \
     virtual void RemoveChild(wxWindowBase *child);                            \
     virtual void SetFocus();                                                  \
     virtual void AddChild(wxWindowBase *child);                               \
     virtual void RemoveChild(wxWindowBase *child);                            \
     virtual void SetFocus();                                                  \


@@ -143,9 +149,13 @@ protected:                                                                    \
     bool classname::AcceptsFocus() const                                      \
     {                                                                         \
         return m_container.AcceptsFocus();                                    \
     bool classname::AcceptsFocus() const                                      \
     {                                                                         \
         return m_container.AcceptsFocus();                                    \

+    }                                                                         \
+                                                                              \
+    bool classname::AcceptsFocusFromKeyboard() const                          \
+    {                                                                         \
+        return m_container.AcceptsFocusFromKeyboard();                        \

     }
 
     }
 

-

 #ifdef wxHAS_NATIVE_TAB_TRAVERSAL
 
 // ----------------------------------------------------------------------------
 #ifdef wxHAS_NATIVE_TAB_TRAVERSAL
 
 // ----------------------------------------------------------------------------


@@ -153,7 +163,7 @@ protected:                                                                    \
 // ----------------------------------------------------------------------------
 
 // this must be a real class as we forward-declare it elsewhere
 // ----------------------------------------------------------------------------
 
 // this must be a real class as we forward-declare it elsewhere

-class WXDLLEXPORT wxControlContainer : public wxControlContainerBase
+class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase

 {
 protected:
     // set the focus to the child which had it the last time
 {
 protected:
     // set the focus to the child which had it the last time


@@ -188,7 +198,7 @@ class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent;
 // wxControlContainer for TAB navigation implemented in wx itself
 // ----------------------------------------------------------------------------
 
 // wxControlContainer for TAB navigation implemented in wx itself
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxControlContainer : public wxControlContainerBase
+class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase

 {
 public:
     // default ctor, SetContainerWindow() must be called later
 {
 public:
     // default ctor, SetContainerWindow() must be called later


@@ -205,7 +215,7 @@ public:
 
 protected:
 
 
 protected:
 

-    DECLARE_NO_COPY_CLASS(wxControlContainer)
+    wxDECLARE_NO_COPY_CLASS(wxControlContainer);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------