Compile fix for VC

[wxWidgets.git] / samples / db / dbtest.cpp

diff --git a/samples/db/dbtest.cpp b/samples/db/dbtest.cpp
index ef03c414985ec49902f98cf0a554de5915d2390b..f54a13bcf6d4018af32118fc76f2c48c92dce18b 100644 (file)
--- a/samples/db/dbtest.cpp
+++ b/samples/db/dbtest.cpp
@@ -21,10 +21,6 @@
  *  SYNOPSIS END
  */
 
  *  SYNOPSIS END
  */
 

-#ifdef __GNUG__
-#pragma implementation "dbtest.h"
-#endif
-

 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__


@@ -616,6 +612,22 @@ void CheckSupportForAllDataTypes(wxDb *pDb)
         wxLogMessage(nativeDataTypeName);
     }
 #endif
         wxLogMessage(nativeDataTypeName);
     }
 #endif

+#ifdef SQL_WVARCHAR
+    if (DataTypeSupported(pDb,SQL_WVARCHAR, &nativeDataTypeName))
+    {
+        nativeDataTypeName = wxT("SQL_WVARCHAR (") + nativeDataTypeName;
+        nativeDataTypeName += wxT(")\n");
+        wxLogMessage(nativeDataTypeName);
+    }
+#endif
+#ifdef SQL_WCHAR
+    if (DataTypeSupported(pDb,SQL_WCHAR, &nativeDataTypeName))
+    {
+        nativeDataTypeName = wxT("SQL_WCHAR (") + nativeDataTypeName;
+        nativeDataTypeName += wxT(")\n");
+        wxLogMessage(nativeDataTypeName);
+    }
+#endif

 
     wxLogMessage(wxT("Done\n"));
 }  // CheckSupportForAllDataTypes()
 
     wxLogMessage(wxT("Done\n"));
 }  // CheckSupportForAllDataTypes()


@@ -1452,7 +1464,8 @@ void CeditorDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
                        /* const wxString &orderBy       */ wxT("NAME"),
                        /* wxDb           *pDb           */ wxGetApp().READONLY_DB,
                        /* const wxString &defDir        */ wxGetApp().DbConnectInf->GetDefaultDir(),
                        /* const wxString &orderBy       */ wxT("NAME"),
                        /* wxDb           *pDb           */ wxGetApp().READONLY_DB,
                        /* const wxString &defDir        */ wxGetApp().DbConnectInf->GetDefaultDir(),

-                       /* bool            distinctValues*/ true);
+                       /* bool            distinctValues*/ true,
+                       wxEmptyString, 20);

 
         if (ListDB_Selection && wxStrlen(ListDB_Selection))
         {
 
         if (ListDB_Selection && wxStrlen(ListDB_Selection))
         {


@@ -1484,7 +1497,7 @@ void CeditorDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
         if (wxGetApp().Contact->GetDb()->Catalog(wxEmptyString, wxT("catalog.txt")))
             wxMessageBox(wxT("The file 'catalog.txt' was created."));
         else
         if (wxGetApp().Contact->GetDb()->Catalog(wxEmptyString, wxT("catalog.txt")))
             wxMessageBox(wxT("The file 'catalog.txt' was created."));
         else

-            wxMessageBox(wxT("Creation of the file 'catalog.txt' was failed."));
+            wxMessageBox(wxT("Creation of the file 'catalog.txt' failed."));

         return;
     }
 
         return;
     }
 


@@ -1707,7 +1720,8 @@ void CeditorDlg::OnSelectPict()
 
         if (file.IsOpened())
         {
 
         if (file.IsOpened())
         {

-            wxFileOffset iSize = file.Length();
+            // assume not huge file in sample
+            long iSize = (long)file.Length();

 
             if ((iSize > 0) && (iSize < MAX_PICTURE_SIZE))
             {
 
             if ((iSize > 0) && (iSize < MAX_PICTURE_SIZE))
             {


@@ -1721,7 +1735,7 @@ void CeditorDlg::OnSelectPict()
                     wxMessageBox(wxT("Something bad happened while reading..."), wxT("BLOB Loading Error"), wxOK | wxICON_EXCLAMATION);
 
                 wxString tStr;
                     wxMessageBox(wxT("Something bad happened while reading..."), wxT("BLOB Loading Error"), wxOK | wxICON_EXCLAMATION);
 
                 wxString tStr;

-                tStr.Printf(wxT("%lu"),iSize);
+                tStr.Printf(wxT("%ld"),iSize);

                 pPictSizeTxt->SetValue(tStr);
             }
             else
                 pPictSizeTxt->SetValue(tStr);
             }
             else


@@ -2905,7 +2919,7 @@ m_pImage(NULL)
 
         if(m_pImage->Ok())
         {
 
         if(m_pImage->Ok())
         {

-            m_pBmp = new wxBitmap(m_pImage);
+            m_pBmp = new wxBitmap(*m_pImage);

             m_pDisplayBmp = new wxStaticBitmap(this, IMAGE_DIALOG_STATIC_BMP, *m_pBmp, wxPoint(5,5), wxDefaultSize);
 
             SetSize(m_pBmp->GetWidth() + 10, m_pBmp->GetHeight() + 30);
             m_pDisplayBmp = new wxStaticBitmap(this, IMAGE_DIALOG_STATIC_BMP, *m_pBmp, wxPoint(5,5), wxDefaultSize);
 
             SetSize(m_pBmp->GetWidth() + 10, m_pBmp->GetHeight() + 30);