AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updates to make latest changes compile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2000-02-09 22:58:41 +00:00
parent c0eba78b86
commit c67b773e19
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/isqlext.h
View File

@ -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,

2
include/wx/os2/setup.h
View File

@ -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

1
src/common/event.cpp
View File

@ -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;

4
src/common/timercmn.cpp
View File

@ -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 )