Make DoGetBestSize cache the value of GetSize() the first time it is called

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

diff --git a/include/wx/containr.h b/include/wx/containr.h
index 11a3dddf98cabd9fa6e14701c4b480e2e5d0f00e..e5399b71ce5df0d20210c6bff11f898e083dea31 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -13,7 +13,7 @@
 #ifndef _WX_CONTAINR_H_
 #define _WX_CONTAINR_H_
 
 #ifndef _WX_CONTAINR_H_
 #define _WX_CONTAINR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "containr.h"
 #endif
 
     #pragma interface "containr.h"
 #endif
 


@@ -39,13 +39,26 @@ class WXDLLEXPORT wxControlContainer
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxControlContainer(wxWindow *winParent);
+    wxControlContainer(wxWindow *winParent = NULL);
+    void SetContainerWindow(wxWindow *winParent) { m_winParent = winParent; }

 
 

-    wxWindow *GetDefaultItem() const { return m_winDefault; }
+    // default item access: we have a permanent default item which is the one
+    // set by the user code but we may also have a temporary default item which
+    // would be chosen if the user pressed "Enter" now but the default action
+    // reverts to the "permanent" default as soon as this temporary default
+    // item lsoes focus
+
+    // get the default item, temporary or permanent
+    wxWindow *GetDefaultItem() const
+        { return m_winTmpDefault ? m_winTmpDefault : m_winDefault; }
+
+    // set the permanent default item, return its old value

     wxWindow *SetDefaultItem(wxWindow *win)
         { wxWindow *winOld = m_winDefault; m_winDefault = win; return winOld; }
 
     wxWindow *SetDefaultItem(wxWindow *win)
         { wxWindow *winOld = m_winDefault; m_winDefault = win; return winOld; }
 

-    void SetLastFocus(wxWindow *win);
+    // set a temporary default item, SetTmpDefaultItem(NULL) should be called
+    // soon after a call to SetTmpDefaultItem(window)
+    void SetTmpDefaultItem(wxWindow *win) { m_winTmpDefault = win; }

 
     // the methods to be called from the window event handlers
     void HandleOnNavigationKey(wxNavigationKeyEvent& event);
 
     // the methods to be called from the window event handlers
     void HandleOnNavigationKey(wxNavigationKeyEvent& event);


@@ -56,6 +69,13 @@ public:
     // the focus and the default processing should take place
     bool DoSetFocus();
 
     // 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);
+

 protected:
     // set the focus to the child which had it the last time
     bool SetFocusToChild();
 protected:
     // set the focus to the child which had it the last time
     bool SetFocusToChild();


@@ -66,8 +86,13 @@ protected:
     // the child which had the focus last time this panel was activated
     wxWindow *m_winLastFocused;
 
     // the child which had the focus last time this panel was activated
     wxWindow *m_winLastFocused;
 

-    // a default window (e.g. a button) or NULL
+    // a default window (usually a button) or NULL

     wxWindow *m_winDefault;
     wxWindow *m_winDefault;

+
+    // a temporary override of m_winDefault, use the latter if NULL
+    wxWindow *m_winTmpDefault;
+
+    DECLARE_NO_COPY_CLASS(wxControlContainer)

 };
 
 // this function is for wxWindows internal use only
 };
 
 // this function is for wxWindows internal use only


@@ -80,13 +105,19 @@ extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
 
 // declare the methods to be forwarded
 #define WX_DECLARE_CONTROL_CONTAINER() \
 
 // declare the methods to be forwarded
 #define WX_DECLARE_CONTROL_CONTAINER() \

+public: \

     void OnNavigationKey(wxNavigationKeyEvent& event); \
     void OnFocus(wxFocusEvent& event); \
     virtual void OnChildFocus(wxChildFocusEvent& event); \
     virtual void SetFocus(); \
     virtual void RemoveChild(wxWindowBase *child); \
     virtual wxWindow *GetDefaultItem() const; \
     void OnNavigationKey(wxNavigationKeyEvent& event); \
     void OnFocus(wxFocusEvent& event); \
     virtual void OnChildFocus(wxChildFocusEvent& event); \
     virtual void SetFocus(); \
     virtual void RemoveChild(wxWindowBase *child); \
     virtual wxWindow *GetDefaultItem() const; \

-    virtual wxWindow *SetDefaultItem(wxWindow *child) \
+    virtual wxWindow *SetDefaultItem(wxWindow *child); \
+    virtual void SetTmpDefaultItem(wxWindow *win); \
+    virtual bool AcceptsFocus() const; \
+\
+protected: \
+    wxControlContainer m_container

 
 // implement the event table entries for wxControlContainer
 #define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \
 
 // implement the event table entries for wxControlContainer
 #define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \


@@ -95,43 +126,52 @@ extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
     EVT_NAVIGATION_KEY(classname::OnNavigationKey)
 
 // implement the methods forwarding to the wxControlContainer
     EVT_NAVIGATION_KEY(classname::OnNavigationKey)
 
 // implement the methods forwarding to the wxControlContainer

-#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, container)  \
+#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname)  \

 wxWindow *classname::SetDefaultItem(wxWindow *child) \
 { \
 wxWindow *classname::SetDefaultItem(wxWindow *child) \
 { \

-    return container->SetDefaultItem(child); \
+    return m_container.SetDefaultItem(child); \
+} \
+ \
+void classname::SetTmpDefaultItem(wxWindow *child) \
+{ \
+    m_container.SetTmpDefaultItem(child); \

 } \
  \
 wxWindow *classname::GetDefaultItem() const \
 { \
 } \
  \
 wxWindow *classname::GetDefaultItem() const \
 { \

-    return container->GetDefaultItem(); \
+    return m_container.GetDefaultItem(); \

 } \
  \
 void classname::OnNavigationKey( wxNavigationKeyEvent& event ) \
 { \
 } \
  \
 void classname::OnNavigationKey( wxNavigationKeyEvent& event ) \
 { \

-    container->HandleOnNavigationKey(event); \
+    m_container.HandleOnNavigationKey(event); \

 } \
  \
 void classname::RemoveChild(wxWindowBase *child) \
 { \
 } \
  \
 void classname::RemoveChild(wxWindowBase *child) \
 { \

-    container->HandleOnWindowDestroy(child); \
+    m_container.HandleOnWindowDestroy(child); \

  \
     wxWindow::RemoveChild(child); \
 } \
  \
 void classname::SetFocus() \
 { \
  \
     wxWindow::RemoveChild(child); \
 } \
  \
 void classname::SetFocus() \
 { \

-    if ( !container->DoSetFocus() ) \
+    if ( !m_container.DoSetFocus() ) \

         wxWindow::SetFocus(); \
 } \
  \
 void classname::OnChildFocus(wxChildFocusEvent& event) \
 { \
         wxWindow::SetFocus(); \
 } \
  \
 void classname::OnChildFocus(wxChildFocusEvent& event) \
 { \

-    container->SetLastFocus(event.GetWindow()); \
+    m_container.SetLastFocus(event.GetWindow()); \

 } \
  \
 void classname::OnFocus(wxFocusEvent& event) \
 { \
 } \
  \
 void classname::OnFocus(wxFocusEvent& event) \
 { \

-    container->HandleOnFocus(event); \
+    m_container.HandleOnFocus(event); \
+} \
+bool classname::AcceptsFocus() const \
+{ \
+    return m_container.AcceptsFocus(); \

 }
 
 
 }