Simplified html reading because previous one caused conflicts in wxUSE_STL=1.

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

diff --git a/demos/dbbrowse/dlguser.cpp b/demos/dbbrowse/dlguser.cpp
index 9cfdc2177446b898c72b680b5481519bf1ee7763..9c2f60bff7cde1ec50efab6c6ecf7d797c4b9041 100644 (file)
--- a/demos/dbbrowse/dlguser.cpp
+++ b/demos/dbbrowse/dlguser.cpp
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------------------
 // Name:        DlgUser.h,cpp
 // Purpose:     Dialog mit Variable Gestaltung durch DlgUser.wxr
 //----------------------------------------------------------------------------------------
 // Name:        DlgUser.h,cpp
 // Purpose:     Dialog mit Variable Gestaltung durch DlgUser.wxr

-// Author:      Mark Johnson, mj10777@gmx.net
+// Author:      Mark Johnson

 // Modified by: 19991105.mj10777
 // Created:     19991105
 // Copyright:   (c) Mark Johnson
 // Modified by: 19991105.mj10777
 // Created:     19991105
 // Copyright:   (c) Mark Johnson


@@ -25,108 +25,127 @@
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif

+
+

 //----------------------------------------------------------------------------------------
 //-- all #includes that every .cpp needs             ----19990807.mj10777 ----------------
 //----------------------------------------------------------------------------------------
 #include "std.h"
 //----------------------------------------------------------------------------------------
 //-- all #includes that every .cpp needs             ----19990807.mj10777 ----------------
 //----------------------------------------------------------------------------------------
 #include "std.h"

+

 //----------------------------------------------------------------------------------------
 DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
 //----------------------------------------------------------------------------------------
 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
- SetBackgroundColour("wheat");
- pDoc = p_Doc;
- wxLayoutConstraints* layout;
- SetAutoLayout(TRUE);
-
- m_Label1 = new wxStaticText(this, -1, _("User ID:"));
- m_Label1->SetFont(* pDoc->ft_Doc);
- layout = new wxLayoutConstraints;
- layout->left.SameAs(this, wxLeft, 10);
- layout->top.SameAs(this, wxTop, 10);
- layout->height.AsIs();
- 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;
- layout = new wxLayoutConstraints;
- layout->left.SameAs(m_Label1, wxRight, 10);
- layout->centreY.SameAs(m_Label1,wxCentreY);
- layout->width.Absolute(200);
- layout->height.Absolute(chSize);
- m_UserName->SetConstraints(layout);
-
-
- m_Label2 = new wxStaticText(this, -1, _("Password:"));
- m_Label2->SetFont(* pDoc->ft_Doc);
- layout = new wxLayoutConstraints;
- layout->left.SameAs(m_Label1, wxLeft);
- layout->top.SameAs(m_Label1, wxBottom, 10);
- layout->height.AsIs();
- layout->width.SameAs(m_Label1, wxWidth);
- m_Label2->SetConstraints(layout);
-
- m_Password = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
- m_Password->SetFont(* pDoc->ft_Doc);
- layout = new wxLayoutConstraints;
- layout->left.SameAs(m_UserName, wxLeft);
- layout->width.SameAs(m_UserName, wxWidth);
- layout->centreY.SameAs(m_Label2,wxCentreY);
- layout->height.Absolute(chSize);
- m_Password->SetConstraints(layout);
-
- m_OK = new wxButton(this, wxID_OK, _("OK"));
- m_OK->SetFont(* pDoc->ft_Doc);
- layout = new wxLayoutConstraints;
- layout->left.SameAs(this, wxLeft, 10);
- layout->top.SameAs(m_Label2, wxBottom,10);
- layout->height.AsIs();
- layout->width.Absolute(75);
- m_OK->SetConstraints(layout);
-
- m_Cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
- m_Cancel->SetFont(* pDoc->ft_Doc);
- layout = new wxLayoutConstraints;
- layout->left.SameAs(m_OK, wxRight, 10);
- layout->top.SameAs(m_OK, wxTop);
- layout->height.AsIs();
- layout->width.SameAs(m_OK, wxWidth);
- m_Cancel->SetConstraints(layout);
-
- m_OK->SetDefault();
- m_UserName->SetFocus();
-
- s_User = "";
- s_Password = "";
- Layout();
+    int chSize;                          // Height of Font * 1.4 = Height of wxTextCtrl
+
+    float ratio = (float)1.4;
+#ifdef __WXMOTIF__
+    ratio = (float)2.1;
+#endif
+
+    SetBackgroundColour(_T("wheat"));
+    pDoc = p_Doc;
+    wxLayoutConstraints* layout;
+    SetAutoLayout(true);
+
+    m_Label1 = new wxStaticText(this, wxID_ANY, _("User ID:"));
+    m_Label1->SetFont(* pDoc->ft_Doc);
+    layout = new wxLayoutConstraints;
+    layout->left.SameAs(this, wxLeft, 10);
+    layout->top.SameAs(this, wxTop, 10);
+    layout->height.AsIs();
+    layout->width.Absolute(75);
+    m_Label1->SetConstraints(layout);
+
+    int w;
+    m_Label1->GetSize(&w, &chSize);
+
+    m_UserName = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
+    m_UserName->SetFont(* pDoc->ft_Doc);
+    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);
+
+
+    m_Label2 = new wxStaticText(this, wxID_ANY, _("Password:"));
+    m_Label2->SetFont(* pDoc->ft_Doc);
+    layout = new wxLayoutConstraints;
+    layout->left.SameAs(m_Label1, wxLeft);
+    layout->top.SameAs(m_Label1, wxBottom, 10);
+    layout->height.AsIs();
+    layout->width.SameAs(m_Label1, wxWidth);
+    m_Label2->SetConstraints(layout);
+
+    m_Password = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
+    m_Password->SetFont(* pDoc->ft_Doc);
+    layout = new wxLayoutConstraints;
+    layout->left.SameAs(m_UserName, wxLeft);
+    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"));
+    m_OK->SetFont(* pDoc->ft_Doc);
+    layout = new wxLayoutConstraints;
+    layout->left.SameAs(this, wxLeft, 10);
+    layout->top.SameAs(m_Label2, wxBottom,10);
+    layout->height.AsIs();
+    layout->width.Absolute(75);
+    m_OK->SetConstraints(layout);
+
+    m_Cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
+    m_Cancel->SetFont(* pDoc->ft_Doc);
+    layout = new wxLayoutConstraints;
+    layout->left.SameAs(m_OK, wxRight, 10);
+    layout->top.SameAs(m_OK, wxTop);
+    layout->height.AsIs();
+    layout->width.SameAs(m_OK, wxWidth);
+    m_Cancel->SetConstraints(layout);
+
+    m_OK->SetDefault();
+    m_UserName->SetFocus();
+
+    s_User = wxEmptyString;
+    s_Password = wxEmptyString;
+    Layout();

 }
 }

+

 //----------------------------------------------------------------------------------------
 void DlgUser::OnInit()
 {
 //----------------------------------------------------------------------------------------
 void DlgUser::OnInit()
 {

- wxString Temp; Temp.Printf(">>> %s <<<",s_DSN.c_str());
- SetTitle(Temp);
- m_UserName->SetLabel(s_User);
- m_Password->SetLabel(s_Password);
+    wxString Temp; Temp.Printf(_T(">>> %s <<<"),s_DSN.c_str());
+    SetTitle(Temp);
+    m_UserName->SetLabel(s_User);
+    m_Password->SetLabel(s_Password);

 }
 }

+

 //----------------------------------------------------------------------------------------
 BEGIN_EVENT_TABLE(DlgUser, wxDialog)
 //----------------------------------------------------------------------------------------
 BEGIN_EVENT_TABLE(DlgUser, wxDialog)

- EVT_BUTTON(wxID_OK, DlgUser::OnOk)
- EVT_BUTTON(wxID_CANCEL, DlgUser::OnCancel)
+    EVT_BUTTON(wxID_OK, DlgUser::OnOk)
+    EVT_BUTTON(wxID_CANCEL, DlgUser::OnCancel)

 END_EVENT_TABLE()
 END_EVENT_TABLE()

+

 //----------------------------------------------------------------------------------------
 void DlgUser::OnOk(wxCommandEvent& WXUNUSED(event) )
 {
 //----------------------------------------------------------------------------------------
 void DlgUser::OnOk(wxCommandEvent& WXUNUSED(event) )
 {

-  //canceled = FALSE;
-  s_User    = m_UserName->GetValue();
-  s_Password = m_Password->GetValue();
-  EndModal(wxID_OK);
+    //canceled = false;
+    s_User    = m_UserName->GetValue();
+    s_Password = m_Password->GetValue();
+    EndModal(wxID_OK);

 }
 }

+

 //----------------------------------------------------------------------------------------
 //void DlgUser::OnCancel(wxCommandEvent& WXUNUSED(event) )
 // {
 //----------------------------------------------------------------------------------------
 //void DlgUser::OnCancel(wxCommandEvent& WXUNUSED(event) )
 // {

-//   canceled = TRUE;
+//   canceled = true;

 //   EndModal(wxID_CANCEL);
 // }
 //----------------------------------------------------------------------------------------
 //   EndModal(wxID_CANCEL);
 // }
 //----------------------------------------------------------------------------------------