wxApp *wxTheApp = (wxApp *) NULL;
wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
-extern wxList wxPendingDelete;
#if wxUSE_THREADS
extern wxList *wxPendingEvents;
extern wxCriticalSection *wxPendingEventsLocker;
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)
+ /* 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) */
+ while (wxTheApp->ProcessIdle()) { }
+
+#if 0
for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
node;
node = node->GetNext() )
wxWindow *win = node->GetData();
win->OnInternalIdle();
}
+#endif
if (wxTheApp->m_idleTag)
{
{
if (!wxTheApp) return TRUE;
+#if (GTK_MINOR_VERSION > 0)
+ /* when getting called from GDK's idle handler we
+ are no longer within GDK's grab on the GUI
+ thread so we must lock it here ourselves */
+ GDK_THREADS_ENTER ();
+#endif
+
/* sent idle event to all who request them */
while (wxTheApp->ProcessIdle()) { }
emptied */
g_isIdle = TRUE;
- /* wake up other threads */
- wxMutexGuiLeave();
- wxUsleep(0);
- wxMutexGuiEnter();
+#if (GTK_MINOR_VERSION > 0)
+ /* release lock again */
+ GDK_THREADS_LEAVE ();
+#endif
return TRUE;
}
void wxapp_install_idle_handler()
{
+ wxASSERT_MSG( wxTheApp->m_idleTag == 0, "attempt to install idle handler twice" );
+
/* this routine gets called by all event handlers
indicating that the idle is over. */
g_isIdle = FALSE;
}
+#if wxUSE_THREADS
+static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+{
+ gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
+ wxTheApp->m_wakeUpTimerTag = 0;
+
+#if (GTK_MINOR_VERSION > 0)
+ /* when getting called from GDK's time-out handler
+ we are no longer within GDK's grab on the GUI
+ thread so we must lock it here ourselves */
+ GDK_THREADS_ENTER ();
+#endif
+
+ /* unblock other threads wishing to do some GUI things */
+ wxMutexGuiLeave();
+
+ /* wake up other threads */
+ wxUsleep( 1 );
+
+ /* block other thread again */
+ wxMutexGuiEnter();
+
+#if (GTK_MINOR_VERSION > 0)
+ /* release lock again */
+ GDK_THREADS_LEAVE ();
+#endif
+
+ wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+
+ return TRUE;
+}
+#endif
+
//-----------------------------------------------------------------------------
// wxApp
//-----------------------------------------------------------------------------
m_exitOnFrameDelete = TRUE;
m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
+
+#if wxUSE_THREADS
+ m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+#endif
m_colorCube = (unsigned char*) NULL;
}
{
if (m_idleTag) gtk_idle_remove( m_idleTag );
+#if wxUSE_THREADS
+ if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag );
+#endif
+
if (m_colorCube) free(m_colorCube);
}
m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
- for (int r = 0; r < 32; r++)
- {
+ for (int r = 0; r < 32; r++)
+ {
for (int g = 0; g < 32; g++)
{
for (int b = 0; b < 32; b++)
int gg = (g << 3) | (g >> 2);
int bb = (b << 3) | (b >> 2);
+ int index = -1;
+
GdkColor *colors = cmap->colors;
- if(colors)
- {
- int max = 3 * 65536;
- int index = -1;
-
- for (int i = 0; i < cmap->size; i++)
- {
- int rdiff = ((rr << 8) - colors[i].red);
- int gdiff = ((gg << 8) - colors[i].green);
- int bdiff = ((bb << 8) - colors[i].blue);
- int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
- if (sum < max) { index = i; max = sum; }
+ if (colors)
+ {
+ int max = 3 * 65536;
+
+ for (int i = 0; i < cmap->size; i++)
+ {
+ int rdiff = ((rr << 8) - colors[i].red);
+ int gdiff = ((gg << 8) - colors[i].green);
+ int bdiff = ((bb << 8) - colors[i].blue);
+ int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+ if (sum < max)
+ {
+ index = i; max = sum;
+ }
+ }
}
+ else
+ {
+ /* assume 8-bit true or static colors. this really
+ exists. */
+ GdkVisual* vis = gdk_colormap_get_visual( cmap );
+ index = (r >> (5 - vis->red_prec)) << vis->red_shift;
+ index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
+ index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
}
+
m_colorCube[ (r*1024) + (g*32) + b ] = index;
}
}
delete obj;
- if (wxPendingDelete.Member(obj))
- delete node;
+ if (wxPendingDelete.Find(obj))
+ delete node;
node = wxPendingDelete.First();
}
gtk_init( &argc, &argv );
+ wxSetDetectableAutoRepeat( TRUE );
+
if (!wxApp::Initialize())
return -1;
if ( retValue == 0 )
{
+ /* delete pending toplevel windows (typically a single
+ dialog) so that, if there isn't any left, we don't
+ call OnRun() */
+ wxTheApp->DeletePendingObjects();
+
wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
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();
- }
- else
- {
- delete topWindow;
- wxTheApp->SetTopWindow( (wxWindow*) NULL );
- }
+ /* 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 );
+ }
+ }
+ wxTheApp->OnExit();
}
-
- wxTheApp->OnExit();
}
// flush the logged messages if any
projects / wxWidgets.git / blobdiff