fix for textctrl height

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/dbbrowse/dlguser.cpp b/demos/dbbrowse/dlguser.cpp
index 0d217950ec69ed1da537573df513dc28f2a17c63..28dd64f7c6d0579b462242518530c1b3fe685b02 100644 (file)
--- a/demos/dbbrowse/dlguser.cpp
+++ b/demos/dbbrowse/dlguser.cpp
@@ -36,6 +36,12 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
   wxDialog(parent, ID_DIALOG_DSN, title)
 {
  int chSize;                          // Height of Font * 1.4 = Height of wxTextCtrl
+
+ float ratio = 1.4;
+#ifdef __WXMOTIF__
+ ratio = 2.1;
+#endif
+
  SetBackgroundColour("wheat");
  pDoc = p_Doc;
  wxLayoutConstraints* layout;
@@ -55,7 +61,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
  
  m_UserName = new wxTextCtrl(this, -1, "");
  m_UserName->SetFont(* pDoc->ft_Doc);
- chSize = m_UserName->GetCharHeight()*1.4;
+ chSize = (int) (m_UserName->GetCharHeight()*ratio);
 
  layout = new wxLayoutConstraints;
  layout->left.SameAs(m_Label1, wxRight, 10);