Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mutiple updates from SciTech for wxWindows including the following:

Browse Source 
1. Updates to HTML applet classes in client side include syntax
2. Updates to wxUniversal for OS/2
3. Updates for better palette management on Windows
4. Misc other fixes and changes to fix build system for Watcom 11.0


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kendall Bennett
2001-10-17 22:25:56 +00:00
parent 7361f176df
commit 19193a2c85
62 changed files with 1309 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/os2/app.cpp
View File

@@ -39,26 +39,26 @@
#ifdef __EMX__
#include <sys\ioctl.h>
#include <sys\select.h>
#include <sys/ioctl.h>
#include <sys/select.h>
#else
#include <nerrno.h>
#include <ioctl.h>
#include <select.h>
#include <sys/ioctl.h>
#include <sys/select.h>
#include <sys/time.h>
#endif // ndef for __EMX__
#endif //
#ifndef __EMX__
#define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
int _System bsdselect(int,
struct fd_set *,
struct fd_set *,
struct fd_set *,
struct timeval *);
extern "C" int _System bsdselect(int,
struct fd_set *,
struct fd_set *,
struct fd_set *,
struct timeval *);
#endif
#if wxUSE_THREADS
@@ -326,7 +326,6 @@ bool wxApp::RegisterWindowClasses(
HAB vHab
)
{
APIRET rc;
ERRORID vError = 0L;
wxString sError;
@@ -654,6 +653,9 @@ bool wxApp::OnInitGui()
ERRORID vError;
wxString sError;
if (!wxAppBase::OnInitGui())
return FALSE;
m_hMq = ::WinCreateMsgQueue(vHabmain, 0);
if (!m_hMq)
{
@@ -662,6 +664,7 @@ bool wxApp::OnInitGui()
wxLogDebug(sError);
return FALSE;
}
return TRUE;
} // end of wxApp::OnInitGui
@@ -998,9 +1001,9 @@ void wxApp::OnIdle(
// automated DC cache management: clear the cached DCs and bitmap
// if it's likely that the app has finished with them, that is, we
// get an idle event and we're not dragging anything.
if (!::WinGetKeyState(MK_LBUTTON) &&
!::WinGetKeyState(MK_MBUTTON) &&
!::WinGetKeyState(MK_RBUTTON))
if (!::WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) &&
!::WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) &&
!::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2))
wxDC::ClearCache();
#endif // wxUSE_DC_CACHEING