more threds fixes, more threads tests - seems to work ok for non GUI case

[wxWidgets.git] / src / gtk1 / window.cpp

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 57b5dfc22d86b94fed9570177f55f589a932b6f8..2f617eaacd2cea3186db3ef45c7b30772b40f164 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -185,7 +185,8 @@ extern bool       g_blockEventsOnDrag;
 extern bool       g_blockEventsOnScroll;
 extern wxCursor   g_globalCursor;
 static wxWindow  *g_captureWindow = (wxWindow*) NULL;
 extern bool       g_blockEventsOnScroll;
 extern wxCursor   g_globalCursor;
 static wxWindow  *g_captureWindow = (wxWindow*) NULL;

-extern wxWindow  *g_focusWindow = (wxWindow*) NULL;
+
+/* extern */ wxWindow  *g_focusWindow = (wxWindow*) NULL;

 
 // if we detect that the app has got/lost the focus, we set this variable to
 // either TRUE or FALSE and an activate event will be sent during the next
 
 // if we detect that the app has got/lost the focus, we set this variable to
 // either TRUE or FALSE and an activate event will be sent during the next


@@ -222,6 +223,7 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
 
 void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window )
 {
 
 void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window )
 {

+/*

     wxString tmp = name;
     tmp += wxT(" FROM ");
     tmp += window;
     wxString tmp = name;
     tmp += wxT(" FROM ");
     tmp += window;


@@ -232,6 +234,7 @@ void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window
 
     gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
       GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s );
 
     gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
       GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s );

+*/

 }
 
 #endif // Debug
 }
 
 #endif // Debug


@@ -2474,7 +2477,7 @@ void wxWindow::GetTextExtent( const wxString& string,
 void wxWindow::SetFocus()
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
 void wxWindow::SetFocus()
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );

-
+    

     if (m_wxwindow)
     {
         if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow))
     if (m_wxwindow)
     {
         if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow))