wxMimeTypesManagerImpl::GetFileTypeFromMimeType() implemented

[wxWidgets.git] / src / gtk1 / threadgui.inc

diff --git a/src/gtk1/threadgui.inc b/src/gtk1/threadgui.inc
index 46073d4e0ba1a752c20330ed5f3718cab5838b20..7f29dc9cf165957c4b20dd382e602b54ff9fbddd 100644 (file)
--- a/src/gtk1/threadgui.inc
+++ b/src/gtk1/threadgui.inc
@@ -35,16 +35,22 @@ static void
 ThreadExitProc(gpointer WXUNUSED(client), gint fid,
                GdkInputCondition WXUNUSED(cond))
 {
 ThreadExitProc(gpointer WXUNUSED(client), gint fid,
                GdkInputCondition WXUNUSED(cond))
 {

-  wxThread* ptr;
-
-  if (fid != p_thrd_pipe[0])
-    return;
-  if (read(fid, &ptr, sizeof(ptr)) == sizeof(ptr)) {
-    //fprintf(stderr, "calling OnExit %p\n", ptr);
-    ptr->OnExit();
-  } else {
-    //fprintf(stderr, "this should never happen\n");
-  }
+    wxThread* ptr;
+  
+    // printf( "thread exit proc.\n" );
+
+    if (fid != p_thrd_pipe[0])
+        return;
+       
+    if (read(fid, &ptr, sizeof(ptr)) == sizeof(ptr)) 
+    {
+        // printf( "calling OnExit %p\n", ptr);
+        ptr->OnExit();
+    } 
+    else 
+    {
+        // printf( "this should never happen\n" );
+    }

 }
 
 // Global initialization
 }
 
 // Global initialization


@@ -63,20 +69,6 @@ static void wxThreadGuiExit()
   close(p_thrd_pipe[1]);
 }
 
   close(p_thrd_pipe[1]);
 }
 

-#ifdef NO_DEFINE_GDK_1_1
-
-void wxMutexGuiEnter()
-{
-  gdk_mutex_enter();
-}
-
-void wxMutexGuiLeave()
-{
-  gdk_mutex_leave();
-}
-
-#else
-

 void wxMutexGuiEnter()
 {
   wxMainMutex->Lock();
 void wxMutexGuiEnter()
 {
   wxMainMutex->Lock();


@@ -87,4 +79,3 @@ void wxMutexGuiLeave()
   wxMainMutex->Unlock();
 }
 
   wxMainMutex->Unlock();
 }
 

-#endif