/////////////////////////////////////////////////////////////////////////////
-// Name: app.cpp
+// Name: src/motif/app.cpp
// Purpose: wxApp
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "app.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/app.h"
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
+#ifndef WX_PRECOMP
+ #include "wx/hash.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/memory.h"
+ #include "wx/font.h"
#endif
-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/module.h"
-#include "wx/memory.h"
-#include "wx/log.h"
-#include "wx/intl.h"
#include "wx/evtloop.h"
-#include "wx/hash.h"
-#include "wx/hashmap.h"
#if wxUSE_THREADS
#include "wx/thread.h"
#endif
#ifdef __VMS__
-#pragma message disable nosimpint
+ #pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include <X11/Xatom.h>
#ifdef __VMS__
-#pragma message enable nosimpint
+ #pragma message enable nosimpint
#endif
#include "wx/motif/private.h"
struct wxPerDisplayData
{
wxPerDisplayData()
- { m_visualInfo = NULL; m_topLevelWidget = NULL; }
+ {
+ m_visualInfo = NULL;
+ m_topLevelWidget = NULL;
+ m_topLevelRealizedWidget = NULL;
+ }
wxXVisualInfo* m_visualInfo;
- Widget m_topLevelWidget;
+ Widget m_topLevelWidget, m_topLevelRealizedWidget;
};
-WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData, wxPerDisplayDataMap );
-
static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData,
XtPointer ptr);
static WXWidget wxCreateTopLevelWidget( WXDisplay* display );
-extern wxList wxPendingDelete;
extern bool wxAddIdleCallback();
wxHashTable *wxWidgetHashTable = NULL;
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
- EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
-
#ifdef __WXDEBUG__
+extern "C"
+{
typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
+}
- XErrorHandlerFunc gs_pfnXErrorHandler = 0;
+XErrorHandlerFunc gs_pfnXErrorHandler = 0;
- static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
- {
- // just forward to the default handler for now
- return gs_pfnXErrorHandler(dpy, xevent);
- }
-#endif // __WXDEBUG__
-
-bool wxApp::Initialize(int argc, wxChar **argv)
+extern "C"
{
- if ( !wxAppBase::Initialize(argc, argv) )
- return false;
- wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-
- return true;
-}
-
-void wxApp::CleanUp()
+static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
{
- delete wxWidgetHashTable;
- wxWidgetHashTable = NULL;
-
- wxAppBase::CleanUp();
+ // just forward to the default handler for now
+ return gs_pfnXErrorHandler(dpy, xevent);
}
-void wxApp::Exit()
-{
- wxApp::CleanUp();
-
- wxAppConsole::Exit();
}
+#endif // __WXDEBUG__
-// ============================================================================
-// wxEntry*
-// ============================================================================
-
-int wxEntryStart( int argc, char* argv[] )
+bool wxApp::Initialize(int& argc_, wxChar **argv_)
{
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
- // This seems to be necessary since there are 'rogue'
- // objects present at this point (perhaps global objects?)
- // Setting a checkpoint will ignore them as far as the
- // memory checking facility is concerned.
- // Of course you may argue that memory allocated in globals should be
- // checked, but this is a reasonable compromise.
- wxDebugContext::SetCheckpoint();
+#if wxUSE_INTL
+ wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
#endif
- if (!wxApp::Initialize())
- return -1;
+ if ( !wxAppBase::Initialize(argc_, argv_) )
+ return false;
- return 0;
-}
+ wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-int wxEntryInitGui()
-{
- int retValue = 0;
+#ifdef __HPUX__
+ // under HP-UX creating XmFontSet fails when the system locale is C and
+ // we're using a remote DISPLAY, presumably because HP-UX uses its own
+ // names for C and ISO locales (roman8 and iso8859n respectively) and so
+ // its Motif libraries have troubles with non-HP X server
+ //
+ // whatever the reason, the fact is that without this hack any wxMotif
+ // program crashes on startup because it can't create any font (HP programs
+ // still work but they do spit out messages about failing to create font
+ // sets and failing back on "fixed" font too)
+ //
+ // notice that calling setlocale() here is not enough because X(m) init
+ // functions call setlocale() later so we really have to change environment
+ bool fixAll = false; // tweak LC_ALL (or just LC_CTYPE)?
+ const char *loc = getenv("LC_CTYPE");
+ if ( !loc )
+ {
+ loc = getenv("LC_ALL");
+ if ( loc )
+ fixAll = true;
+ }
- // GUI-specific initialization, such as creating an app context.
- if (!wxTheApp->OnInitGui())
- retValue = -1;
+ if ( !loc ||
+ (loc[0] == 'C' && loc[1] == '\0') ||
+ strcmp(loc, "POSIX") == 0 )
+ {
+ // we're using C locale, "fix" it
+ wxLogDebug(_T("HP-UX fontset hack: forcing locale to en_US.iso88591"));
+ putenv(fixAll ? "LC_ALL=en_US.iso88591" : "LC_CTYPE=en_US.iso88591");
+ }
+#endif // __HPUX__
- return retValue;
-}
+ XtSetLanguageProc(NULL, NULL, NULL);
+ XtToolkitInitialize() ;
+ wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext();
-void wxEntryCleanup()
-{
- // So dialog boxes aren't used for further messages
- delete wxLog::SetActiveTarget(new wxLogStderr);
+ static char *fallbackResources[] = {
+ // better defaults for CDE under Irix
+ //
+ // TODO: do something similar for the other systems, the hardcoded defaults
+ // below are ugly
+#ifdef __SGI__
+ wxMOTIF_STR("*sgiMode: True"),
+ wxMOTIF_STR("*useSchemes: all"),
+#else // !__SGI__
+#if !wxMOTIF_USE_RENDER_TABLE
+ wxMOTIF_STR("*.fontList: -*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"),
+#else
+ wxMOTIF_STR("*wxDefaultRendition.fontName: -*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"),
+ wxMOTIF_STR("*wxDefaultRendition.fontType: FONT_IS_FONTSET"),
+ wxMOTIF_STR("*.renderTable: wxDefaultRendition"),
+#endif
+ wxMOTIF_STR("*listBox.background: white"),
+ wxMOTIF_STR("*text.background: white"),
+ wxMOTIF_STR("*comboBox.Text.background: white"),
+ wxMOTIF_STR("*comboBox.List.background: white"),
+#endif // __SGI__/!__SGI__
+ NULL
+ };
+ XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources);
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
+ // we shouldn't pass empty application/class name as it results in
+ // immediate crash inside XOpenIM() (if XIM is used) under IRIX
+ wxString appname = wxTheApp->GetAppName();
+ if ( appname.empty() )
+ appname = _T("wxapp");
+ wxString clsname = wxTheApp->GetClassName();
+ if ( clsname.empty() )
+ clsname = _T("wx");
+
+ // FIXME-UTF8: This code is taken from wxGTK and duplicated here. This
+ // is just a temporary fix to make wxX11 compile in Unicode
+ // build, the real fix is to change Initialize()'s signature
+ // to use char* on Unix.
+#if wxUSE_UNICODE
+ // XtOpenDisplay() wants char*, not wchar_t*, so convert
+ int i;
+ char **argvX11 = new char *[argc + 1];
+ for ( i = 0; i < argc; i++ )
+ {
+ argvX11[i] = strdup(wxConvLibc.cWX2MB(argv_[i]));
+ }
- wxApp::CleanUp();
-}
+ argvX11[argc] = NULL;
-int wxEntry( int argc, char *argv[] )
-{
- int retValue = 0;
+ int argcX11 = argc;
- retValue = wxEntryStart( argc, argv );
- if (retValue) return retValue;
+ Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,
+ (String)NULL,
+ appname.c_str(),
+ clsname.c_str(),
+ NULL, 0, // no options
+# if XtSpecificationRelease < 5
+ (Cardinal*) &argcX11,
+# else
+ &argcX11,
+# endif
+ argvX11);
- if (!wxTheApp)
+ if ( argcX11 != argc )
{
- if (!wxApp::GetInitializerFunction())
+ // we have to drop the parameters which were consumed by X11+
+ for ( i = 0; i < argcX11; i++ )
{
- printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
- return 0;
- };
+ while ( strcmp(wxConvLibc.cWX2MB(argv_[i]), argvX11[i]) != 0 )
+ {
+ memmove(argv_ + i, argv_ + i + 1, (argc - i)*sizeof(*argv_));
+ }
+ }
- wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
- };
+ argc = argcX11;
+
+ // update internal arg[cv] as X11 may have removed processed options:
+ argc = argc_;
+ argv = argv_;
+ }
+ //else: XtOpenDisplay() didn't modify our parameters
- if (!wxTheApp)
+ // free our copy
+ for ( i = 0; i < argcX11; i++ )
{
- printf( "wxWindows error: wxTheApp == NULL\n" );
- return 0;
- };
+ free(argvX11[i]);
+ }
- wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
- wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
+ delete [] argvX11;
- wxTheApp->argc = argc;
- wxTheApp->argv = argv;
+#else // ANSI
- // GUI-specific initialization, such as creating an app context.
- retValue = wxEntryInitGui();
- if (retValue) return retValue;
+ Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,
+ (String)NULL,
+ appname.c_str(),
+ clsname.c_str(),
+ NULL, 0, // no options
+# if XtSpecificationRelease < 5
+ (Cardinal*) &argc,
+# else
+ &argc,
+# endif
+ argv);
- // Here frames insert themselves automatically into wxTopLevelWindows by
- // getting created in OnInit().
+#endif // Unicode/ANSI
- if (wxTheApp->OnInit())
- {
- if (wxTheApp->Initialized())
- wxTheApp->OnRun();
+ if (!dpy) {
+ // if you don't log to stderr, nothing will be shown...
+ delete wxLog::SetActiveTarget(new wxLogStderr);
+ wxString className(wxTheApp->GetClassName());
+ wxLogError(_("wxWidgets could not open display for '%s': exiting."),
+ className.c_str());
+ exit(-1);
}
+ m_initialDisplay = (WXDisplay*) dpy;
- if (wxTheApp->GetTopWindow())
- {
- delete wxTheApp->GetTopWindow();
- wxTheApp->SetTopWindow(NULL);
- }
+#ifdef __WXDEBUG__
+ // install the X error handler
+ gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
+#endif // __WXDEBUG__
- wxTheApp->DeletePendingObjects();
+ // Add general resize proc
+ XtActionsRec rec;
+ rec.string = wxMOTIF_STR("resize");
+ rec.proc = (XtActionProc)wxWidgetResizeProc;
+ XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);
- retValue = wxTheApp->OnExit();
+ GetMainColormap(dpy);
- wxEntryCleanup();
+ wxAddIdleCallback();
- return retValue;
+ return true;
}
-wxApp::wxApp()
+void wxApp::CleanUp()
{
- argc = 0;
- argv = NULL;
+ wxAppBase::CleanUp();
- m_eventLoop = new wxEventLoop;
- m_mainColormap = (WXColormap) NULL;
- m_appContext = (WXAppContext) NULL;
- m_initialDisplay = (WXDisplay*) 0;
- m_perDisplayData = new wxPerDisplayDataMap;
-}
+ delete wxWidgetHashTable;
+ wxWidgetHashTable = NULL;
-wxApp::~wxApp()
-{
- delete m_eventLoop;
+ delete m_mainLoop;
for( wxPerDisplayDataMap::iterator it = m_perDisplayData->begin(),
end = m_perDisplayData->end();
it != end; ++it )
{
- delete it->second.m_visualInfo;
- XtDestroyWidget( it->second.m_topLevelWidget );
+ delete it->second->m_visualInfo;
+ // On Solaris 10 calling XtDestroyWidget on the top level widget
+ // dumps core if the locale is set to something other than "C"
+#ifndef __SUN__
+ XtDestroyWidget( it->second->m_topLevelWidget );
+#endif
+ delete it->second;
}
+}
- delete m_perDisplayData;
+void wxApp::Exit()
+{
+ wxApp::CleanUp();
+
+ wxAppConsole::Exit();
+}
+
+// ============================================================================
+// wxApp
+// ============================================================================
- wxTheApp = NULL;
+wxApp::wxApp()
+{
+ m_mainLoop = new wxEventLoop;
+ m_mainColormap = (WXColormap) NULL;
+ m_appContext = (WXAppContext) NULL;
+ m_initialDisplay = (WXDisplay*) 0;
+ m_perDisplayData = new wxPerDisplayDataMap;
}
-bool wxApp::Initialized()
+wxApp::~wxApp()
{
- if (GetTopWindow())
- return TRUE;
- else
- return FALSE;
+ delete m_perDisplayData;
}
int wxApp::MainLoop()
XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
PropertyChangeMask);
- m_eventLoop->Run();
+ m_mainLoop->Run();
return 0;
}
-// Processes an idle event.
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
- wxIdleEvent event;
-
- return ProcessEvent(event) && event.MoreRequested();
-}
-
-void wxApp::ExitMainLoop()
-{
- if( m_eventLoop->IsRunning() )
- m_eventLoop->Exit();
-}
-
-// Is a message/event pending?
-bool wxApp::Pending()
-{
- return m_eventLoop->Pending();
-#if 0
- XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));
-
- // Fix by Doug from STI, to prevent a stall if non-X event
- // is found.
- return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ;
-#endif
-}
-
-// Dispatch a message.
-void wxApp::Dispatch()
-{
- m_eventLoop->Dispatch();
-}
-
// This should be redefined in a derived class for
// handling property change events for XAtom IPC.
void wxApp::HandlePropertyChange(WXEvent *event)
XtDispatchEvent((XEvent*) event); /* let Motif do the work */
}
-void wxApp::OnIdle(wxIdleEvent& event)
-{
- static bool inOnIdle = FALSE;
-
- // Avoid recursion (via ProcessEvent default case)
- if (inOnIdle)
- return;
-
- inOnIdle = 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
- // GRG: I have moved this here so that all pending events are processed
- // before starting to delete any objects. This behaves better (in
- // particular, wrt wxPostEvent) and is coherent with wxGTK's current
- // behaviour. Also removed the '#if wxUSE_THREADS' around it.
- // Changed Mar/2000 before 2.1.14
-
- // Flush pending events.
- ProcessPendingEvents();
-
- // 'Garbage' collection of windows deleted with Close().
- DeletePendingObjects();
-
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
-
- // Send OnIdle events to all windows
- bool needMore = SendIdleEvents();
-
- if (needMore)
- event.RequestMore(TRUE);
-
- inOnIdle = FALSE;
-}
-
-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
-{
- bool needMore = FALSE;
-
- wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
- node = node->GetNext();
- }
-
- return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
- bool needMore = FALSE;
-
- wxIdleEvent event;
- event.SetEventObject(win);
- win->GetEventHandler()->ProcessEvent(event);
-
- if (event.MoreRequested())
- needMore = TRUE;
-
- wxWindowList::Node* node = win->GetChildren().GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
-
- node = node->GetNext();
- }
- return needMore ;
-}
-
-static char *fallbackResources[] = {
- "*menuBar.marginHeight: 0",
- "*menuBar.shadowThickness: 1",
- "*background: #c0c0c0",
- "*foreground: black",
- NULL
-};
-
-// Create an application context
-bool wxApp::OnInitGui()
-{
- if( !wxAppBase::OnInitGui() )
- return FALSE;
-
- XtToolkitInitialize() ;
- wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext();
- XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources);
-
- Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
- wxTheApp->GetClassName().c_str(), NULL, 0,
-# if XtSpecificationRelease < 5
- (Cardinal*) &argc,
-# else
- &argc,
-# endif
- argv);
-
- if (!dpy) {
- // if you don't log to stderr, nothing will be shown...
- delete wxLog::SetActiveTarget(new wxLogStderr);
- wxString className(wxTheApp->GetClassName());
- wxLogError(_("wxWindows could not open display for '%s': exiting."),
- className.c_str());
- exit(-1);
- }
- m_initialDisplay = (WXDisplay*) dpy;
-
-#ifdef __WXDEBUG__
- // install the X error handler
- gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
-#endif // __WXDEBUG__
-
- // Add general resize proc
- XtActionsRec rec;
- rec.string = "resize";
- rec.proc = (XtActionProc)wxWidgetResizeProc;
- XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);
-
- GetMainColormap(dpy);
-
- wxAddIdleCallback();
-
- return TRUE;
-}
-
WXColormap wxApp::GetMainColormap(WXDisplay* display)
{
if (!display) /* Must be called first with non-NULL display */
return (WXColormap) c;
}
-wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display )
+static inline wxPerDisplayData& GetOrCreatePerDisplayData
+ ( wxPerDisplayDataMap& m, WXDisplay* display )
{
- wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display );
+ wxPerDisplayDataMap::iterator it = m.find( display );
+ if( it != m.end() && it->second != NULL )
+ return *(it->second);
+
+ wxPerDisplayData* nData = new wxPerDisplayData();
+ m[display] = nData;
+
+ return *nData;
+}
- if( it != m_perDisplayData->end() && it->second.m_visualInfo )
- return it->second.m_visualInfo;
+wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display )
+{
+ wxPerDisplayData& data = GetOrCreatePerDisplayData( *m_perDisplayData,
+ display );
+ if( data.m_visualInfo )
+ return data.m_visualInfo;
wxXVisualInfo* vi = new wxXVisualInfo;
wxFillXVisualInfo( vi, (Display*)display );
- (*m_perDisplayData)[display].m_visualInfo = vi;
+ data.m_visualInfo = vi;
return vi;
}
-static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData,
- XtPointer ptr)
+static void wxTLWidgetDestroyCallback(Widget w, XtPointer WXUNUSED(clientData),
+ XtPointer WXUNUSED(ptr))
{
if( wxTheApp )
+ {
wxTheApp->SetTopLevelWidget( (WXDisplay*)XtDisplay(w),
(WXWidget)NULL );
+ wxTheApp->SetTopLevelRealizedWidget( (WXDisplay*)XtDisplay(w),
+ (WXWidget)NULL );
+ }
}
WXWidget wxCreateTopLevelWidget( WXDisplay* display )
applicationShellWidgetClass,
(Display*)display,
NULL, 0 );
- XtSetMappedWhenManaged( tlw, False );
- XtRealizeWidget( tlw );
+ XtVaSetValues( tlw,
+ XmNoverrideRedirect, True,
+ NULL );
XtAddCallback( tlw, XmNdestroyCallback,
(XtCallbackProc)wxTLWidgetDestroyCallback,
return (WXWidget)tlw;
}
+WXWidget wxCreateTopLevelRealizedWidget( WXDisplay* WXUNUSED(display) )
+{
+ Widget rTlw = XtVaCreateWidget( "dummy_widget", topLevelShellWidgetClass,
+ (Widget)wxTheApp->GetTopLevelWidget(),
+ NULL );
+ XtSetMappedWhenManaged( rTlw, False );
+ XtRealizeWidget( rTlw );
+
+ return (WXWidget)rTlw;
+}
+
WXWidget wxApp::GetTopLevelWidget()
{
WXDisplay* display = wxGetDisplay();
- wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display );
-
- if( it != m_perDisplayData->end() && it->second.m_topLevelWidget )
- return (WXWidget)it->second.m_topLevelWidget;
+ wxPerDisplayData& data = GetOrCreatePerDisplayData( *m_perDisplayData,
+ display );
+ if( data.m_topLevelWidget )
+ return (WXWidget)data.m_topLevelWidget;
WXWidget tlw = wxCreateTopLevelWidget( display );
SetTopLevelWidget( display, tlw );
return tlw;
}
+WXWidget wxApp::GetTopLevelRealizedWidget()
+{
+ WXDisplay* display = wxGetDisplay();
+ wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display );
+
+ if( it != m_perDisplayData->end() && it->second->m_topLevelRealizedWidget )
+ return (WXWidget)it->second->m_topLevelRealizedWidget;
+
+ WXWidget rTlw = wxCreateTopLevelRealizedWidget( display );
+ SetTopLevelRealizedWidget( display, rTlw );
+
+ return rTlw;
+}
+
void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget)
{
- (*m_perDisplayData)[display].m_topLevelWidget = (Widget)widget;
+ GetOrCreatePerDisplayData( *m_perDisplayData, display )
+ .m_topLevelWidget = (Widget)widget;
+}
+
+void wxApp::SetTopLevelRealizedWidget(WXDisplay* display, WXWidget widget)
+{
+ GetOrCreatePerDisplayData( *m_perDisplayData, display )
+ .m_topLevelRealizedWidget = (Widget)widget;
}
// Yield to other processes
-bool wxApp::Yield(bool onlyIfNeeded)
+bool wxApp::DoYield(bool onlyIfNeeded, long eventsToProcess)
{
- bool s_inYield = FALSE;
-
- if ( s_inYield )
+ if ( m_isInsideYield )
{
if ( !onlyIfNeeded )
{
wxFAIL_MSG( wxT("wxYield called recursively" ) );
}
- return FALSE;
+ return false;
}
- s_inYield = TRUE;
+ m_isInsideYield = true;
+ m_eventsToProcessInsideYield = eventsToProcess;
+ wxEventLoopGuarantor dummyLoopIfNeeded;
while (wxTheApp && wxTheApp->Pending())
+ // TODO: implement event filtering using the eventsToProcess mask
wxTheApp->Dispatch();
- s_inYield = FALSE;
+ m_isInsideYield = false;
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff