// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "app.h"
#endif
-#include "wx/frame.h"
+#ifdef __VMS
+#define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
+#endif
+
#include "wx/app.h"
#include "wx/utils.h"
-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"
-#include "wx/icon.h"
-#include "wx/palette.h"
-#include "wx/dc.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"
-#include "wx/log.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
-#if wxUSE_WX_RESOURCES
- #include "wx/resource.h"
-#endif
-
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <string.h>
-extern char *wxBuffer;
-extern wxList wxPendingDelete;
+struct wxPerDisplayData
+{
+ wxPerDisplayData()
+ { m_visualInfo = NULL; m_topLevelWidget = NULL; }
-wxApp *wxTheApp = NULL;
+ wxXVisualInfo* m_visualInfo;
+ Widget m_topLevelWidget;
+};
+
+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)
+ EVT_IDLE(wxAppBase::OnIdle)
END_EVENT_TABLE()
#ifdef __WXDEBUG__
}
#endif // __WXDEBUG__
-long wxApp::sm_lastMessageTime = 0;
-
-bool wxApp::Initialize()
+bool wxApp::Initialize(int& argc, wxChar **argv)
{
- wxBuffer = new char[BUFSIZ + 512];
-
- wxClassInfo::InitializeClasses();
-
- // 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
- wxPendingEventsLocker = new wxCriticalSection();
-#endif
-
- wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
- wxTheColourDatabase->Initialize();
-
- wxInitializeStockLists();
- wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
- wxInitializeResourceSystem();
-#endif
-
- // For PostScript printing
-#if wxUSE_POSTSCRIPT
- /* Done using wxModule now
- wxInitializePrintSetupData();
- wxThePrintPaperDatabase = new wxPrintPaperDatabase;
- wxThePrintPaperDatabase->CreateDatabase();
- */
-#endif
-
- wxBitmap::InitStandardHandlers();
+ if ( !wxAppBase::Initialize(argc, argv) )
+ return false;
wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
- wxModule::RegisterModules();
- if (!wxModule::InitializeModules()) return FALSE;
-
- return TRUE;
+ return true;
}
void wxApp::CleanUp()
delete wxWidgetHashTable;
wxWidgetHashTable = NULL;
- wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
- wxCleanUpResourceSystem();
-#endif
-
- wxDeleteStockObjects() ;
-
- // Destroy all GDI lists, etc.
-
- delete wxTheBrushList;
- wxTheBrushList = NULL;
-
- delete wxThePenList;
- wxThePenList = NULL;
-
- delete wxTheFontList;
- wxTheFontList = NULL;
-
- delete wxTheBitmapList;
- wxTheBitmapList = NULL;
-
- delete wxTheColourDatabase;
- wxTheColourDatabase = NULL;
-
-#if wxUSE_POSTSCRIPT
- /* Done using wxModule now
- wxInitializePrintSetupData(FALSE);
- delete wxThePrintPaperDatabase;
- wxThePrintPaperDatabase = NULL;
- */
-#endif
-
- wxBitmap::CleanUpHandlers();
-
- delete[] wxBuffer;
- wxBuffer = NULL;
-
- wxClassInfo::CleanUpClasses();
-
- delete wxTheApp;
- wxTheApp = NULL;
-
- // 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;
- delete wxPendingEventsLocker;
-#endif
-
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
- // At this point we want to check if there are any memory
- // blocks that aren't part of the wxDebugContext itself,
- // as a special case. Then when dumping we need to ignore
- // wxDebugContext, too.
- if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
- {
- wxLogDebug("There were memory leaks.\n");
- wxDebugContext::Dump();
- wxDebugContext::PrintStatistics();
- }
-#endif
-
- // do it as the very last thing because everything else can log messages
- wxLog::DontCreateOnDemand();
- // do it as the very last thing because everything else can log messages
- delete wxLog::SetActiveTarget(NULL);
+ wxAppBase::CleanUp();
}
-int wxEntry( int argc, char *argv[] )
+void wxApp::Exit()
{
-#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();
-#endif
-
- if (!wxApp::Initialize())
- return FALSE;
-
- if (!wxTheApp)
- {
- if (!wxApp::GetInitializerFunction())
- {
- printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
- return 0;
- };
-
- wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
- };
-
- if (!wxTheApp)
- {
- printf( "wxWindows error: wxTheApp == NULL\n" );
- return 0;
- };
-
- wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
- wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
-
- wxTheApp->argc = argc;
- wxTheApp->argv = argv;
-
- // GUI-specific initialization, such as creating an app context.
- wxTheApp->OnInitGui();
-
- // Here frames insert themselves automatically into wxTopLevelWindows by
- // getting created in OnInit().
-
- int retValue = 0;
- if (wxTheApp->OnInit())
- {
- if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
- }
-
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
-
- delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
- // for further messages
-
- if (wxTheApp->GetTopWindow())
- {
- delete wxTheApp->GetTopWindow();
- wxTheApp->SetTopWindow(NULL);
- }
-
- wxTheApp->DeletePendingObjects();
-
- wxTheApp->OnExit();
-
wxApp::CleanUp();
- return retValue;
-};
+ wxAppConsole::Exit();
+}
-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+// ============================================================================
+// wxApp
+// ============================================================================
wxApp::wxApp()
{
- m_topWindow = NULL;
- wxTheApp = this;
- m_className = "";
- m_wantDebugOutput = TRUE ;
- m_appName = "";
argc = 0;
argv = NULL;
- m_exitOnFrameDelete = TRUE;
+ m_mainLoop = new wxEventLoop;
m_mainColormap = (WXColormap) NULL;
m_appContext = (WXAppContext) NULL;
- m_topLevelWidget = (WXWidget) NULL;
- m_maxRequestSize = 0;
m_initialDisplay = (WXDisplay*) 0;
+ m_perDisplayData = new wxPerDisplayDataMap;
}
-bool wxApp::Initialized()
+wxApp::~wxApp()
{
- if (GetTopWindow())
- return TRUE;
- else
- return FALSE;
+ 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 m_perDisplayData;
+
+ wxApp::SetInstance(NULL);
}
int wxApp::MainLoop()
{
- m_keepGoing = TRUE;
-
/*
* Sit around forever waiting to process X-events. Property Change
* event are handled special, because they have to refer to
XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
PropertyChangeMask);
- XEvent event;
-
- // Use this flag to allow breaking the loop via wxApp::ExitMainLoop()
- while (m_keepGoing)
- {
- XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &event);
-
- ProcessXEvent((WXEvent*) & event);
-
- if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)
- {
- if (!ProcessIdle())
- {
-#if wxUSE_THREADS
- // leave the main loop to give other threads a chance to
- // perform their GUI work
- wxMutexGuiLeave();
- wxUsleep(20);
- wxMutexGuiEnter();
-#endif
- }
- }
-
- }
+ m_mainLoop->Run();
return 0;
}
-// Processes an X event.
-void wxApp::ProcessXEvent(WXEvent* _event)
-{
- XEvent* event = (XEvent*) _event;
-
- if (event->type == KeyPress)
- {
-#if 0 // def __WXDEBUG__
- Widget widget = XtWindowToWidget(event->xany.display, event->xany.window);
- wxLogDebug("Got key press event for 0x%08x (parent = 0x%08x)",
- widget, XtParent(widget));
-#endif // DEBUG
-
- if (CheckForAccelerator(_event))
- {
- // Do nothing! We intercepted and processed the event as an
- // accelerator.
- return;
- }
-#if 1
- // It seemed before that this hack was redundant and
- // key down events were being generated by wxCanvasInputEvent.
- // But no longer - why ???
- //
- else if (CheckForKeyDown(_event))
- {
- // We intercepted and processed the key down event
- return;
- }
-#endif
- else
- {
- XtDispatchEvent(event);
- return;
- }
- }
- else if (event->type == KeyRelease)
- {
- // TODO: work out why we still need this ! -michael
- //
- if (CheckForKeyUp(_event))
- {
- // We intercepted and processed the key up event
- return;
- }
- else
- {
- XtDispatchEvent(event);
- return;
- }
- }
- else if (event->type == PropertyNotify)
- {
- HandlePropertyChange(_event);
- return;
- }
- else if (event->type == ResizeRequest)
- {
- /* Terry Gitnick <terryg@scientech.com> - 1/21/98
- * If resize event, don't resize until the last resize event for this
- * window is recieved. Prevents flicker as windows are resized.
- */
-
- Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget());
- Window win = event->xany.window;
- XEvent report;
-
- // to avoid flicker
- report = * event;
- while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report));
-
- // TODO: when implementing refresh optimization, we can use
- // XtAddExposureToRegion to expand the window's paint region.
-
- XtDispatchEvent(event);
- }
- else
- {
- XtDispatchEvent(event);
- }
-}
-
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
- wxIdleEvent event;
- event.SetEventObject(this);
- ProcessEvent(event);
-
- return event.MoreRequested();
-}
-
-void wxApp::ExitMainLoop()
-{
- m_keepGoing = FALSE;
-}
-
-// Is a message/event pending?
-bool wxApp::Pending()
-{
- 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) ;
-}
-
-// Dispatch a message.
-void wxApp::Dispatch()
-{
- // XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
-
- XEvent event;
- XtAppNextEvent((XtAppContext) GetAppContext(), &event);
- ProcessXEvent((WXEvent*) & event);
-}
-
// 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;
-}
-
-void wxWakeUpIdle()
-{
- // **** please implement me! ****
- // Wake up the idle handler processor, even if it is in another thread...
-}
-
-
-// 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->ProcessEvent(event);
-
- if (event.MoreRequested())
- needMore = TRUE;
-
- wxNode* node = win->GetChildren().First();
- while (node)
- {
- wxWindow* win = (wxWindow*) node->Data();
- if (SendIdleEvents(win))
- needMore = TRUE;
-
- node = node->Next();
- }
- return needMore ;
-}
-
-void wxApp::DeletePendingObjects()
-{
- wxNode *node = wxPendingDelete.First();
- while (node)
- {
- wxObject *obj = (wxObject *)node->Data();
-
- delete obj;
-
- if (wxPendingDelete.Member(obj))
- delete node;
-
- // Deleting one object may have deleted other pending
- // objects, so start from beginning of list again.
- node = wxPendingDelete.First();
- }
-}
+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() ;
+ wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext();
+ XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources);
+
Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
- (const char*) wxTheApp->GetClassName(), NULL, 0,
+ wxTheApp->GetClassName().c_str(), NULL, 0,
# if XtSpecificationRelease < 5
(Cardinal*) &argc,
# else
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."),
- (const char*) className);
+ className.c_str());
exit(-1);
}
m_initialDisplay = (WXDisplay*) dpy;
gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
#endif // __WXDEBUG__
- wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
- applicationShellWidgetClass,dpy,
- NULL,0) ;
-
// Add general resize proc
XtActionsRec rec;
rec.string = "resize";
XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);
GetMainColormap(dpy);
- m_maxRequestSize = XMaxRequestSize((Display*) dpy);
+
+ wxAddIdleCallback();
return TRUE;
}
return (WXColormap) c;
}
-// Returns TRUE if an accelerator has been processed
-bool wxApp::CheckForAccelerator(WXEvent* event)
+wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display )
{
- XEvent* xEvent = (XEvent*) event;
- if (xEvent->xany.type == KeyPress)
- {
- // Find a wxWindow for this window
- // TODO: should get display for the window, not the current display
- Widget widget = XtWindowToWidget((Display*) wxGetDisplay(), xEvent->xany.window);
- wxWindow* win = NULL;
+ wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display );
- // Find the first wxWindow that corresponds to this event window
- while (widget && !(win = wxGetWindowFromTable(widget)))
- widget = XtParent(widget);
+ if( it != m_perDisplayData->end() && it->second.m_visualInfo )
+ return it->second.m_visualInfo;
- if (!widget || !win)
- return FALSE;
+ wxXVisualInfo* vi = new wxXVisualInfo;
+ wxFillXVisualInfo( vi, (Display*)display );
- wxKeyEvent keyEvent(wxEVT_CHAR);
- wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+ (*m_perDisplayData)[display].m_visualInfo = vi;
- // Now we have a wxKeyEvent and we have a wxWindow.
- // Go up the hierarchy until we find a matching accelerator,
- // or we get to the top.
- while (win)
- {
- if (win->ProcessAccelerator(keyEvent))
- return TRUE;
- win = win->GetParent();
- }
- return FALSE;
- }
- return FALSE;
+ return vi;
}
-bool wxApp::CheckForKeyDown(WXEvent* event)
+static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData,
+ XtPointer ptr)
{
- XEvent* xEvent = (XEvent*) event;
- if (xEvent->xany.type == KeyPress)
- {
- Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
- xEvent->xany.window);
- wxWindow* win = NULL;
-
- // Find the first wxWindow that corresponds to this event window
- while (widget && !(win = wxGetWindowFromTable(widget)))
- widget = XtParent(widget);
-
- if (!widget || !win)
- return FALSE;
-
- wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
- wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
-
- return win->ProcessEvent( keyEvent );
- }
-
- return FALSE;
+ if( wxTheApp )
+ wxTheApp->SetTopLevelWidget( (WXDisplay*)XtDisplay(w),
+ (WXWidget)NULL );
}
-bool wxApp::CheckForKeyUp(WXEvent* event)
+WXWidget wxCreateTopLevelWidget( WXDisplay* display )
{
- XEvent* xEvent = (XEvent*) event;
- if (xEvent->xany.type == KeyRelease)
- {
- Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
- xEvent->xany.window);
- wxWindow* win = NULL;
-
- // Find the first wxWindow that corresponds to this event window
- while (widget && !(win = wxGetWindowFromTable(widget)))
- widget = XtParent(widget);
+ Widget tlw = XtAppCreateShell( (String)NULL,
+ wxTheApp->GetClassName().c_str(),
+ applicationShellWidgetClass,
+ (Display*)display,
+ NULL, 0 );
+ XtSetMappedWhenManaged( tlw, False );
+ XtRealizeWidget( tlw );
+
+ XtAddCallback( tlw, XmNdestroyCallback,
+ (XtCallbackProc)wxTLWidgetDestroyCallback,
+ (XtPointer)NULL );
+
+ return (WXWidget)tlw;
+}
- if (!widget || !win)
- return FALSE;
+WXWidget wxApp::GetTopLevelWidget()
+{
+ WXDisplay* display = wxGetDisplay();
+ wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display );
- wxKeyEvent keyEvent(wxEVT_KEY_UP);
- wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+ if( it != m_perDisplayData->end() && it->second.m_topLevelWidget )
+ return (WXWidget)it->second.m_topLevelWidget;
- return win->ProcessEvent( keyEvent );
- }
+ WXWidget tlw = wxCreateTopLevelWidget( display );
+ SetTopLevelWidget( display, tlw );
- return FALSE;
+ return tlw;
}
-void wxExit()
+void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget)
{
- int retValue = 0;
- if (wxTheApp)
- retValue = wxTheApp->OnExit();
-
- wxApp::CleanUp();
- /*
- * Exit in some platform-specific way. Not recommended that the app calls this:
- * only for emergencies.
- */
- exit(retValue);
+ (*m_perDisplayData)[display].m_topLevelWidget = (Widget)widget;
}
// Yield to other processes
-bool wxYield()
-{
- while (wxTheApp && wxTheApp->Pending())
- wxTheApp->Dispatch();
-
- // VZ: is it the same as this (taken from old wxExecute)?
-#if 0
- XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
-#endif
-
- return TRUE;
-}
-
-// TODO use XmGetPixmap (?) to get the really standard icons!
-#include "wx/generic/info.xpm"
-#include "wx/generic/error.xpm"
-#include "wx/generic/question.xpm"
-#include "wx/generic/warning.xpm"
-
-wxIcon
-wxApp::GetStdIcon(int which) const
+bool wxApp::Yield(bool onlyIfNeeded)
{
- switch(which)
+ static bool s_inYield = FALSE;
+
+ if ( s_inYield )
{
- case wxICON_INFORMATION:
- return wxIcon(info_xpm);
+ if ( !onlyIfNeeded )
+ {
+ wxFAIL_MSG( wxT("wxYield called recursively" ) );
+ }
- case wxICON_QUESTION:
- return wxIcon(question_xpm);
+ return FALSE;
+ }
+
+ s_inYield = TRUE;
- case wxICON_EXCLAMATION:
- return wxIcon(warning_xpm);
+ while (wxTheApp && wxTheApp->Pending())
+ wxTheApp->Dispatch();
- default:
- wxFAIL_MSG("requested non existent standard icon");
- // still fall through
+ s_inYield = FALSE;
- case wxICON_HAND:
- return wxIcon(error_xpm);
- }
+ return TRUE;
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff