#include "wx/msgdlg.h"
#include "wx/intl.h"
#include "wx/dynarray.h"
-# include "wx/wxchar.h"
-# include "wx/icon.h"
+ #include "wx/wxchar.h"
+ #include "wx/icon.h"
+ #include "wx/timer.h"
#endif
#include "wx/log.h"
#include "wx/os2/private.h"
+#ifdef __EMX__
+
+#include <sys\ioctl.h>
+#include <sys\select.h>
+
+#else
+
+#include <nerrno.h>
+#include <ioctl.h>
+#include <select.h>
+
+#endif // ndef for __EMX__
+
+#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 *);
+
+#endif
+
#if wxUSE_THREADS
#include "wx/thread.h"
#include "wx/resource.h"
#endif
+#if wxUSE_TOOLTIPS
+ #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
+
#include <string.h>
#include <ctype.h>
// ---------------------------------------------------------------------------
extern wxChar* wxBuffer;
-extern wxChar* wxOsVersion;
extern wxList* wxWinHandleList;
extern wxList WXDLLEXPORT wxPendingDelete;
extern wxCursor* g_globalCursor;
-HINSTANCE wxhInstance = 0;
+HAB vHabmain = NULLHANDLE;
QMSG svCurrentMsg;
wxApp* wxTheApp = NULL;
-HAB vHabmain = NULL;
-
-// FIXME why not const? and not static?
// NB: all "NoRedraw" classes must have the same names as the "normal" classes
// with NR suffix - wxWindow::OS2Create() supposes this
HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
-MRESULT wxWndProc( HWND
- ,ULONG
- ,MPARAM
- ,MPARAM
- );
+MRESULT EXPENTRY wxWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2);
+MRESULT EXPENTRY wxFrameWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2);
// ===========================================================================
// implementation
// ===========================================================================
+// ---------------------------------------------------------------------------
+// helper struct and functions for socket handling
+// ---------------------------------------------------------------------------
+
+struct GsocketCallbackInfo{
+ void (*proc)(void *);
+ int type;
+ int handle;
+ void* gsock;
+};
+
+// These defines and wrapper functions are used here and in gsockpm.c
+#define wxSockReadMask 0x01
+#define wxSockWriteMask 0x02
+
+#ifdef __EMX__
+extern "C"
+int wxAppAddSocketHandler(int handle, int mask,
+ void (*callback)(void*), void * gsock)
+{
+ return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
+}
+extern "C"
+void wxAppRemoveSocketHandler(int handle)
+{
+ wxTheApp->RemoveSocketHandler(handle);
+}
+#else
+// Linkage mode problems using callbacks with extern C in a .cpp module
+int wxAppAddSocketHandler(int handle, int mask,
+ void (*callback)(void*), void * gsock)
+{
+ return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
+}
+void wxAppRemoveSocketHandler(int handle)
+{
+ wxTheApp->RemoveSocketHandler(handle);
+}
+#endif
+
+void wxApp::HandleSockets()
+{
+ bool pendingEvent = FALSE;
+
+ // Check whether it's time for Gsocket operation
+ if (m_maxSocketHandles > 0 && m_maxSocketNr > 0)
+ {
+ fd_set readfds = m_readfds;
+ fd_set writefds = m_writefds;
+ struct timeval timeout;
+ int i;
+ struct GsocketCallbackInfo
+ *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+ int r = 0;
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 0;
+ if ( select(m_maxSocketNr, &readfds, &writefds, 0, &timeout) > 0)
+ {
+ for (i = m_lastUsedHandle + 1; i != m_lastUsedHandle; i++)
+ {
+ if (i == m_maxSocketNr)
+ i = 0;
+ if (FD_ISSET(i, &readfds))
+ {
+ int r;
+ for (r = 0; r < m_maxSocketHandles; r++){
+ if(CallbackInfo[r].handle == i &&
+ CallbackInfo[r].type == wxSockReadMask)
+ break;
+ }
+ if (r < m_maxSocketHandles)
+ {
+ CallbackInfo[r].proc(CallbackInfo[r].gsock);
+ pendingEvent = TRUE;
+ wxYield();
+ }
+ }
+ if (FD_ISSET(i, &writefds))
+ {
+ int r;
+ for (r = 0; r < m_maxSocketHandles; r++)
+ if(CallbackInfo[r].handle == i &&
+ CallbackInfo[r].type == wxSockWriteMask)
+ break;
+ if (r < m_maxSocketHandles)
+ {
+ CallbackInfo[r].proc(CallbackInfo[r].gsock);
+ pendingEvent = TRUE;
+ wxYield();
+ }
+ }
+ }
+ m_lastUsedHandle = i;
+ }
+ if (pendingEvent)
+ wxYield();
+ }
+}
// ---------------------------------------------------------------------------
// wxApp
// ---------------------------------------------------------------------------
EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
END_EVENT_TABLE()
-//// Initialize
+//
+// Initialize
+//
bool wxApp::Initialize(
HAB vHab
)
{
+#if defined(wxUSE_CONSOLEDEBUG)
+ #if wxUSE_CONSOLEDEBUG
+/***********************************************/
+/* Code for using stdout debug */
+/* To use it you mast link app as "Window" - EK*/
+/***********************************************/
+ {
+ PPIB pib;
+ PTIB tib;
+
+ printf("In console\n");
+
+ DosGetInfoBlocks(&tib, &pib);
+/* Try morphing into a PM application. */
+// if(pib->pib_ultype == 2) /* VIO */
+ pib->pib_ultype = 3;
+ }
+/**********************************************/
+/**********************************************/
+ #endif //wxUSE_CONSOLEDEBUG
+#endif
+
//
// OS2 has to have an anchorblock
//
wxClassInfo::InitializeClasses();
-#if wxUSE_RESOURCES
- wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion);
+#if wxUSE_THREADS
+ wxPendingEventsLocker = new wxCriticalSection;
#endif
- // I'm annoyed ... I don't know where to put this and I don't want to
- // create a module for that as it's part of the core.
wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
wxTheColourDatabase->Initialize();
wxBitmap::InitStandardHandlers();
- g_globalCursor = new wxCursor;
-
-#if 0
- wxSTD_FRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_FRAME"), TRUE);
- wxSTD_MDIPARENTFRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_MDIPARENTFRAME"), TRUE);
- wxSTD_MDICHILDFRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_MDICHILDFRAME"), TRUE);
-
- wxDEFAULT_FRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_FRAME"), TRUE);
- wxDEFAULT_MDIPARENTFRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_MDIPARENTFRAME"), TRUE);
- wxDEFAULT_MDICHILDFRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_MDICHILDFRAME"), TRUE);
-#endif
RegisterWindowClasses(vHab);
wxWinHandleList = new wxList(wxKEY_INTEGER);
if (!wxModule::InitializeModules())
return FALSE;
return TRUE;
-}
+} // end of wxApp::Initialize
+const char* CANTREGISTERCLASS = " Can't register Class ";
// ---------------------------------------------------------------------------
// RegisterWindowClasses
// ---------------------------------------------------------------------------
-// TODO we should only register classes really used by the app. For this it
-// would be enough to just delay the class registration until an attempt
-// to create a window of this class is made.
bool wxApp::RegisterWindowClasses(
HAB vHab
)
ERRORID vError = 0L;
wxString sError;
- if ((rc = ::WinRegisterClass( vHab
- ,wxFrameClassName
- ,(PFNWP)wxWndProc
- ,CS_SIZEREDRAW | CS_SYNCPAINT | CS_FRAME
- ,0
- )) != 0)
+ if (!::WinRegisterClass( vHab
+ ,wxFrameClassName
+ ,wxFrameWndProc
+ ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT | CS_CLIPCHILDREN
+ ,sizeof(ULONG)
+ ))
{
vError = ::WinGetLastError(vHab);
sError = wxPMErrorToStr(vError);
return FALSE;
}
- if ((rc = ::WinRegisterClass( vHab
- ,wxFrameClassNameNoRedraw
- ,(PFNWP)wxWndProc
- ,CS_FRAME
- ,0
- )) != 0)
+ if (!::WinRegisterClass( vHab
+ ,wxFrameClassNameNoRedraw
+ ,wxWndProc
+ ,0
+ ,sizeof(ULONG)
+ ))
{
vError = ::WinGetLastError(vHab);
sError = wxPMErrorToStr(vError);
return FALSE;
}
- if ((rc = ::WinRegisterClass( vHab
- ,wxMDIFrameClassName
- ,(PFNWP)wxWndProc
- ,CS_SIZEREDRAW | CS_SYNCPAINT | CS_FRAME
- ,0
- )) != 0)
+ if (!::WinRegisterClass( vHab
+ ,wxMDIFrameClassName
+ ,wxWndProc
+ ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
+ ,sizeof(ULONG)
+ ))
{
vError = ::WinGetLastError(vHab);
sError = wxPMErrorToStr(vError);
return FALSE;
}
- if ((rc = ::WinRegisterClass( vHab
- ,wxMDIFrameClassNameNoRedraw
- ,(PFNWP)wxWndProc
- ,CS_FRAME
- ,0
- )) != 0)
+ if (!::WinRegisterClass( vHab
+ ,wxMDIFrameClassNameNoRedraw
+ ,wxWndProc
+ ,0
+ ,sizeof(ULONG)
+ ))
{
vError = ::WinGetLastError(vHab);
sError = wxPMErrorToStr(vError);
return FALSE;
}
- if ((rc = ::WinRegisterClass( vHab
- ,wxMDIChildFrameClassName
- ,(PFNWP)wxWndProc
- ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST | CS_FRAME
- ,0
- )) != 0)
+ if (!::WinRegisterClass( vHab
+ ,wxMDIChildFrameClassName
+ ,wxWndProc
+ ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST
+ ,sizeof(ULONG)
+ ))
{
vError = ::WinGetLastError(vHab);
sError = wxPMErrorToStr(vError);
return FALSE;
}
- if ((rc = ::WinRegisterClass( vHab
- ,wxMDIChildFrameClassNameNoRedraw
- ,(PFNWP)wxWndProc
- ,CS_HITTEST | CS_FRAME
- ,0
- )) != 0)
+ if (!::WinRegisterClass( vHab
+ ,wxMDIChildFrameClassNameNoRedraw
+ ,wxWndProc
+ ,CS_HITTEST
+ ,sizeof(ULONG)
+ ))
{
vError = ::WinGetLastError(vHab);
sError = wxPMErrorToStr(vError);
return FALSE;
}
- if ((rc = ::WinRegisterClass( vHab
- ,wxPanelClassName
- ,(PFNWP)wxWndProc
- ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
- ,0
- )) != 0)
+ if (!::WinRegisterClass( vHab
+ ,wxPanelClassName
+ ,wxWndProc
+ ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
+ ,sizeof(ULONG)
+ ))
{
vError = ::WinGetLastError(vHab);
sError = wxPMErrorToStr(vError);
return FALSE;
}
- if ((rc = ::WinRegisterClass( vHab
- ,wxCanvasClassName
- ,(PFNWP)wxWndProc
- ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
- ,0
- )) != 0)
+ if (!::WinRegisterClass( vHab
+ ,wxCanvasClassName
+ ,wxWndProc
+ ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT | CS_CLIPCHILDREN
+ ,sizeof(ULONG)
+ ))
{
vError = ::WinGetLastError(vHab);
sError = wxPMErrorToStr(vError);
return FALSE;
}
return TRUE;
-}
-
-//// Cleans up any wxWindows internal structures left lying around
+} // end of wxApp::RegisterWindowClasses
+//
+// Cleans up any wxWindows internal structures left lying around
+//
void wxApp::CleanUp()
{
- //// COMMON CLEANUP
+ //
+ // COMMON CLEANUP
+ //
#if wxUSE_LOG
- // flush the logged messages if any and install a 'safer' log target: the
+
+ //
+ // Flush the logged messages if any and install a 'safer' log target: the
// default one (wxLogGui) can't be used after the resources are freed just
// below and the user suppliedo ne might be even more unsafe (using any
// wxWindows GUI function is unsafe starting from now)
+ //
wxLog::DontCreateOnDemand();
- // this will flush the old messages if any
+ //
+ // This will flush the old messages if any
+ //
delete wxLog::SetActiveTarget(new wxLogStderr);
#endif // wxUSE_LOG
+ //
// One last chance for pending objects to be cleaned up
+ //
wxTheApp->DeletePendingObjects();
wxModule::CleanUpModules();
#if wxUSE_WX_RESOURCES
wxCleanUpResourceSystem();
-
- // wxDefaultResourceTable->ClearTable();
#endif
- // Indicate that the cursor can be freed, so that cursor won't be deleted
- // by deleting the bitmap list before g_globalCursor goes out of scope
- // (double deletion of the cursor).
- wxSetCursor(wxNullCursor);
- delete g_globalCursor;
- g_globalCursor = NULL;
-
wxDeleteStockObjects();
+ //
// Destroy all GDI lists, etc.
+ //
wxDeleteStockLists();
delete wxTheColourDatabase;
delete[] wxBuffer;
wxBuffer = NULL;
- //// WINDOWS-SPECIFIC CLEANUP
+ //
+ // PM-SPECIFIC CLEANUP
+ //
// wxSetKeyboardHook(FALSE);
if (wxWinHandleList)
delete wxWinHandleList;
- // GL: I'm annoyed ... I don't know where to put this and I don't want to
- // create a module for that as it's part of the core.
-#if wxUSE_THREADS
delete wxPendingEvents;
+#if wxUSE_THREADS
delete wxPendingEventsLocker;
// If we don't do the following, we get an apparent memory leak.
((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
wxClassInfo::CleanUpClasses();
+ // Delete Message queue
+ if (wxTheApp->m_hMq)
+ ::WinDestroyMsgQueue(wxTheApp->m_hMq);
+
delete wxTheApp;
wxTheApp = NULL;
// do it as the very last thing because everything else can log messages
delete wxLog::SetActiveTarget(NULL);
#endif // wxUSE_LOG
-}
+} // end of wxApp::CleanUp
+//----------------------------------------------------------------------
+// Main wxWindows entry point
+//----------------------------------------------------------------------
int wxEntry(
int argc
, char* argv[]
//
if (!wxTheApp)
{
- wxCHECK_MSG( wxApp::GetInitializerFunction()
- ,-1
- ,wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n")
- );
-
- wxAppInitializerFunction fnAppIni = wxApp::GetInitializerFunction();
- wxObject* pTest_app = fnAppIni();
-
- wxTheApp = (wxApp*)pTest_app;
+ // The app may have declared a global application object, but we recommend
+ // the IMPLEMENT_APP macro is used instead, which sets an initializer
+ // function for delayed, dynamic app object construction.
+ wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
+ wxT("No initializer - use IMPLEMENT_APP macro.") );
+ wxTheApp = (*wxApp::GetInitializerFunction()) ();
}
- wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") );
+ wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
wxTheApp->argc = argc;
#if wxUSE_UNICODE
{
if (wxTheApp->OnInit())
{
- nRetValue = -1;
+ nRetValue = wxTheApp->OnRun();
}
- }
-
- if (nRetValue == 0)
- {
+ // Normal exit
wxWindow* pTopWindow = wxTheApp->GetTopWindow();
-
if (pTopWindow)
{
// Forcibly delete the window.
}
}
}
+ else // app initialization failed
+ {
+ wxLogLastError(" Gui initialization failed, exitting");
+ }
+#if wxUSE_CONSOLEDEBUG
+ printf("wxTheApp->OnExit ");
+ fflush(stdout);
+#endif
wxTheApp->OnExit();
+#if wxUSE_CONSOLEDEBUG
+ printf("wxApp::CleanUp ");
+ fflush(stdout);
+#endif
wxApp::CleanUp();
+#if wxUSE_CONSOLEDEBUG
+ printf("return %i ", nRetValue);
+ fflush(stdout);
+#endif
return(nRetValue);
-}
+} // end of wxEntry
bool wxApp::OnInitGui()
{
ERRORID vError;
wxString sError;
- m_hMq = WinCreateMsgQueue(vHabmain, 0);
+ m_hMq = ::WinCreateMsgQueue(vHabmain, 0);
if (!m_hMq)
{
vError = ::WinGetLastError(vHabmain);
return FALSE;
}
return TRUE;
-}
+} // end of wxApp::OnInitGui
//
// Static member initialization
m_nPrintMode = wxPRINT_WINDOWS;
m_exitOnFrameDelete = TRUE;
m_bAuto3D = TRUE;
-}
+ m_hMq = 0;
+ m_maxSocketHandles = 0;
+ m_maxSocketNr = 0;
+ m_sockCallbackInfo = 0;
+} // end of wxApp::wxApp
wxApp::~wxApp()
{
-#if wxUSE_UNICODE
+ //
// Delete command-line args
- int i;
+ //
+#if wxUSE_UNICODE
+ int i;
+
for (i = 0; i < argc; i++)
{
delete[] argv[i];
}
delete[] argv;
#endif
-}
+} // end of wxApp::~wxApp
bool wxApp::Initialized()
{
return TRUE;
else
return FALSE;
-}
+} // end of wxApp::Initialized
//
// Get and process a message, returning FALSE if WM_QUIT
// received (and also set the flag telling the app to exit the main loop)
//
+
bool wxApp::DoMessage()
{
- BOOL bRc = ::WinGetMsg(vHabmain, &m_vMsg, HWND(NULL), 0, 0);
+ BOOL bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0);
if (bRc == 0)
{
static wxMsgArray svSavedMessages;
//
- // if a secondary thread owns is doing GUI calls, save all messages for
+ // If a secondary thread owns is doing GUI calls, save all messages for
// later processing - we can't process them right now because it will
// lead to recursive library calls (and we're not reentrant)
//
{
sbHadGuiLock = FALSE;
- // leave out WM_COMMAND messages: too dangerous, sometimes
+ //
+ // Leave out WM_COMMAND messages: too dangerous, sometimes
// the message will be processed twice
+ //
if ( !wxIsWaitingForThread() ||
svCurrentMsg.msg != WM_COMMAND )
{
else
{
//
- // have we just regained the GUI lock? if so, post all of the saved
+ // Have we just regained the GUI lock? if so, post all of the saved
// messages
//
- // FIXME of course, it's not _exactly_ the same as processing the
- // messages normally - expect some things to break...
- //
if (!sbHadGuiLock )
{
sbHadGuiLock = TRUE;
}
#endif // wxUSE_THREADS
+ //
// Process the message
- if (!ProcessMessage((WXMSG *)&svCurrentMsg) )
- {
- ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
- }
+ //
+ DoMessage((WXMSG *)&svCurrentMsg);
}
return TRUE;
-}
+} // end of wxApp::DoMessage
+
+void wxApp::DoMessage(
+ WXMSG* pMsg
+)
+{
+ if (!ProcessMessage((WXMSG *)&svCurrentMsg))
+ {
+ ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
+ }
+} // end of wxApp::DoMessage
//////////////////////////////////////////////////////////////////////////////
//
#if wxUSE_THREADS
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
- while (!::WinPeekMsg(vHabmain, &svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) &&
- ProcessIdle() )
+ while (!Pending() && ProcessIdle())
{
+ HandleSockets();
+ wxUsleep(10000);
}
- DoMessage();
+ HandleSockets();
+ if (Pending())
+ DoMessage();
+ else
+ wxUsleep(10000);
+
}
return (int)svCurrentMsg.mp1;
-}
+} // end of wxApp::MainLoop
//
// Returns TRUE if more time is needed.
vEvent.SetEventObject(this);
ProcessEvent(vEvent);
return vEvent.MoreRequested();
-}
-
-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-{
- wxNode* pNode = wxPendingEvents->First();
- wxCriticalSectionLocker vLocker(*wxPendingEventsLocker);
-
- while (pNode)
- {
- wxEvtHandler* pHandler = (wxEvtHandler *)pNode->Data();
- pHandler->ProcessPendingEvents();
-
- delete pNode;
- pNode = wxPendingEvents->First();
- }
-}
-#endif
+} // end of wxApp::ProcessIdle
void wxApp::ExitMainLoop()
{
WXMSG* pWxmsg
)
{
- QMSG* vMsg = (PQMSG)pWxmsg;
- HWND hWnd = vMsg->hwnd;
+ QMSG* pMsg = (PQMSG)pWxmsg;
+ HWND hWnd = pMsg->hwnd;
wxWindow* pWndThis = wxFindWinFromHandle((WXHWND)hWnd);
wxWindow* pWnd;
+#if wxUSE_TOOLTIPS
+ //
+ // We must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
+ // popup the tooltip bubbles
+ //
+ if (pWndThis && (pMsg->msg == WM_MOUSEMOVE))
+ {
+ wxToolTip* pToolTip = pWndThis->GetToolTip();
+ if (pToolTip)
+ {
+ pToolTip->RelayEvent(pWxmsg);
+ }
+ }
+#endif // wxUSE_TOOLTIPS
+
+ //
+ // We must relay Timer events to wxTimer's processing function
+ //
+ if (pMsg->msg == WM_TIMER)
+ wxTimerProc(NULL, 0, (int)pMsg->mp1, 0);
+
//
- // for some composite controls (like a combobox), wndThis might be NULL
+ // For some composite controls (like a combobox), wndThis might be NULL
// because the subcontrol is not a wxWindow, but only the control itself
// is - try to catch this case
//
pWndThis = wxFindWinFromHandle((WXHWND)hWnd);
}
- // Anyone for a non-translation message? Try youngest descendants first.
- for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent())
+ //
+ // Try translations first; find the youngest window with
+ // a translation table. OS/2 has case sensative accels, so
+ // this block, coded by BK, removes that and helps make them
+ // case insensative.
+ //
+ if(pMsg->msg == WM_CHAR)
{
- if (pWnd->OS2ProcessMessage(pWxmsg))
- return TRUE;
+ PBYTE pChmsg = (PBYTE)&(pMsg->msg);
+ USHORT uSch = CHARMSG(pChmsg)->chr;
+ bool bRc;
+
+ //
+ // Do not process keyup events
+ //
+ if(!(CHARMSG(pChmsg)->fs & KC_KEYUP))
+ {
+ if((CHARMSG(pChmsg)->fs & (KC_ALT | KC_CTRL)) && CHARMSG(pChmsg)->chr != 0)
+ CHARMSG(pChmsg)->chr = (USHORT)wxToupper((UCHAR)uSch);
+
+
+ for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
+ {
+ if((bRc = pWnd->OS2TranslateMessage(pWxmsg)) == TRUE)
+ break;
+ }
+
+ if(!bRc) // untranslated, should restore original value
+ CHARMSG(pChmsg)->chr = uSch;
+ }
}
+ //
+ // Anyone for a non-translation message? Try youngest descendants first.
+ //
+// for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent())
+// {
+// if (pWnd->OS2ProcessMessage(pWxmsg))
+// return TRUE;
+// }
return FALSE;
-}
+} // end of wxApp::ProcessMessage
void wxApp::OnIdle(
wxIdleEvent& rEvent
//
// Avoid recursion (via ProcessEvent default case)
//
- if (sbInOnIdle )
+ if (sbInOnIdle)
return;
sbInOnIdle = TRUE;
+ //
+ // If there are pending events, we must process them: pending events
+ // are either events to the threads other than main or events posted
+ // with wxPostEvent() functions
+ //
+ ProcessPendingEvents();
+
//
// 'Garbage' collection of windows deleted with Close().
//
DeletePendingObjects();
#if wxUSE_LOG
- // flush the logged messages if any
- wxLog* pLog = wxLog::GetActiveTarget();
-
- if (pLog != NULL && pLog->HasPendingMessages())
- pLog->Flush();
+ //
+ // Flush the logged messages if any
+ //
+ wxLog::FlushActive();
#endif // wxUSE_LOG
+#if wxUSE_DC_CACHEING
+ // 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))
+ wxDC::ClearCache();
+#endif // wxUSE_DC_CACHEING
+
+ //
// Send OnIdle events to all windows
+ //
if (SendIdleEvents())
{
//
//
rEvent.RequestMore(TRUE);
}
-
- //
- // If they are pending events, we must process them.
- //
-#if wxUSE_THREADS
- ProcessPendingEvents();
-#endif
sbInOnIdle = FALSE;
-}
-
-void wxWakeUpIdle()
-{
- // **** please implement me! ****
- // Wake up the idle handler processor, even if it is in another thread...
-}
+} // end of wxApp::OnIdle
// Send idle event to all top-level windows
bool wxApp::SendIdleEvents()
pNode = pNode->GetNext();
}
return bNeedMore;
-}
+} // end of wxApp::SendIdleEvents
//
// Send idle event to window and all subwindows
pNode = pNode->Next();
}
return bNeedMore;
-}
+} // end of wxApp::SendIdleEvents
void wxApp::DeletePendingObjects()
{
//
pNode = wxPendingDelete.First();
}
-}
+} // end of wxApp::DeletePendingObjects
void wxApp::OnEndSession(
wxCloseEvent& WXUNUSED(rEvent))
{
if (GetTopWindow())
GetTopWindow()->Close(TRUE);
-}
+} // end of wxApp::OnEndSession
//
// Default behaviour: close the application with prompts. The
if (!GetTopWindow()->Close(!rEvent.CanVeto()))
rEvent.Veto(TRUE);
}
-}
+} // end of wxApp::OnQueryEndSession
void wxExit()
{
wxLogError(_("Fatal error: exiting"));
wxApp::CleanUp();
-}
+} // end of wxExit
+
+static bool gs_inYield = FALSE;
+//
// Yield to incoming messages
+//
bool wxYield()
{
HAB vHab = 0;
QMSG vMsg;
+
+ //
+ // Disable log flushing from here because a call to wxYield() shouldn't
+ // normally result in message boxes popping up &c
+ //
+ wxLog::Suspend();
+
+ gs_inYield = TRUE;
+
+ //
// We want to go back to the main message loop
// if we see a WM_QUIT. (?)
+ //
while (::WinPeekMsg(vHab, &vMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) && vMsg.msg != WM_QUIT)
{
+#if wxUSE_THREADS
+ wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
if (!wxTheApp->DoMessage())
break;
}
+ //
// If they are pending events, we must process them.
-#if wxUSE_THREADS
- wxTheApp->ProcessPendingEvents();
-#endif
+ //
+ if (wxTheApp)
+ wxTheApp->ProcessPendingEvents();
+
+ //
+ // Let the logs be flashed again
+ //
+ wxLog::Resume();
+ gs_inYield = FALSE;
return TRUE;
+} // end of wxYield
+
+// Yield to incoming messages; but fail silently if recursion is detected.
+bool wxYieldIfNeeded()
+{
+ if (gs_inYield)
+ return FALSE;
+
+ return wxYield();
}
wxIcon wxApp::GetStdIcon(
return wxIcon("wxICON_ERROR");
}
return wxIcon("wxICON_ERROR");
+} // end of wxApp::GetStdIcon
+
+int wxApp::AddSocketHandler(int handle, int mask,
+ void (*callback)(void*), void * gsock)
+{
+ int find;
+ struct GsocketCallbackInfo
+ *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+
+ for (find = 0; find < m_maxSocketHandles; find++)
+ if (CallbackInfo[find].handle == -1)
+ break;
+ if (find == m_maxSocketHandles)
+ {
+ // Allocate new memory
+ m_sockCallbackInfo = realloc(m_sockCallbackInfo,
+ (m_maxSocketHandles+=10)*
+ sizeof(struct GsocketCallbackInfo));
+ CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+ for (find = m_maxSocketHandles - 10; find < m_maxSocketHandles; find++)
+ CallbackInfo[find].handle = -1;
+ find = m_maxSocketHandles - 10;
+ }
+ CallbackInfo[find].proc = callback;
+ CallbackInfo[find].type = mask;
+ CallbackInfo[find].handle = handle;
+ CallbackInfo[find].gsock = gsock;
+ if (mask & wxSockReadMask)
+ FD_SET(handle, &m_readfds);
+ if (mask & wxSockWriteMask)
+ FD_SET(handle, &m_writefds);
+ if (handle >= m_maxSocketNr)
+ m_maxSocketNr = handle + 1;
+ return find;
}
-HINSTANCE wxGetInstance()
+void wxApp::RemoveSocketHandler(int handle)
+{
+ struct GsocketCallbackInfo
+ *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+ if (handle < m_maxSocketHandles)
+ {
+ if (CallbackInfo[handle].type & wxSockReadMask)
+ FD_CLR(CallbackInfo[handle].handle, &m_readfds);
+ if (CallbackInfo[handle].type & wxSockWriteMask)
+ FD_CLR(CallbackInfo[handle].handle, &m_writefds);
+ CallbackInfo[handle].handle = -1;
+ }
+}
+
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle
+//-----------------------------------------------------------------------------
+
+void wxWakeUpIdle()
+{
+ //
+ // Send the top window a dummy message so idle handler processing will
+ // start up again. Doing it this way ensures that the idle handler
+ // wakes up in the right thread (see also wxWakeUpMainThread() which does
+ // the same for the main app thread only)
+ //
+ wxWindow* pTopWindow = wxTheApp->GetTopWindow();
+
+ if (pTopWindow)
+ {
+ if ( !::WinPostMsg(GetHwndOf(pTopWindow), WM_NULL, (MPARAM)0, (MPARAM)0))
+ {
+ //
+ // Should never happen
+ //
+ wxLogLastError("PostMessage(WM_NULL)");
+ }
+ }
+} // end of wxWakeUpIdle
+
+HAB wxGetInstance()
{
- return wxhInstance;
+ return vHabmain;
}
-void wxSetInstance(HINSTANCE hInst)
+void wxSetInstance(
+ HAB vHab
+)
{
- wxhInstance = hInst;
+ vHabmain = vHab;
}
projects / wxWidgets.git / blobdiff