projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Commented out XSetInputFocus for now
[wxWidgets.git]
/
include
/
wx
/
os2
/
app.h
diff --git
a/include/wx/os2/app.h
b/include/wx/os2/app.h
index 66504eacbe2eb13e2aa6171879c27b0e02e5c8fb..2c631f549436135da974b3873152dec514a0cc7a 100644
(file)
--- a/
include/wx/os2/app.h
+++ b/
include/wx/os2/app.h
@@
-12,9
+12,26
@@
#ifndef _WX_APP_H_
#define _WX_APP_H_
#ifndef _WX_APP_H_
#define _WX_APP_H_
+#ifdef __WATCOMC__
+
+#include <sys/ioctl.h>
+#include <sys/select.h>
+
+#else
+
#include <sys/time.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/types.h>
+
+#ifdef __EMX__
#include <unistd.h>
#include <unistd.h>
+#else
+#include <utils.h>
+#undef BYTE_ORDER
+#include <types.h>
+#define INCL_ORDERS
+#endif
+
+#endif
#include "wx/event.h"
#include "wx/icon.h"
#include "wx/event.h"
#include "wx/icon.h"
@@
-59,6
+76,7
@@
public:
virtual bool Initialized(void);
virtual bool Pending(void) ;
virtual void Dispatch(void);
virtual bool Initialized(void);
virtual bool Pending(void) ;
virtual void Dispatch(void);
+ virtual bool Yield(bool onlyIfNeeded = FALSE);
virtual wxIcon GetStdIcon(int which) const;
virtual wxIcon GetStdIcon(int which) const;
@@
-95,11
+113,12
@@
protected:
// PM-specific wxApp definitions */
//
private:
// PM-specific wxApp definitions */
//
private:
- int m_maxSocketHandles;
- int m_maxSocketNr;
- int m_lastUsedHandle;
- fd_set m_readfds, m_writefds;
- void *m_sockCallbackInfo;
+ int m_maxSocketHandles;
+ int m_maxSocketNr;
+ int m_lastUsedHandle;
+ fd_set m_readfds;
+ fd_set m_writefds;
+ void* m_sockCallbackInfo;
public:
public:
@@
-108,6
+127,7
@@
public:
static void CleanUp(void);
static bool RegisterWindowClasses(HAB vHab);
static void CleanUp(void);
static bool RegisterWindowClasses(HAB vHab);
+ virtual void DoMessage(WXMSG *pMsg);
virtual bool DoMessage(void);
virtual bool ProcessMessage(WXMSG* pMsg);
void DeletePendingObjects(void);
virtual bool DoMessage(void);
virtual bool ProcessMessage(WXMSG* pMsg);
void DeletePendingObjects(void);