743b426605
DoGetClientBestSize() returns the best size of the client area, without accounting for the border which is done by GetBestSize() itself and DoGetBorderSize() called from it. Use DoGetClientBestSize() in wxStaticText (where it was done insideDoGetBestSize() before) and in wxListBox, to fix its height calculation. Also use correct height of listbox items as returned by the control itself instead of trying to guess it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
59 lines
1.8 KiB
C++
59 lines
1.8 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/stattext.h
|
|
// Purpose: wxStaticText class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_STATTEXT_H_
|
|
#define _WX_STATTEXT_H_
|
|
|
|
class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
|
|
{
|
|
public:
|
|
wxStaticText() { }
|
|
|
|
wxStaticText(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxStaticTextNameStr)
|
|
{
|
|
Create(parent, id, label, pos, size, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxStaticTextNameStr);
|
|
|
|
// override some methods to resize the window properly
|
|
virtual void SetLabel(const wxString& label);
|
|
virtual bool SetFont( const wxFont &font );
|
|
|
|
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
|
|
|
|
protected:
|
|
// implement/override some base class virtuals
|
|
virtual void DoSetSize(int x, int y, int w, int h,
|
|
int sizeFlags = wxSIZE_AUTO);
|
|
virtual wxSize DoGetBestClientSize() const;
|
|
|
|
virtual wxString DoGetLabel() const;
|
|
virtual void DoSetLabel(const wxString& str);
|
|
|
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
|
|
};
|
|
|
|
#endif
|
|
// _WX_STATTEXT_H_
|