Removed spurious _

[wxWidgets.git] / demos / dbbrowse / dlguser.cpp

diff --git a/demos/dbbrowse/dlguser.cpp b/demos/dbbrowse/dlguser.cpp
index a229730846f0839f91e0d310cdace725ad28f472..28dd64f7c6d0579b462242518530c1b3fe685b02 100644 (file)
--- a/demos/dbbrowse/dlguser.cpp
+++ b/demos/dbbrowse/dlguser.cpp
@@ -25,15 +25,23 @@
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
+
+
 //----------------------------------------------------------------------------------------
 //-- all #includes that every .cpp needs             ----19990807.mj10777 ----------------
 //----------------------------------------------------------------------------------------
 #include "std.h"
 //----------------------------------------------------------------------------------------
-DlgUser::DlgUser(wxWindow *parent, mjDoc *p_Doc, const wxString& title) :
+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;
@@ -47,15 +55,20 @@ DlgUser::DlgUser(wxWindow *parent, mjDoc *p_Doc, const wxString& title) :
  layout->height.AsIs();
  layout->width.Absolute(75);
  m_Label1->SetConstraints(layout);
-
+ 
+ int w;
+ m_Label1->GetSize(&w, &chSize); 
+ 
  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);
  layout->centreY.SameAs(m_Label1,wxCentreY);
  layout->width.Absolute(200);
  layout->height.Absolute(chSize);
+ // layout->height.AsIs();
  m_UserName->SetConstraints(layout);
 
 
@@ -75,6 +88,7 @@ DlgUser::DlgUser(wxWindow *parent, mjDoc *p_Doc, const wxString& title) :
  layout->width.SameAs(m_UserName, wxWidth);
  layout->centreY.SameAs(m_Label2,wxCentreY);
  layout->height.Absolute(chSize);
+ //layout->height.AsIs();
  m_Password->SetConstraints(layout);
 
  m_OK = new wxButton(this, wxID_OK, _("OK"));
@@ -105,7 +119,7 @@ DlgUser::DlgUser(wxWindow *parent, mjDoc *p_Doc, const wxString& title) :
 //----------------------------------------------------------------------------------------
 void DlgUser::OnInit()
 {
- wxString Temp; Temp.Printf(_(">>> %s <<<"),s_DSN.c_str());
+ wxString Temp; Temp.Printf(">>> %s <<<",s_DSN.c_str());
  SetTitle(Temp);
  m_UserName->SetLabel(s_User);
  m_Password->SetLabel(s_Password);