some os/2 icon-bitmap fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-12-06 05:01:46 +00:00
parent 58b1642453
commit 43543d985b
13 changed files with 202 additions and 158 deletions

View File

@@ -68,6 +68,7 @@ extern wxCursor* g_globalCursor;
HINSTANCE wxhInstance = 0;
QMSG svCurrentMsg;
wxApp* wxTheApp = NULL;
HAB vHabmain = NULL;
// FIXME why not const? and not static?
@@ -481,8 +482,8 @@ int wxEntry(
bool wxApp::OnInitGui()
{
m_vHab = WinInitialize(0);
m_hMq = WinCreateMsgQueue(m_vHab, 0);
vHabmain = WinInitialize(0);
m_hMq = WinCreateMsgQueue(vHabmain, 0);
return TRUE;
}
@@ -530,7 +531,7 @@ bool wxApp::Initialized()
//
bool wxApp::DoMessage()
{
BOOL bRc = ::WinGetMsg(m_vHab, &m_vMsg, HWND(NULL), 0, 0);
BOOL bRc = ::WinGetMsg(vHabmain, &m_vMsg, HWND(NULL), 0, 0);
if (bRc == 0)
{
@@ -592,7 +593,7 @@ bool wxApp::DoMessage()
if ( !ProcessMessage((WXMSG *)&vMsg) )
{
::WinDispatchMsg(m_vHab, &vMsg);
::WinDispatchMsg(vHabmain, &vMsg);
}
}
svSavedMessages.Empty();
@@ -603,7 +604,7 @@ bool wxApp::DoMessage()
// Process the message
if (!ProcessMessage((WXMSG *)&svCurrentMsg) )
{
::WinDispatchMsg(m_vHab, (PQMSG)&svCurrentMsg);
::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
}
}
return TRUE;
@@ -633,7 +634,7 @@ int wxApp::MainLoop()
#if wxUSE_THREADS
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
while (!::WinPeekMsg(m_vHab, &svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) &&
while (!::WinPeekMsg(vHabmain, &svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) &&
ProcessIdle() )
{
}
@@ -678,7 +679,7 @@ void wxApp::ExitMainLoop()
bool wxApp::Pending()
{
return (::WinPeekMsg(m_vHab, (PQMSG)&svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) != 0);
return (::WinPeekMsg(vHabmain, (PQMSG)&svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) != 0);
}
void wxApp::Dispatch()