wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
extern wxList wxPendingDelete;
+#if wxUSE_THREADS
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;
+#endif
extern wxResourceCache *wxTheResourceCache;
unsigned char g_palette[64*3] =
gtk_main_quit();
}
+// forward decl
+gint wxapp_idle_callback( gpointer WXUNUSED(data) );
+
bool wxYield()
{
// it's necessary to call ProcessIdle() to update the frames sizes which
// might have been changed (it also will update other things set from
// OnUpdateUI() which is a nice (and desired) side effect)
- for ( wxNode *node = wxTopLevelWindows.GetFirst();
+ for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
node;
node = node->GetNext() )
{
- wxWindow *win = ((wxWindow*)node->GetData());
+ wxWindow *win = node->GetData();
win->OnInternalIdle();
}
- while (gtk_events_pending() > 0)
+ // We need to temporarily remove idle callbacks or the loop will
+ // never finish.
+ gtk_idle_remove( wxTheApp->m_idleTag );
+
+ while (gtk_events_pending())
gtk_main_iteration();
+ wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
return TRUE;
}
use the same 64 colormap entries on 8-bit displays so you
can use several rather graphics-heavy applications at the
same time.
- NOTE: this doesn't really seem to work this way... */
+ NOTE: this doesn't really seem to work this way... */
/*
GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
for (int r = 0; r < 32; r++)
{
- for (int g = 0; g < 32; g++)
- {
- for (int b = 0; b < 32; b++)
- {
- int rr = (r << 3) | (r >> 2);
- int gg = (g << 3) | (g >> 2);
- int bb = (b << 3) | (b >> 2);
+ for (int g = 0; g < 32; g++)
+ {
+ for (int b = 0; b < 32; b++)
+ {
+ int rr = (r << 3) | (r >> 2);
+ int gg = (g << 3) | (g >> 2);
+ int bb = (b << 3) | (b >> 2);
GdkColor *colors = cmap->colors;
int max = 3 * (65536);
if (sum < max) { index = i; max = sum; }
}
- m_colorCube[ (r*1024) + (g*32) + b ] = index;
- }
- }
+ m_colorCube[ (r*1024) + (g*32) + b ] = index;
+ }
+ }
}
inOnIdle = TRUE;
+#if wxUSE_THREADS
+ /* Resend in the main thread events which have been prepared in other
+ threads */
+ ProcessPendingEvents();
+#endif
+
/* 'Garbage' collection of windows deleted with Close(). */
DeletePendingObjects();
{
bool needMore = FALSE;
- wxNode* node = wxTopLevelWindows.First();
+ wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* win = node->GetData();
if (SendIdleEvents(win))
needMore = TRUE;
- node = node->Next();
+ node = node->GetNext();
}
+
return needMore;
}
bool wxApp::Pending()
{
- return FALSE;
+ return gtk_events_pending();
}
void wxApp::Dispatch()
{
+ gtk_main_iteration();
}
+#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 // wxUSE_THREADS
+
void wxApp::DeletePendingObjects()
{
wxNode *node = wxPendingDelete.First();
wxWindow *wxApp::GetTopWindow()
{
- if (m_topWindow) return m_topWindow;
- wxNode *node = wxTopLevelWindows.First();
- if (!node) return (wxWindow *) NULL;
- return (wxWindow*)node->Data();
+ if (m_topWindow)
+ return m_topWindow;
+ else if (wxTopLevelWindows.GetCount() > 0)
+ return wxTopLevelWindows.GetFirst()->GetData();
+ else
+ return NULL;
}
void wxApp::SetTopWindow( wxWindow *win )
bool wxApp::Initialize()
{
- wxBuffer = new char[BUFSIZ + 512];
+ wxBuffer = new wxChar[BUFSIZ + 512];
wxClassInfo::InitializeClasses();
wxSystemSettings::Init();
+ // 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
+ wxPendingEvents = new wxList();
+ wxPendingEventsLocker = new wxCriticalSection();
+#endif
+
/*
wxTheFontNameDirectory = new wxFontNameDirectory;
wxTheFontNameDirectory->Initialize();
delete wxTheApp;
wxTheApp = (wxApp*) 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
+
wxSystemSettings::Done();
delete[] wxBuffer;
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
if (wxDebugContext::CountObjectsLeft() > 0)
{
- wxLogDebug("There were memory leaks.\n");
+ wxLogDebug(_T("There were memory leaks.\n"));
wxDebugContext::Dump();
wxDebugContext::PrintStatistics();
}
-#endif
+#endif // Debug
// do this as the very last thing because everything else can log messages
wxLog::DontCreateOnDemand();
if (!wxTheApp)
{
wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
- "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
+ _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
wxTheApp = (wxApp*) test_app;
}
- wxCHECK_MSG( wxTheApp, -1, "wxWindows error: no application object" );
+ wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );
wxTheApp->argc = argc;
wxTheApp->argv = argv;
- char name[200];
- strcpy( name, argv[0] );
- strcpy( name, wxFileNameFromPath(name) );
+ wxString name(wxFileNameFromPath(argv[0]));
wxStripExtension( name );
wxTheApp->SetAppName( name );
- if (!wxTheApp->OnInitGui())
- return 0;
-
- /* Here frames insert themselves automatically
- * into wxTopLevelWindows by getting created
- * in OnInit(). */
+ int retValue = 0;
- if (!wxTheApp->OnInit())
- return 0;
+ if ( !wxTheApp->OnInitGui() )
+ retValue = -1;
- wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
+ // Here frames insert themselves automatically into wxTopLevelWindows by
+ // getting created in OnInit().
+ if ( retValue == 0 )
+ {
+ if ( !wxTheApp->OnInit() )
+ retValue = -1;
+ }
- int retValue = 0;
+ if ( retValue == 0 )
+ {
+ wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
- if (wxTheApp->Initialized())
- retValue = wxTheApp->OnRun();
+ if (wxTheApp->Initialized())
+ retValue = wxTheApp->OnRun();
- wxWindow *topWindow = wxTheApp->GetTopWindow();
- if (topWindow)
- {
- // Forcibly delete the window.
- if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
- topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+ wxWindow *topWindow = wxTheApp->GetTopWindow();
+ if (topWindow)
{
- topWindow->Close( TRUE );
- wxTheApp->DeletePendingObjects();
+ // Forcibly delete the window.
+ if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+ topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+ {
+ topWindow->Close( TRUE );
+ wxTheApp->DeletePendingObjects();
+ }
+ else
+ {
+ delete topWindow;
+ wxTheApp->SetTopWindow( (wxWindow*) NULL );
+ }
}
- else
- {
- delete topWindow;
- wxTheApp->SetTopWindow( (wxWindow*) NULL );
- }
- }
- wxTheApp->OnExit();
+ wxTheApp->OnExit();
+ }
// flush the logged messages if any
wxLog *log = wxLog::GetActiveTarget();
projects / wxWidgets.git / blobdiff