projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #1022383: 'several ComboBoxes appear selected'
[wxWidgets.git]
/
include
/
wx
/
univ
/
radiobox.h
diff --git
a/include/wx/univ/radiobox.h
b/include/wx/univ/radiobox.h
index 6072641499de7f95bb96bc736c5c586101c60e15..67cf04bc1ee871f73b71a3db87d8120d1253e40b 100644
(file)
--- a/
include/wx/univ/radiobox.h
+++ b/
include/wx/univ/radiobox.h
@@
-95,15
+95,18
@@
public:
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& label);
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& label);
- virtual
void Enable(int n, bool enable = TRUE
);
- virtual
void Show(int n, bool show = TRUE
);
+ virtual
bool Enable(int n, bool enable = true
);
+ virtual
bool Show(int n, bool show = true
);
// we also override the wxControl methods to avoid virtual function hiding
// we also override the wxControl methods to avoid virtual function hiding
- virtual bool Enable(bool enable =
TRUE
);
- virtual bool Show(bool show =
TRUE
);
+ virtual bool Enable(bool enable =
true
);
+ virtual bool Show(bool show =
true
);
virtual wxString GetLabel() const;
virtual void SetLabel(const wxString& label);
virtual wxString GetLabel() const;
virtual void SetLabel(const wxString& label);
+ // we inherit a version returning false from wxStaticBox, override it again
+ virtual bool AcceptsFocus() const { return true; }
+
#if wxUSE_TOOLTIPS
virtual void DoSetToolTip( wxToolTip *tip );
#endif // wxUSE_TOOLTIPS
#if wxUSE_TOOLTIPS
virtual void DoSetToolTip( wxToolTip *tip );
#endif // wxUSE_TOOLTIPS
@@
-129,9
+132,6
@@
protected:
// common part of all ctors
void Init();
// common part of all ctors
void Init();
- // check that the index is valid
- bool IsValid(int n) const { return n >= 0 && n < GetCount(); }
-
// sets m_majorDim and calculate m_numCols and m_numRows
void SetMajorDim(int majorDim);
// sets m_majorDim and calculate m_numCols and m_numRows
void SetMajorDim(int majorDim);