diff --git a/demos/dbbrowse/dbbrowse.pro b/demos/dbbrowse/dbbrowse.pro
deleted file mode 100644
index 38bb948c4a..0000000000
--- a/demos/dbbrowse/dbbrowse.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# this is the project file for the dbbrowse wxWindows sample
-
-# we generate the VC++ IDE project file, comment this line
-# to generate a makefile for (n)make
-TEMPLATE = vc6app
-
-# wx is mandatory for wxWindows projects
-CONFIG  = wx
-
-# the configurations of wxWindows we want to use: the value below is the
-# default one; possible other values are {Debug|Release}Unicode[Dll]
-#WXCONFIGS = Debug Release DebugDll ReleaseDll
-
-# we need to explicitly specify the wxWindows root dir location because it is
-# not the default "../.." for this sample
-WXDIR=../../..
-
-# project files
-SOURCES = dbbrowse.cpp
-RC_FILE = dbbrowse.rc
-TARGET  = dbbrowse
diff --git a/demos/dbbrowse/dbtree.cpp b/demos/dbbrowse/dbtree.cpp
index bd2193a9ee..751e730d0d 100644
--- a/demos/dbbrowse/dbtree.cpp
+++ b/demos/dbbrowse/dbtree.cpp
@@ -275,7 +275,7 @@ void DBTree::OnSelChanged(wxTreeEvent& WXUNUSED(event))
         //-------------------------------------------------------------------------------------
         if (Temp1.Contains(_T("ODBC-")))
         {
-            Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
+            Temp1 = Temp1.Mid(5);
             for (i=0;i<pDoc->i_DSN;i++)
             {
                 if (Temp1 == (pDoc->p_DSN+i)->Dsn)
diff --git a/demos/dbbrowse/dlguser.cpp b/demos/dbbrowse/dlguser.cpp
index 76fd8d5105..f7511a352f 100644
--- a/demos/dbbrowse/dlguser.cpp
+++ b/demos/dbbrowse/dlguser.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------------------
-// Name:        DlgUser.h,cpp
+// Name:        DlgUser.cpp
 // Purpose:     Dialog mit Variable Gestaltung durch DlgUser.wxr
 // Author:      Mark Johnson
 // Modified by: 19991105.mj10777
@@ -124,23 +124,13 @@ void DlgUser::OnInit()
 //----------------------------------------------------------------------------------------
 BEGIN_EVENT_TABLE(DlgUser, wxDialog)
     EVT_BUTTON(wxID_OK, DlgUser::OnOk)
-    EVT_BUTTON(wxID_CANCEL, DlgUser::OnCancel)
 END_EVENT_TABLE()
 
 //----------------------------------------------------------------------------------------
 void DlgUser::OnOk(wxCommandEvent& WXUNUSED(event) )
 {
-    //canceled = false;
     s_User    = m_UserName->GetValue();
     s_Password = m_Password->GetValue();
     EndModal(wxID_OK);
 }
 
-//----------------------------------------------------------------------------------------
-//void DlgUser::OnCancel(wxCommandEvent& WXUNUSED(event) )
-// {
-//   canceled = true;
-//   EndModal(wxID_CANCEL);
-// }
-//----------------------------------------------------------------------------------------
-
diff --git a/demos/dbbrowse/pgmctrl.cpp b/demos/dbbrowse/pgmctrl.cpp
index d146c0de9f..e64db76399 100644
--- a/demos/dbbrowse/pgmctrl.cpp
+++ b/demos/dbbrowse/pgmctrl.cpp
@@ -169,7 +169,7 @@ void PgmCtrl::OnSelChanged(wxMouseEvent& WXUNUSED(event))
         //--------------------------------------------------------------------------------------
         if (Temp1.Contains(_T("ODBC-")))
         {
-            Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
+            Temp1 = Temp1.Mid(5);
             for (i=0;i<pDoc->i_DSN;i++)
             {
                 if (Temp1 == (pDoc->p_DSN+i)->Dsn)
@@ -213,7 +213,7 @@ void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
         //--------------------------------------------------------------------------------------
         if (Temp1.Contains(_T("ODBC-")))
         {
-            Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
+            Temp1 = Temp1.Mid(5);
             for (i=0;i<pDoc->i_DSN;i++)
             {
                 if (Temp1 == (pDoc->p_DSN+i)->Dsn)