Added a couple of fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -99,7 +99,6 @@ protected:
|
||||
DECLARE_EVENT_TABLE()
|
||||
private:
|
||||
HMQ m_hMq;
|
||||
QMSG m_vMsg;
|
||||
};
|
||||
|
||||
int WXDLLEXPORT wxEntry( int argc, char *argv[] );
|
||||
|
@@ -386,6 +386,10 @@ void wxApp::CleanUp()
|
||||
|
||||
wxClassInfo::CleanUpClasses();
|
||||
|
||||
// Delete Message queue
|
||||
if (wxTheApp->m_hMq)
|
||||
::WinDestroyMsgQueue(wxTheApp->m_hMq);
|
||||
|
||||
delete wxTheApp;
|
||||
wxTheApp = NULL;
|
||||
|
||||
@@ -522,6 +526,7 @@ wxApp::wxApp()
|
||||
m_nPrintMode = wxPRINT_WINDOWS;
|
||||
m_exitOnFrameDelete = TRUE;
|
||||
m_bAuto3D = TRUE;
|
||||
m_hMq = 0;
|
||||
} // end of wxApp::wxApp
|
||||
|
||||
wxApp::~wxApp()
|
||||
@@ -554,8 +559,9 @@ bool wxApp::Initialized()
|
||||
//
|
||||
bool wxApp::DoMessage()
|
||||
{
|
||||
BOOL bRc = ::WinGetMsg(vHabmain, &m_vMsg, HWND(NULL), 0, 0);
|
||||
BOOL bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0);
|
||||
|
||||
wxUsleep(10000);
|
||||
if (bRc == 0)
|
||||
{
|
||||
// got WM_QUIT
|
||||
@@ -624,7 +630,7 @@ bool wxApp::DoMessage()
|
||||
#endif // wxUSE_THREADS
|
||||
|
||||
// Process the message
|
||||
if (!ProcessMessage((WXMSG *)&svCurrentMsg) )
|
||||
if (!ProcessMessage((WXMSG *)&svCurrentMsg))
|
||||
{
|
||||
::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
|
||||
}
|
||||
@@ -658,6 +664,7 @@ int wxApp::MainLoop()
|
||||
#endif // wxUSE_THREADS
|
||||
while (!Pending() && ProcessIdle())
|
||||
{
|
||||
wxUsleep(10000);
|
||||
}
|
||||
DoMessage();
|
||||
}
|
||||
|
@@ -40,11 +40,8 @@
|
||||
#include <errno.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#define INCL_DOS
|
||||
#define INCL_PM
|
||||
#define INCL_GPI
|
||||
#include <os2.h>
|
||||
#define PURE_32
|
||||
|
||||
#ifndef __EMX__
|
||||
#include <upm.h>
|
||||
#include <netcons.h>
|
||||
@@ -236,7 +233,7 @@ void wxUsleep(
|
||||
unsigned long ulMilliseconds
|
||||
)
|
||||
{
|
||||
::DosSleep(ulMilliseconds);
|
||||
::DosSleep(ulMilliseconds/1000l);
|
||||
}
|
||||
|
||||
void wxSleep(
|
||||
|
Reference in New Issue
Block a user