X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dde11e605346b64d3ae0a39295fb5428298cfa3e..e1f14d226fceb8f77626a58bbddf7ace3b93d66c:/src/os2/app.cpp?ds=sidebyside diff --git a/src/os2/app.cpp b/src/os2/app.cpp index f0b658c670..96d1531b5f 100644 --- a/src/os2/app.cpp +++ b/src/os2/app.cpp @@ -27,8 +27,9 @@ #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" @@ -36,21 +37,49 @@ #include "wx/os2/private.h" +#ifdef __EMX__ + +#include +#include + +#else + +#include +#include +#include +#include + +#endif // + +#ifndef __EMX__ + +#define select(a,b,c,d,e) bsdselect(a,b,c,d,e) +extern "C" int _System bsdselect(int, + struct fd_set *, + struct fd_set *, + struct fd_set *, + struct timeval *); +#endif + #if wxUSE_THREADS #include "wx/thread.h" - // define the array of MSG strutures -// TODO: WX_DECLARE_OBJARRAY(MSG, wxMsgArray); + // define the array of QMSG strutures + WX_DECLARE_OBJARRAY(QMSG, wxMsgArray); #include "wx/arrimpl.cpp" -// TODO: WX_DEFINE_OBJARRAY(wxMsgArray); + WX_DEFINE_OBJARRAY(wxMsgArray); #endif // wxUSE_THREADS #if wxUSE_WX_RESOURCES #include "wx/resource.h" #endif +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif // wxUSE_TOOLTIPS + #include #include @@ -58,55 +87,145 @@ // global variables // --------------------------------------------------------------------------- -extern wxChar *wxBuffer; -extern wxChar *wxOsVersion; -extern wxList *wxWinHandleList; -extern wxList WXDLLEXPORT wxPendingDelete; -#if wxUSE_THREADS -extern wxList *wxPendingEvents; -extern wxCriticalSection *wxPendingEventsLocker; -#endif -extern void wxSetKeyboardHook(bool doIt); -extern wxCursor *g_globalCursor; +extern wxChar* wxBuffer; +extern wxList* wxWinHandleList; +extern wxList WXDLLEXPORT wxPendingDelete; +extern wxCursor* g_globalCursor; -HINSTANCE wxhInstance = 0; -// TODO: MSG s_currentMsg; -wxApp *wxTheApp = NULL; - -// FIXME why not const? and not static? +HAB vHabmain = NULLHANDLE; +QMSG svCurrentMsg; +wxApp* wxTheApp = NULL; // NB: all "NoRedraw" classes must have the same names as the "normal" classes -// with NR suffix - wxWindow::MSWCreate() supposes this -wxChar wxFrameClassName[] = wxT("wxFrameClass"); -wxChar wxFrameClassNameNoRedraw[] = wxT("wxFrameClassNR"); -wxChar wxMDIFrameClassName[] = wxT("wxMDIFrameClass"); -wxChar wxMDIFrameClassNameNoRedraw[] = wxT("wxMDIFrameClassNR"); -wxChar wxMDIChildFrameClassName[] = wxT("wxMDIChildFrameClass"); +// with NR suffix - wxWindow::OS2Create() supposes this +wxChar wxFrameClassName[] = wxT("wxFrameClass"); +wxChar wxFrameClassNameNoRedraw[] = wxT("wxFrameClassNR"); +wxChar wxMDIFrameClassName[] = wxT("wxMDIFrameClass"); +wxChar wxMDIFrameClassNameNoRedraw[] = wxT("wxMDIFrameClassNR"); +wxChar wxMDIChildFrameClassName[] = wxT("wxMDIChildFrameClass"); wxChar wxMDIChildFrameClassNameNoRedraw[] = wxT("wxMDIChildFrameClassNR"); -wxChar wxPanelClassName[] = wxT("wxPanelClass"); -wxChar wxCanvasClassName[] = wxT("wxCanvasClass"); +wxChar wxPanelClassName[] = wxT("wxPanelClass"); +wxChar wxCanvasClassName[] = wxT("wxCanvasClass"); -HICON wxSTD_FRAME_ICON = (HICON) NULL; -HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; +HICON wxSTD_FRAME_ICON = (HICON) NULL; +HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; HICON wxSTD_MDIPARENTFRAME_ICON = (HICON) NULL; -HICON wxDEFAULT_FRAME_ICON = (HICON) NULL; -HICON wxDEFAULT_MDICHILDFRAME_ICON = (HICON) NULL; -HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL; +HICON wxDEFAULT_FRAME_ICON = (HICON) NULL; +HICON wxDEFAULT_MDICHILDFRAME_ICON = (HICON) NULL; +HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL; HBRUSH wxDisableButtonBrush = (HBRUSH) 0; -MRESULT wxWndProc(HWND, UINT, 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 // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) @@ -114,30 +233,58 @@ MRESULT wxWndProc(HWND, UINT, MPARAM, MPARAM); EVT_END_SESSION(wxApp::OnEndSession) EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -#endif -//// Initialize -bool wxApp::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 + // + vHab = WinInitialize(0); + + if (!vHab) + return FALSE; + else + vHabmain = vHab; + // Some people may wish to use this, but // probably it shouldn't be here by default. #ifdef __WXDEBUG__ // wxRedirectIOToConsole(); #endif - wxBuffer = new wxChar[1500]; // FIXME + wxBuffer = new wxChar[1500]; // FIXME; why? wxClassInfo::InitializeClasses(); -#if wxUSE_RESOURCES - wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion); -#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. #if wxUSE_THREADS - wxPendingEvents = new wxList(); - wxPendingEventsLocker = new wxCriticalSection(); + wxPendingEventsLocker = new wxCriticalSection; #endif wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); @@ -152,284 +299,183 @@ bool wxApp::Initialize() wxBitmap::InitStandardHandlers(); - g_globalCursor = new wxCursor; - -// TODO: -/* - wxSTD_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_FRAME")); - wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDIPARENTFRAME")); - wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDICHILDFRAME")); - - wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_FRAME")); - wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDIPARENTFRAME")); - wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDICHILDFRAME")); -*/ - RegisterWindowClasses(); - - // Create the brush for disabling bitmap buttons -// TODO: -/* - LOGBRUSH lb; - lb.lbStyle = BS_PATTERN; - lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") ); - if ( lb.lbHatch ) - { - wxDisableButtonBrush = ::CreateBrushIndirect( & lb ); - ::DeleteObject( (HGDIOBJ)lb.lbHatch ); - } - */ - //else: wxWindows resources are probably not linked in - + RegisterWindowClasses(vHab); wxWinHandleList = new wxList(wxKEY_INTEGER); // This is to foil optimizations in Visual C++ that throw out dummy.obj. // PLEASE DO NOT ALTER THIS. -#if !defined(WXMAKINGDLL) +#if !defined(WXMAKINGDLL) && defined(__VISAGECPP__) extern char wxDummyChar; if (wxDummyChar) wxDummyChar++; #endif - wxSetKeyboardHook(TRUE); + // wxSetKeyboardHook(TRUE); wxModule::RegisterModules(); 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() +bool wxApp::RegisterWindowClasses( + HAB vHab +) { -// TODO: -/* - WNDCLASS wndclass; - - // for each class we register one with CS_(V|H)REDRAW style and one - // without for windows created with wxNO_FULL_REDRAW_ON_REPAINT flag - static const long styleNormal = 0; // TODO: CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; - static const long styleNoRedraw = 0; // TODO: CS_DBLCLKS; - - // the fields which are common to all classes - wndclass.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = sizeof( DWORD ); // VZ: what is this DWORD used for? - wndclass.hInstance = wxhInstance; - wndclass.hIcon = (HICON) NULL; - wndclass.hCursor = 0; // TODO: ::LoadCursor((HINSTANCE)NULL, IDC_ARROW); - wndclass.lpszMenuName = NULL; - - // Register the frame window class. - wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1); - wndclass.lpszClassName = wxFrameClassName; - wndclass.style = styleNormal; - - if ( !RegisterClass(&wndclass) ) + ERRORID vError = 0L; + wxString sError; + + if (!::WinRegisterClass( vHab + ,wxFrameClassName + ,wxFrameWndProc + ,CS_SIZEREDRAW | CS_SYNCPAINT | CS_CLIPCHILDREN + ,sizeof(ULONG) + )) { - wxLogLastError("RegisterClass(frame)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } - // "no redraw" frame - wndclass.lpszClassName = wxFrameClassNameNoRedraw; - wndclass.style = styleNoRedraw; - - if ( !RegisterClass(&wndclass) ) + if (!::WinRegisterClass( vHab + ,wxFrameClassNameNoRedraw + ,wxWndProc + ,0 + ,sizeof(ULONG) + )) { - wxLogLastError("RegisterClass(no redraw frame)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } - // Register the MDI frame window class. - wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves - wndclass.lpszClassName = wxMDIFrameClassName; - wndclass.style = styleNormal; - - if ( !RegisterClass(&wndclass) ) + if (!::WinRegisterClass( vHab + ,wxMDIFrameClassName + ,wxWndProc + ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT + ,sizeof(ULONG) + )) { - wxLogLastError("RegisterClass(MDI parent)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } - // "no redraw" MDI frame - wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw; - wndclass.style = styleNoRedraw; - - if ( !RegisterClass(&wndclass) ) + if (!::WinRegisterClass( vHab + ,wxMDIFrameClassNameNoRedraw + ,wxWndProc + ,0 + ,sizeof(ULONG) + )) { - wxLogLastError("RegisterClass(no redraw MDI parent frame)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } - // Register the MDI child frame window class. - wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - wndclass.lpszClassName = wxMDIChildFrameClassName; - wndclass.style = styleNormal; - - if ( !RegisterClass(&wndclass) ) + if (!::WinRegisterClass( vHab + ,wxMDIChildFrameClassName + ,wxWndProc + ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST + ,sizeof(ULONG) + )) { - wxLogLastError("RegisterClass(MDI child)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } - // "no redraw" MDI child frame - wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw; - wndclass.style = styleNoRedraw; - - if ( !RegisterClass(&wndclass) ) + if (!::WinRegisterClass( vHab + ,wxMDIChildFrameClassNameNoRedraw + ,wxWndProc + ,CS_HITTEST + ,sizeof(ULONG) + )) { - wxLogLastError("RegisterClass(no redraw MDI child)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } - // Register the panel window class. - wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH ); - wndclass.lpszClassName = wxPanelClassName; - wndclass.style = styleNormal; - - if ( !RegisterClass(&wndclass) ) + if (!::WinRegisterClass( vHab + ,wxPanelClassName + ,wxWndProc + ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT + ,sizeof(ULONG) + )) { - wxLogLastError("RegisterClass(panel)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } - // Register the canvas and textsubwindow class name - wndclass.hbrBackground = (HBRUSH)NULL; - wndclass.lpszClassName = wxCanvasClassName; - - if ( !RegisterClass(&wndclass) ) + if (!::WinRegisterClass( vHab + ,wxCanvasClassName + ,wxWndProc + ,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT | CS_CLIPCHILDREN + ,sizeof(ULONG) + )) { - wxLogLastError("RegisterClass(canvas)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } -*/ return TRUE; -} - -// --------------------------------------------------------------------------- -// Convert Windows to argc, argv style -// --------------------------------------------------------------------------- - -void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) -{ - wxStringList args; - - wxString cmdLine(lpCmdLine); - int count = 0; - - // Get application name - wxChar name[260]; // 260 is MAX_PATH value from windef.h -// TODO: ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name)); - - args.Add(name); - count++; - - wxStrcpy(name, wxFileNameFromPath(name)); - wxStripExtension(name); - wxTheApp->SetAppName(name); - - // Break up string - // Treat strings enclosed in double-quotes as single arguments - int i = 0; - int len = cmdLine.Length(); - while (i < len) - { - // Skip whitespace - while ((i < len) && wxIsspace(cmdLine.GetChar(i))) - i ++; - - if (i < len) - { - if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string - { - i ++; - int first = i; - while ((i < len) && (cmdLine.GetChar(i) != wxT('"'))) - i ++; - - wxString arg(cmdLine.Mid(first, (i - first))); - - args.Add(arg); - count ++; - - if (i < len) - i ++; // Skip past 2nd quote - } - else // Unquoted argument - { - int first = i; - while ((i < len) && !wxIsspace(cmdLine.GetChar(i))) - i ++; - - wxString arg(cmdLine.Mid(first, (i - first))); - - args.Add(arg); - count ++; - } - } - } - - wxTheApp->argv = new wxChar*[count + 1]; - for (i = 0; i < count; i++) - { - wxString arg(args[i]); - wxTheApp->argv[i] = copystring((const wxChar*)arg); - } - wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list - wxTheApp->argc = count; -} - -//// 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; @@ -440,25 +486,26 @@ void wxApp::CleanUp() delete[] wxBuffer; wxBuffer = NULL; - //// WINDOWS-SPECIFIC CLEANUP + // + // PM-SPECIFIC CLEANUP + // + + // wxSetKeyboardHook(FALSE); - wxSetKeyboardHook(FALSE); -// TODO: -/* if (wxSTD_FRAME_ICON) - DestroyIcon(wxSTD_FRAME_ICON); + ::WinFreeFileIcon(wxSTD_FRAME_ICON); if (wxSTD_MDICHILDFRAME_ICON) - DestroyIcon(wxSTD_MDICHILDFRAME_ICON); + ::WinFreeFileIcon(wxSTD_MDICHILDFRAME_ICON); if (wxSTD_MDIPARENTFRAME_ICON) - DestroyIcon(wxSTD_MDIPARENTFRAME_ICON); + ::WinFreeFileIcon(wxSTD_MDIPARENTFRAME_ICON); if (wxDEFAULT_FRAME_ICON) - DestroyIcon(wxDEFAULT_FRAME_ICON); + ::WinFreeFileIcon(wxDEFAULT_FRAME_ICON); if (wxDEFAULT_MDICHILDFRAME_ICON) - DestroyIcon(wxDEFAULT_MDICHILDFRAME_ICON); + ::WinFreeFileIcon(wxDEFAULT_MDICHILDFRAME_ICON); if (wxDEFAULT_MDIPARENTFRAME_ICON) - DestroyIcon(wxDEFAULT_MDIPARENTFRAME_ICON); -*/ + ::WinFreeFileIcon(wxDEFAULT_MDIPARENTFRAME_ICON); + if ( wxDisableButtonBrush ) { // TODO: ::DeleteObject( wxDisableButtonBrush ); @@ -467,10 +514,8 @@ void wxApp::CleanUp() 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(); @@ -478,6 +523,10 @@ void wxApp::CleanUp() wxClassInfo::CleanUpClasses(); + // Delete Message queue + if (wxTheApp->m_hMq) + ::WinDestroyMsgQueue(wxTheApp->m_hMq); + delete wxTheApp; wxTheApp = NULL; @@ -499,133 +548,129 @@ void wxApp::CleanUp() // do it as the very last thing because everything else can log messages delete wxLog::SetActiveTarget(NULL); #endif // wxUSE_LOG -} - -#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL)) - -//// Main wxWindows entry point -int wxEntry(WXHINSTANCE hInstance, - WXHINSTANCE WXUNUSED(hPrevInstance), - char *lpCmdLine, - int nCmdShow, - bool enterLoop) +} // end of wxApp::CleanUp + +//---------------------------------------------------------------------- +// Main wxWindows entry point +//---------------------------------------------------------------------- +int wxEntry( + int argc +, char* argv[] +) { - // do check for memory leaks on program exit - // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free - // deallocated memory which may be used to simulate low-memory condition) -// TODO: wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF); + HAB vHab = 0; - // take everything into a try-except block in release build - // FIXME other compilers must support Win32 SEH (structured exception - // handling) too, just find the appropriate keyword in their docs! - // Please note that it's _not_ the same as C++ exceptions! + if (!wxApp::Initialize(vHab)) + return 0; - wxhInstance = (HINSTANCE) hInstance; + // + // create the application object or ensure that one already exists + // + if (!wxTheApp) + { + // 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, 0, wxT("You have to define an instance of wxApp!") ); + wxTheApp->argc = argc; - if (!wxApp::Initialize()) - return 0; +#if wxUSE_UNICODE + wxTheApp->argv = new wxChar*[argc+1]; - // create the application object or ensure that one already exists - if (!wxTheApp) - { - // 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.") ); + int nArgc = 0; - wxTheApp = (wxApp*)(*wxApp::GetInitializerFunction()) (); - } + while (nArgc < argc) + { + wxTheApp->argv[nArgc] = wxStrdup(wxConvLibc.cMB2WX(argv[nArgc])); + nArgc++; + } + wxTheApp->argv[nArgc] = (wxChar *)NULL; +#else + wxTheApp->argv = argv; +#endif - wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); + wxString sName(wxFileNameFromPath(argv[0])); - // save the WinMain() parameters - wxTheApp->ConvertToStandardCommandArgs(lpCmdLine); - wxTheApp->m_nCmdShow = nCmdShow; + wxStripExtension(sName); + wxTheApp->SetAppName(sName); - // GUI-specific initialisation. In fact on Windows we don't have any, - // but this call is provided for compatibility across platforms. - wxTheApp->OnInitGui(); + int nRetValue = 0; - int retValue = 0; + if (!wxTheApp->OnInitGui()) + nRetValue = -1; - if ( wxTheApp->OnInit() ) + if (nRetValue == 0) + { + if (wxTheApp->OnInit()) { - if ( enterLoop ) - { - retValue = wxTheApp->OnRun(); - } - else - // We want to initialize, but not run or exit immediately. - return 1; + nRetValue = wxTheApp->OnRun(); } - //else: app initialization failed, so we skipped OnRun() - - wxWindow *topWindow = wxTheApp->GetTopWindow(); - if ( topWindow ) + // Normal exit + wxWindow* pTopWindow = wxTheApp->GetTopWindow(); + if (pTopWindow) { // Forcibly delete the window. - if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) || - topWindow->IsKindOf(CLASSINFO(wxDialog)) ) + if (pTopWindow->IsKindOf(CLASSINFO(wxFrame)) || + pTopWindow->IsKindOf(CLASSINFO(wxDialog)) ) { - topWindow->Close(TRUE); + pTopWindow->Close(TRUE); wxTheApp->DeletePendingObjects(); } else { - delete topWindow; + delete pTopWindow; wxTheApp->SetTopWindow(NULL); } } - - wxTheApp->OnExit(); - - wxApp::CleanUp(); - - return retValue; -} - -#else /* _WINDLL */ - -//// Entry point for DLLs - -int wxEntry(WXHINSTANCE hInstance) -{ - wxhInstance = (HINSTANCE) hInstance; - wxApp::Initialize(); - - // 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. - if (!wxTheApp) + } + else // app initialization failed { - wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, - "No initializer - use IMPLEMENT_APP macro." ); - - wxTheApp = (* wxApp::GetInitializerFunction()) (); + 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 - wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" ); - - wxTheApp->argc = 0; - wxTheApp->argv = NULL; - - wxTheApp->OnInitGui(); +bool wxApp::OnInitGui() +{ + ERRORID vError; + wxString sError; - wxTheApp->OnInit(); + if (!wxAppBase::OnInitGui()) + return FALSE; - wxWindow *topWindow = wxTheApp->GetTopWindow(); - if ( topWindow && topWindow->GetHWND()) + m_hMq = ::WinCreateMsgQueue(vHabmain, 0); + if (!m_hMq) { - topWindow->Show(TRUE); + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogDebug(sError); + return FALSE; } - return 1; -} -#endif // _WINDLL - -//// Static member initialization + return TRUE; +} // end of wxApp::OnInitGui +// +// Static member initialization +// wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; wxApp::wxApp() @@ -636,51 +681,55 @@ wxApp::wxApp() argc = 0; argv = NULL; - m_printMode = wxPRINT_WINDOWS; + m_nPrintMode = wxPRINT_WINDOWS; m_exitOnFrameDelete = TRUE; - m_auto3D = TRUE; -} + m_bAuto3D = TRUE; + m_hMq = 0; + m_maxSocketHandles = 0; + m_maxSocketNr = 0; + m_sockCallbackInfo = 0; +} // end of wxApp::wxApp wxApp::~wxApp() { + // // 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() { -#ifndef _WINDLL if (GetTopWindow()) return TRUE; else return FALSE; -#endif -#ifdef _WINDLL // Assume initialized if DLL (no way of telling) - return TRUE; -#endif -} +} // 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) +// -/* - * 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 rc = FALSE; // TODO: ::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0); - if ( rc == 0 ) + BOOL bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0); + + if (bRc == 0) { // got WM_QUIT - m_keepGoing = FALSE; - + m_bKeepGoing = FALSE; return FALSE; } - else if ( rc == -1 ) + else if (bRc == -1) { // should never happen, but let's test for it nevertheless wxLogLastError("GetMessage"); @@ -688,149 +737,136 @@ bool wxApp::DoMessage() else { #if wxUSE_THREADS - wxASSERT_MSG( wxThread::IsMain(), - wxT("only the main thread can process Windows messages") ); + wxASSERT_MSG( wxThread::IsMain() + ,wxT("only the main thread can process Windows messages") + ); - static bool s_hadGuiLock = TRUE; -// TODO: -/* - static wxMsgArray s_aSavedMessages; + static bool sbHadGuiLock = TRUE; + 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) - if ( !wxGuiOwnedByMainThread() ) + // + if (!wxGuiOwnedByMainThread()) { - s_hadGuiLock = FALSE; + 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() || - s_currentMsg.message != WM_COMMAND ) + svCurrentMsg.msg != WM_COMMAND ) { - s_aSavedMessages.Add(s_currentMsg); + svSavedMessages.Add(svCurrentMsg); } - return TRUE; } 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 ( !s_hadGuiLock ) + if (!sbHadGuiLock ) { - s_hadGuiLock = TRUE; + sbHadGuiLock = TRUE; - size_t count = s_aSavedMessages.Count(); - for ( size_t n = 0; n < count; n++ ) + size_t nCount = svSavedMessages.Count(); + + for (size_t n = 0; n < nCount; n++) { - MSG& msg = s_aSavedMessages[n]; + QMSG vMsg = svSavedMessages[n]; - if ( !ProcessMessage((WXMSG *)&msg) ) + if ( !ProcessMessage((WXMSG *)&vMsg) ) { - ::TranslateMessage(&msg); - ::DispatchMessage(&msg); + ::WinDispatchMsg(vHabmain, &vMsg); } } - s_aSavedMessages.Empty(); + svSavedMessages.Empty(); } } -*/ #endif // wxUSE_THREADS + // // Process the message -// TODO: -/* - if ( !ProcessMessage((WXMSG *)&s_currentMsg) ) - { - ::TranslateMessage(&s_currentMsg); - ::DispatchMessage(&s_currentMsg); - } -*/ + // + DoMessage((WXMSG *)&svCurrentMsg); } - return TRUE; -} - -/* - * Keep trying to process messages until WM_QUIT - * received. - * - * If there are messages to be processed, they will all be - * processed and OnIdle will not be called. - * When there are no more messages, OnIdle is called. - * If OnIdle requests more time, - * it will be repeatedly called so long as there are no pending messages. - * A 'feature' of this is that once OnIdle has decided that no more processing - * is required, then it won't get processing time until further messages - * are processed (it'll sit in DoMessage). - */ +} // end of wxApp::DoMessage +void wxApp::DoMessage( + WXMSG* pMsg +) +{ + if (!ProcessMessage((WXMSG *)&svCurrentMsg)) + { + ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg); + } +} // end of wxApp::DoMessage + +////////////////////////////////////////////////////////////////////////////// +// +// Keep trying to process messages until WM_QUIT +// received. +// +// If there are messages to be processed, they will all be +// processed and OnIdle will not be called. +// When there are no more messages, OnIdle is called. +// If OnIdle requests more time, +// it will be repeatedly called so long as there are no pending messages. +// A 'feature' of this is that once OnIdle has decided that no more processing +// is required, then it won't get processing time until further messages +// are processed (it'll sit in DoMessage). +// +////////////////////////////////////////////////////////////////////////////// int wxApp::MainLoop() { - m_keepGoing = TRUE; + m_bKeepGoing = TRUE; - while ( m_keepGoing ) + while (m_bKeepGoing) { #if wxUSE_THREADS wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS -// TODO: -/* - while ( !::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) && - ProcessIdle() ) + while (!Pending() && ProcessIdle()) { + HandleSockets(); + wxUsleep(10000); } -*/ + HandleSockets(); + if (Pending()) + DoMessage(); + else + wxUsleep(10000); - DoMessage(); } + return (int)svCurrentMsg.mp1; +} // end of wxApp::MainLoop -// TODO: return s_currentMsg.wParam; - return FALSE; -} - +// // Returns TRUE if more time is needed. +// bool wxApp::ProcessIdle() { - wxIdleEvent event; - event.SetEventObject(this); - ProcessEvent(event); - - return event.MoreRequested(); -} - -#if wxUSE_THREADS -void wxApp::ProcessPendingEvents() -{ - wxNode *node = wxPendingEvents->First(); - wxCriticalSectionLocker locker(*wxPendingEventsLocker); - - while (node) - { - wxEvtHandler *handler = (wxEvtHandler *)node->Data(); - - handler->ProcessPendingEvents(); - - delete node; - node = wxPendingEvents->First(); - } -} -#endif + wxIdleEvent vEvent; + vEvent.SetEventObject(this); + ProcessEvent(vEvent); + return vEvent.MoreRequested(); +} // end of wxApp::ProcessIdle void wxApp::ExitMainLoop() { - m_keepGoing = FALSE; + m_bKeepGoing = FALSE; } bool wxApp::Pending() { -// TODO: return (::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0); - return FALSE; + return (::WinPeekMsg(vHabmain, (PQMSG)&svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) != 0); } void wxApp::Dispatch() @@ -838,236 +874,308 @@ void wxApp::Dispatch() DoMessage(); } -/* - * Give all windows a chance to preprocess - * the message. Some may have accelerator tables, or have - * MDI complications. - */ - -bool wxApp::ProcessMessage(WXMSG *wxmsg) +////////////////////////////////////////////////////////////////////////////// +// +// Give all windows a chance to preprocess +// the message. Some may have accelerator tables, or have +// MDI complications. +// +////////////////////////////////////////////////////////////////////////////// +bool wxApp::ProcessMessage( + WXMSG* pWxmsg +) { -// TODO: -/* - MSG *msg = (MSG *)wxmsg; - HWND hWnd = msg->hwnd; - wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd; + 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 - while ( hWnd && !wndThis ) + // + while (hWnd && !pWndThis) { - hWnd = 0; // TODO: ::GetParent(hWnd); - wndThis = wxFindWinFromHandle((WXHWND)hWnd); + hWnd = ::WinQueryWindow(hWnd, QW_PARENT); + pWndThis = wxFindWinFromHandle((WXHWND)hWnd); } + // // Try translations first; find the youngest window with - // a translation table. - for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) + // 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 ( wnd->OS2TranslateMessage(wxmsg) ) - 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 ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) - { - if ( wnd->OS2ProcessMessage(wxmsg) ) - return TRUE; - } -*/ + // +// for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent()) +// { +// if (pWnd->OS2ProcessMessage(pWxmsg)) +// return TRUE; +// } return FALSE; -} +} // end of wxApp::ProcessMessage -void wxApp::OnIdle(wxIdleEvent& event) +void wxApp::OnIdle( + wxIdleEvent& rEvent +) { - static bool s_inOnIdle = FALSE; + static bool sbInOnIdle = FALSE; + // // Avoid recursion (via ProcessEvent default case) - if ( s_inOnIdle ) + // + if (sbInOnIdle) return; - s_inOnIdle = TRUE; + 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(HWND_DESKTOP, VK_BUTTON1) && + !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) && + !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2)) + wxDC::ClearCache(); +#endif // wxUSE_DC_CACHEING + + // // Send OnIdle events to all windows - if ( SendIdleEvents() ) + // + if (SendIdleEvents()) { + // // SendIdleEvents() returns TRUE if at least one window requested more // idle events - event.RequestMore(TRUE); + // + rEvent.RequestMore(TRUE); } - - // If they are pending events, we must process them. -#if wxUSE_THREADS - ProcessPendingEvents(); -#endif - s_inOnIdle = FALSE; -} + sbInOnIdle = FALSE; +} // end of wxApp::OnIdle // Send idle event to all top-level windows bool wxApp::SendIdleEvents() { - bool needMore = FALSE; + bool bNeedMore = FALSE; + wxWindowList::Node* pNode = wxTopLevelWindows.GetFirst(); - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - while (node) + while (pNode) { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; - node = node->GetNext(); - } + wxWindow* pWin = pNode->GetData(); - return needMore; -} + if (SendIdleEvents(pWin)) + bNeedMore = TRUE; + pNode = pNode->GetNext(); + } + return bNeedMore; +} // end of wxApp::SendIdleEvents +// // Send idle event to window and all subwindows -bool wxApp::SendIdleEvents(wxWindow* win) +// +bool wxApp::SendIdleEvents( + wxWindow* pWin +) { - bool needMore = FALSE; + bool bNeedMore = FALSE; + wxIdleEvent vEvent; + + vEvent.SetEventObject(pWin); + pWin->GetEventHandler()->ProcessEvent(vEvent); - wxIdleEvent event; - event.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(event); + if (vEvent.MoreRequested()) + bNeedMore = TRUE; - if (event.MoreRequested()) - needMore = TRUE; + wxNode* pNode = pWin->GetChildren().First(); - wxNode* node = win->GetChildren().First(); - while (node) + while (pNode) { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; + wxWindow* pWin = (wxWindow*) pNode->Data(); - node = node->Next(); + if (SendIdleEvents(pWin)) + bNeedMore = TRUE; + pNode = pNode->Next(); } - return needMore; -} + return bNeedMore; +} // end of wxApp::SendIdleEvents void wxApp::DeletePendingObjects() { - wxNode *node = wxPendingDelete.First(); - while (node) + wxNode* pNode = wxPendingDelete.First(); + + while (pNode) { - wxObject *obj = (wxObject *)node->Data(); + wxObject* pObj = (wxObject *)pNode->Data(); - delete obj; + delete pObj; - if (wxPendingDelete.Member(obj)) - delete node; + if (wxPendingDelete.Member(pObj)) + delete pNode; + // // Deleting one object may have deleted other pending // objects, so start from beginning of list again. - node = wxPendingDelete.First(); + // + pNode = wxPendingDelete.First(); } -} +} // end of wxApp::DeletePendingObjects -void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) +void wxApp::OnEndSession( + wxCloseEvent& WXUNUSED(rEvent)) { if (GetTopWindow()) GetTopWindow()->Close(TRUE); -} +} // end of wxApp::OnEndSession +// // Default behaviour: close the application with prompts. The // user can veto the close, and therefore the end session. -void wxApp::OnQueryEndSession(wxCloseEvent& event) +// +void wxApp::OnQueryEndSession( + wxCloseEvent& rEvent +) { if (GetTopWindow()) { - if (!GetTopWindow()->Close(!event.CanVeto())) - event.Veto(TRUE); - } -} - -int wxApp::GetComCtl32Version() const -{ - // TODO: Does OS/2 even need this method? - /* - // have we loaded COMCTL32 yet? - HMODULE theModule = ::GetModuleHandle(wxT("COMCTL32")); - int version = 0; - - // if so, then we can check for the version - if (theModule) - { - // InitCommonControlsEx is unique to 4.7 and later - FARPROC theProc = ::GetProcAddress(theModule, "InitCommonControlsEx"); - - if (! theProc) - { // not found, must be 4.00 - version = 400; - } - else - { - // The following symbol are unique to 4.71 - // DllInstall - // FlatSB_EnableScrollBar FlatSB_GetScrollInfo FlatSB_GetScrollPos - // FlatSB_GetScrollProp FlatSB_GetScrollRange FlatSB_SetScrollInfo - // FlatSB_SetScrollPos FlatSB_SetScrollProp FlatSB_SetScrollRange - // FlatSB_ShowScrollBar - // _DrawIndirectImageList _DuplicateImageList - // InitializeFlatSB - // UninitializeFlatSB - // we could check for any of these - I chose DllInstall - FARPROC theProc = ::GetProcAddress(theModule, "DllInstall"); - if (! theProc) - { - // not found, must be 4.70 - version = 470; - } - else - { // found, must be 4.71 - version = 471; - } - } + if (!GetTopWindow()->Close(!rEvent.CanVeto())) + rEvent.Veto(TRUE); } - return version; -*/ - return 0; -} +} // end of wxApp::OnQueryEndSession void wxExit() { wxLogError(_("Fatal error: exiting")); wxApp::CleanUp(); -} +} // end of wxExit +// // Yield to incoming messages -bool wxYield() +// +bool wxApp::Yield(bool onlyIfNeeded) { - HAB vHab; + static bool s_inYield = FALSE; + + if ( s_inYield ) + { + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( _T("wxYield() called recursively") ); + } + + return FALSE; + } + + 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(); + + s_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(); + s_inYield = FALSE; return TRUE; -} +} // end of wxYield -wxIcon wxApp::GetStdIcon(int which) const +wxIcon wxApp::GetStdIcon( + int nWhich +) const { - // TODO: - /* - switch(which) + switch(nWhich) { case wxICON_INFORMATION: return wxIcon("wxICON_INFO"); @@ -1085,19 +1193,92 @@ wxIcon wxApp::GetStdIcon(int which) const case wxICON_HAND: 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) { - return wxhInstance; + 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; + } } -void wxSetInstance(HINSTANCE hInst) +//----------------------------------------------------------------------------- +// wxWakeUpIdle +//----------------------------------------------------------------------------- + +void wxWakeUpIdle() { - wxhInstance = hInst; + // + // 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 vHabmain; } +void wxSetInstance( + HAB vHab +) +{ + vHabmain = vHab; +}