fix for textctrl height
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
5a074a3c22
commit
7ef53f2dc5
@ -36,6 +36,12 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
|
|||||||
wxDialog(parent, ID_DIALOG_DSN, title)
|
wxDialog(parent, ID_DIALOG_DSN, title)
|
||||||
{
|
{
|
||||||
int chSize; // Height of Font * 1.4 = Height of wxTextCtrl
|
int chSize; // Height of Font * 1.4 = Height of wxTextCtrl
|
||||||
|
|
||||||
|
float ratio = 1.4;
|
||||||
|
#ifdef __WXMOTIF__
|
||||||
|
ratio = 2.1;
|
||||||
|
#endif
|
||||||
|
|
||||||
SetBackgroundColour("wheat");
|
SetBackgroundColour("wheat");
|
||||||
pDoc = p_Doc;
|
pDoc = p_Doc;
|
||||||
wxLayoutConstraints* layout;
|
wxLayoutConstraints* layout;
|
||||||
@ -55,7 +61,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
|
|||||||
|
|
||||||
m_UserName = new wxTextCtrl(this, -1, "");
|
m_UserName = new wxTextCtrl(this, -1, "");
|
||||||
m_UserName->SetFont(* pDoc->ft_Doc);
|
m_UserName->SetFont(* pDoc->ft_Doc);
|
||||||
chSize = m_UserName->GetCharHeight()*1.4;
|
chSize = (int) (m_UserName->GetCharHeight()*ratio);
|
||||||
|
|
||||||
layout = new wxLayoutConstraints;
|
layout = new wxLayoutConstraints;
|
||||||
layout->left.SameAs(m_Label1, wxRight, 10);
|
layout->left.SameAs(m_Label1, wxRight, 10);
|
||||||
|
Loading…
Reference in New Issue
Block a user