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 8332341f0628c11aa17a4c647bcaef977ebf8f02..9c2f60bff7cde1ec50efab6c6ecf7d797c4b9041 100644 (file)
--- a/demos/dbbrowse/dlguser.cpp
+++ b/demos/dbbrowse/dlguser.cpp
@@ -37,18 +37,18 @@ 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
                 wxDialog(parent, ID_DIALOG_DSN, title)
 {
     int chSize;                          // Height of Font * 1.4 = Height of wxTextCtrl

-    
+

     float ratio = (float)1.4;
 #ifdef __WXMOTIF__
     ratio = (float)2.1;
 #endif
     float ratio = (float)1.4;
 #ifdef __WXMOTIF__
     ratio = (float)2.1;
 #endif

-    
-    SetBackgroundColour("wheat");
+
+    SetBackgroundColour(_T("wheat"));

     pDoc = p_Doc;
     wxLayoutConstraints* layout;
     pDoc = p_Doc;
     wxLayoutConstraints* layout;

-    SetAutoLayout(TRUE);
-    
-    m_Label1 = new wxStaticText(this, -1, _("User ID:"));
+    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);
     m_Label1->SetFont(* pDoc->ft_Doc);
     layout = new wxLayoutConstraints;
     layout->left.SameAs(this, wxLeft, 10);


@@ -56,14 +56,14 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
     layout->height.AsIs();
     layout->width.Absolute(75);
     m_Label1->SetConstraints(layout);
     layout->height.AsIs();
     layout->width.Absolute(75);
     m_Label1->SetConstraints(layout);

-    
+

     int w;
     int w;

-    m_Label1->GetSize(&w, &chSize); 
-    
-    m_UserName = new wxTextCtrl(this, -1, "");
+    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);
     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 = new wxLayoutConstraints;
     layout->left.SameAs(m_Label1, wxRight, 10);
     layout->centreY.SameAs(m_Label1,wxCentreY);


@@ -71,9 +71,9 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
     layout->height.Absolute(chSize);
     // layout->height.AsIs();
     m_UserName->SetConstraints(layout);
     layout->height.Absolute(chSize);
     // layout->height.AsIs();
     m_UserName->SetConstraints(layout);

-    
-    
-    m_Label2 = new wxStaticText(this, -1, _("Password:"));
+
+
+    m_Label2 = new wxStaticText(this, wxID_ANY, _("Password:"));

     m_Label2->SetFont(* pDoc->ft_Doc);
     layout = new wxLayoutConstraints;
     layout->left.SameAs(m_Label1, wxLeft);
     m_Label2->SetFont(* pDoc->ft_Doc);
     layout = new wxLayoutConstraints;
     layout->left.SameAs(m_Label1, wxLeft);


@@ -81,8 +81,8 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
     layout->height.AsIs();
     layout->width.SameAs(m_Label1, wxWidth);
     m_Label2->SetConstraints(layout);
     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 = 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);
     m_Password->SetFont(* pDoc->ft_Doc);
     layout = new wxLayoutConstraints;
     layout->left.SameAs(m_UserName, wxLeft);


@@ -91,7 +91,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
     layout->height.Absolute(chSize);
     //layout->height.AsIs();
     m_Password->SetConstraints(layout);
     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;
     m_OK = new wxButton(this, wxID_OK, _("OK"));
     m_OK->SetFont(* pDoc->ft_Doc);
     layout = new wxLayoutConstraints;


@@ -100,7 +100,7 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
     layout->height.AsIs();
     layout->width.Absolute(75);
     m_OK->SetConstraints(layout);
     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;
     m_Cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
     m_Cancel->SetFont(* pDoc->ft_Doc);
     layout = new wxLayoutConstraints;


@@ -109,19 +109,19 @@ DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
     layout->height.AsIs();
     layout->width.SameAs(m_OK, wxWidth);
     m_Cancel->SetConstraints(layout);
     layout->height.AsIs();
     layout->width.SameAs(m_OK, wxWidth);
     m_Cancel->SetConstraints(layout);

-    
+

     m_OK->SetDefault();
     m_UserName->SetFocus();
     m_OK->SetDefault();
     m_UserName->SetFocus();

-    
-    s_User = "";
-    s_Password = "";
+
+    s_User = wxEmptyString;
+    s_Password = wxEmptyString;

     Layout();
 }
 
 //----------------------------------------------------------------------------------------
 void DlgUser::OnInit()
 {
     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);
     SetTitle(Temp);
     m_UserName->SetLabel(s_User);
     m_Password->SetLabel(s_Password);


@@ -136,7 +136,7 @@ END_EVENT_TABLE()
 //----------------------------------------------------------------------------------------
 void DlgUser::OnOk(wxCommandEvent& WXUNUSED(event) )
 {
 //----------------------------------------------------------------------------------------
 void DlgUser::OnOk(wxCommandEvent& WXUNUSED(event) )
 {

-    //canceled = FALSE;
+    //canceled = false;

     s_User    = m_UserName->GetValue();
     s_Password = m_Password->GetValue();
     EndModal(wxID_OK);
     s_User    = m_UserName->GetValue();
     s_Password = m_Password->GetValue();
     EndModal(wxID_OK);


@@ -145,7 +145,7 @@ void DlgUser::OnOk(wxCommandEvent& WXUNUSED(event) )
 //----------------------------------------------------------------------------------------
 //void DlgUser::OnCancel(wxCommandEvent& WXUNUSED(event) )
 // {
 //----------------------------------------------------------------------------------------
 //void DlgUser::OnCancel(wxCommandEvent& WXUNUSED(event) )
 // {

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

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