Remove some obsolete window styles, added a new sizer flag

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

diff --git a/demos/dbbrowse/dlguser.cpp b/demos/dbbrowse/dlguser.cpp
index 59c43632d784235325f28fc0865c5ecdfea336f1..8696ef530492415d28e7652a04a5400182ae7ec0 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
-// Author:      Mark Johnson, mj10777@gmx.net
+// Author:      Mark Johnson
 // Modified by: 19991105.mj10777
 // Created:     19991105
 // Copyright:   (c) Mark Johnson
@@ -43,7 +43,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
     ratio = (float)2.1;
 #endif
     
-    SetBackgroundColour("wheat");
+    SetBackgroundColour(_T("wheat"));
     pDoc = p_Doc;
     wxLayoutConstraints* layout;
     SetAutoLayout(TRUE);
@@ -60,7 +60,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
     int w;
     m_Label1->GetSize(&w, &chSize); 
     
-    m_UserName = new wxTextCtrl(this, -1, "");
+    m_UserName = new wxTextCtrl(this, -1, _T(""));
     m_UserName->SetFont(* pDoc->ft_Doc);
     chSize = (int) (m_UserName->GetCharHeight()*ratio);
     
@@ -82,7 +82,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
     layout->width.SameAs(m_Label1, wxWidth);
     m_Label2->SetConstraints(layout);
     
-    m_Password = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
+    m_Password = new wxTextCtrl(this, -1, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
     m_Password->SetFont(* pDoc->ft_Doc);
     layout = new wxLayoutConstraints;
     layout->left.SameAs(m_UserName, wxLeft);
@@ -113,15 +113,15 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
     m_OK->SetDefault();
     m_UserName->SetFocus();
     
-    s_User = "";
-    s_Password = "";
+    s_User = _T("");
+    s_Password = _T("");
     Layout();
 }
 
 //----------------------------------------------------------------------------------------
 void DlgUser::OnInit()
 {
-    wxString Temp; Temp.Printf(">>> %s <<<",s_DSN.c_str());
+    wxString Temp; Temp.Printf(_T(">>> %s <<<"),s_DSN.c_str());
     SetTitle(Temp);
     m_UserName->SetLabel(s_User);
     m_Password->SetLabel(s_Password);