Updates to make latest changes compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/isqlext.h b/include/wx/isqlext.h
index 57304440eaaa2255616ff868da1b2bfa04f1347e..dcb81570666435e39ecb05ce134e08a5be9f5924 100644 (file)
--- a/include/wx/isqlext.h
+++ b/include/wx/isqlext.h
@@ -7,8 +7,8 @@
  *  iODBC defines (ext)
  *
  *  The iODBC driver manager.
- *  
- *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
+ *
+ *  Copyright (C) 1995 by Ke Jin <kejin@empress.com>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -27,7 +27,7 @@
 #ifndef        _ISQLEXT_H
 # define _ISQLEXT_H
 
-#include "isql.h"
+#include "wx/isql.h"
 
 /*
  *  Generic constants
@@ -1111,8 +1111,8 @@ RETCODE SQL_API SQLTables (HSTMT hstmt, UCHAR FAR * szTableQualifier,
 /*
  *  Level 2 function prototypes
  */
-RETCODE SQL_API SQLBrowseConnect (HDBC hdbc, 
-    UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut, 
+RETCODE SQL_API SQLBrowseConnect (HDBC hdbc,
+    UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut,
     SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut);
 RETCODE SQL_API SQLColumnPrivileges (HSTMT hstmt,
     UCHAR FAR * szTableQualifier, SWORD cbTableQualifier,

diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index fe1603d9318a56c47375476f7df537b6e2f431b5..c9d5f43290beb6d6f3e64f896ed89db3741d42e4 100644 (file)
--- a/include/wx/os2/setup.h
+++ b/include/wx/os2/setup.h
@@ -160,7 +160,7 @@
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
 
-#define wxUSE_ODBC                0
+#define wxUSE_ODBC                1
                                   // Define 1 to use ODBC classes
 
 #define wxODBC_FWD_ONLY_CURSORS   1

diff --git a/src/common/event.cpp b/src/common/event.cpp
index ba257dcc468fe40f229fcaf117b1e6f6ef15cd5e..50dd3a0790626ae572ec8dd9c441f5f62b719b61 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -75,6 +75,7 @@ const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED =          wxEVT_FIRST + 18;
 
 /* Sockets send events, too */
 const wxEventType wxEVT_SOCKET =                            wxEVT_FIRST + 50;
+const wxEventType wxEVT_TIMER  =                            wxEVT_FIRST + 80;
 
 /* Mouse event types */
 const wxEventType wxEVT_LEFT_DOWN =                         wxEVT_FIRST + 100;

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 000226700f874ea898d0e11cf711fb29c91169b2..c350e8ca5bfad362b459eddefc70c83883e88777 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -245,6 +245,10 @@ wxLongLong wxGetLocalTimeMillis()
     SYSTEMTIME st;
     ::GetLocalTime(&st);
     return (val + st.wMilliseconds);
+#elif defined(__VISAGECPP__)
+    DATETIME    dt;
+    ::DosGetDateTime(&dt);
+    return (val + dt.hundredths*10);
 #elif defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )