Refactored wxStaticBox, and changed wxStaticBox and wxRadioBox border

style from sunken to the default Motif style.
  Added some convenience macros for checking Motif/Lesstif version.
  Fixed the bug that caused wxStaticBox size to change when label text
was changed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-03-02 20:08:45 +00:00
parent a73903480f
commit 483561c568
5 changed files with 69 additions and 82 deletions

View File

@@ -16,12 +16,10 @@
#pragma interface "statbox.h"
#endif
#include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
// Group box
class WXDLLEXPORT wxStaticBox: public wxControl
class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase
{
DECLARE_DYNAMIC_CLASS(wxStaticBox)
@@ -36,6 +34,7 @@ public:
{
Create(parent, id, label, pos, size, style, name);
}
~wxStaticBox();
bool Create(wxWindow *parent, wxWindowID id,
@@ -49,15 +48,12 @@ public:
{
return FALSE;
}
void SetLabel(const wxString& label);
wxString GetLabel() const;
// Implementation
virtual void ChangeFont(bool keepOriginalSize = TRUE);
protected:
// Motif-specific
virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
virtual void SetLabel(const wxString& label);
private:
WXWidget m_labelWidget;
private: