default font for dialog

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

diff --git a/demos/dbbrowse/dlguser.cpp b/demos/dbbrowse/dlguser.cpp
index 1c6e49597854261fa5b6fd111a6862d35ad0c441..c5c1f41f82b150d961a4a3e8de7625c8ec196a0f 100644 (file)
--- a/demos/dbbrowse/dlguser.cpp
+++ b/demos/dbbrowse/dlguser.cpp
@@ -25,6 +25,8 @@
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
+
+
 //----------------------------------------------------------------------------------------
 //-- all #includes that every .cpp needs             ----19990807.mj10777 ----------------
 //----------------------------------------------------------------------------------------
@@ -33,14 +35,14 @@
 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
+// int chSize;                          // Height of Font * 1.4 = Height of wxTextCtrl
  SetBackgroundColour("wheat");
  pDoc = p_Doc;
  wxLayoutConstraints* layout;
  SetAutoLayout(TRUE);
 
  m_Label1 = new wxStaticText(this, -1, _("User ID:"));
- m_Label1->SetFont(* pDoc->ft_Doc);
+// m_Label1->SetFont(* pDoc->ft_Doc);
  layout = new wxLayoutConstraints;
  layout->left.SameAs(this, wxLeft, 10);
  layout->top.SameAs(this, wxTop, 10);
@@ -48,9 +50,11 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
  layout->width.Absolute(75);
  m_Label1->SetConstraints(layout);
 
+ 
  m_UserName = new wxTextCtrl(this, -1, "");
  m_UserName->SetFont(* pDoc->ft_Doc);
- chSize = m_UserName->GetCharHeight()*1.4;
+ //chSize = m_Label1->GetCharHeight()*1.4;
+
  layout = new wxLayoutConstraints;
  layout->left.SameAs(m_Label1, wxRight, 10);
  layout->centreY.SameAs(m_Label1,wxCentreY);
@@ -61,7 +65,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
 
 
  m_Label2 = new wxStaticText(this, -1, _("Password:"));
- m_Label2->SetFont(* pDoc->ft_Doc);
+// m_Label2->SetFont(* pDoc->ft_Doc);
  layout = new wxLayoutConstraints;
  layout->left.SameAs(m_Label1, wxLeft);
  layout->top.SameAs(m_Label1, wxBottom, 10);
@@ -70,7 +74,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
  m_Label2->SetConstraints(layout);
 
  m_Password = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
- m_Password->SetFont(* pDoc->ft_Doc);
+// m_Password->SetFont(* pDoc->ft_Doc);
  layout = new wxLayoutConstraints;
  layout->left.SameAs(m_UserName, wxLeft);
  layout->width.SameAs(m_UserName, wxWidth);
@@ -80,7 +84,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
  m_Password->SetConstraints(layout);
 
  m_OK = new wxButton(this, wxID_OK, _("OK"));
- m_OK->SetFont(* pDoc->ft_Doc);
+// m_OK->SetFont(* pDoc->ft_Doc);
  layout = new wxLayoutConstraints;
  layout->left.SameAs(this, wxLeft, 10);
  layout->top.SameAs(m_Label2, wxBottom,10);
@@ -89,7 +93,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
  m_OK->SetConstraints(layout);
 
  m_Cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
- m_Cancel->SetFont(* pDoc->ft_Doc);
+// m_Cancel->SetFont(* pDoc->ft_Doc);
  layout = new wxLayoutConstraints;
  layout->left.SameAs(m_OK, wxRight, 10);
  layout->top.SameAs(m_OK, wxTop);