a67f4b8254
Trying to be smart by setting m_isEnabled to false in wxStaticBox::Enable() without actually disabling the box itself (because it can't be done if its label window is to remain enabled) didn't really work. For example, it was impossible to TAB to a checkbox label of the box when it was disabled, because keyboard navigation (correctly) doesn't recurse into disabled windows and there could be similar problems with any other code iterating over windows and skipping over the disabled ones. So, finally, simplify things and keep m_isEnabled in sync with the real box state, even if this, counter-intuitively, means that IsEnabled() on the box returns true after calling Enable(false) on it. This also reverts 4ee35cf5ee569b6ee6c7d0d5702484d4d2a20f96 ("Don't disable wxStaticBox children at wx level when disabling it") as we can't avoid really disabling the children any more now that their parent is not disabled: without this, their IsEnabled() would return true, i.e. they wouldn't be disabled at all, from the program point of view. This is unfortunate for the reasons that originally motivated that commit, i.e. if some wxStaticBox child is disabled, disabling and re-enabling the box will now re-enable this child, even if it shouldn't, but seems impossible to avoid. The only possible alternative is to modify IsEnabled() to add some wxStaticBox-specific hook to it, e.g. instead of calling GetParent()->IsEnabled() there, we could call some now AreChildrenEnable() method, which would delegate to IsEnabled() by default but overridden in wxStaticBox. However this seems complicated, and will add an extra virtual function call to all (frequently happening) IsEnabled() calls.
87 lines
2.7 KiB
C++
87 lines
2.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/statbox.h
|
|
// Purpose: wxStaticBox base header
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_STATBOX_H_BASE_
|
|
#define _WX_STATBOX_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_STATBOX
|
|
|
|
#include "wx/control.h"
|
|
#include "wx/containr.h"
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxStaticBox: a grouping box with a label
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxNavigationEnabled<wxControl>
|
|
{
|
|
public:
|
|
wxStaticBoxBase();
|
|
|
|
// overridden base class virtuals
|
|
virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
|
|
virtual bool Enable(bool enable = true) wxOVERRIDE;
|
|
|
|
// implementation only: this is used by wxStaticBoxSizer to account for the
|
|
// need for extra space taken by the static box
|
|
//
|
|
// the top border is the margin at the top (where the title is),
|
|
// borderOther is the margin on all other sides
|
|
virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
|
|
|
|
// This is an internal function currently used by wxStaticBoxSizer only.
|
|
//
|
|
// Reparent all children of the static box under its parent and destroy the
|
|
// box itself.
|
|
void WXDestroyWithoutChildren();
|
|
|
|
protected:
|
|
// choose the default border for this window
|
|
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
|
|
|
// If non-null, the window used as our label. This window is owned by the
|
|
// static box and will be deleted when it is.
|
|
wxWindow* m_labelWin;
|
|
|
|
// For boxes with window label this member variable is used instead of
|
|
// m_isEnabled to remember the last value passed to Enable(). It is
|
|
// required because the box itself doesn't get disabled by Enable(false) in
|
|
// this case (see comments in Enable() implementation), and m_isEnabled
|
|
// must correspond to its real state.
|
|
bool m_areChildrenEnabled;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);
|
|
};
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/statbox.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/statbox.h"
|
|
#elif defined(__WXMOTIF__)
|
|
#include "wx/motif/statbox.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/statbox.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/statbox.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/statbox.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/statbox.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_STATBOX
|
|
|
|
#endif
|
|
// _WX_STATBOX_H_BASE_
|