X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67a9999283b942053259fa418fe994eab8dd0b3b..0e41582e529b14dab0f6da62451b133b85227176:/demos/dbbrowse/pgmctrl.cpp?ds=sidebyside diff --git a/demos/dbbrowse/pgmctrl.cpp b/demos/dbbrowse/pgmctrl.cpp index e4e40333d3..d146c0de9f 100644 --- a/demos/dbbrowse/pgmctrl.cpp +++ b/demos/dbbrowse/pgmctrl.cpp @@ -8,13 +8,7 @@ // Copyright: (c) Mark Johnson, Berlin Germany // Licence: wxWindows license //---------------------------------------------------------------------------------------- -//-- all #ifdefs that the whole Project needs. ------------------------------------------- -//---------------------------------------------------------------------------------------- -#ifdef __GNUG__ -#pragma implementation -#pragma interface -#endif -//---------------------------------------------------------------------------------------- + // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" //---------------------------------------------------------------------------------------- @@ -45,7 +39,7 @@ //---------------------------------------------------------------------------------------- static inline const wxChar *bool2String(bool b) { - return b ? _T("") : _T("not "); + return b ? wxEmptyString : _T("not "); } //---------------------------------------------------------------------------------------- @@ -88,7 +82,7 @@ PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const PgmCtrl::~PgmCtrl() { delete p_imageListNormal; - delete popupMenu1; + delete popupMenu1; } //---------------------------------------------------------------------------------------- @@ -122,7 +116,7 @@ int PgmCtrl::OnPopulate() } //--------------------------------------------------------------------------------------- popupMenu1 = NULL; - popupMenu1 = new wxMenu(_T("")); + popupMenu1 = new wxMenu; popupMenu1->Append(PGMCTRL_ODBC_USER, _("Set Username and Password")); // popupMenu1->AppendSeparator(); //--------------------------------------------------------------------------------------- @@ -166,9 +160,9 @@ void PgmCtrl::OnSelChanged(wxMouseEvent& WXUNUSED(event)) if (Temp1 == _T("wxConfigBase Delete")) { if (p_ProgramCfg->DeleteAll()) // Default Diretory for wxFileSelector - Temp0 = _("-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was succesfull."); + Temp0 = _("-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was successful."); else - Temp0 = _("-E-> wxConfigBase.p_ProgramCfg->DeleteAll() was not succesfull !"); + Temp0 = _("-E-> wxConfigBase.p_ProgramCfg->DeleteAll() was not successful !"); wxBell(); // Ding_a_Ling Treffer++; } @@ -262,7 +256,7 @@ void PgmCtrl::OnUserPassword(wxCommandEvent& WXUNUSED(event)) // wxMessageBox(SaveDSN); int i; //-------------------------------------------- - DlgUser *p_Dlg = new DlgUser(this,pDoc,_T("")); + DlgUser *p_Dlg = new DlgUser(this,pDoc,wxEmptyString); //------------------------------------------- for (i=0;ii_DSN;i++) {