From 053dcf1a77e5ab817df646e814a21755cf664891 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Wed, 12 May 1999 15:19:35 +0000
Subject: [PATCH]   -1 is kept -1 as a wxWindowID   removed som edebug code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/wincmn.cpp | 3 ++-
 src/gtk/app.cpp       | 1 +
 src/gtk/window.cpp    | 6 ++----
 src/gtk1/app.cpp      | 1 +
 src/gtk1/window.cpp   | 6 ++----
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 611ab2b4c0..37d54450d7 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -152,7 +152,8 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
     wxASSERT_MSG( m_isWindow, _T("Init() must have been called before!") );
 
     // generate a new id if the user doesn't care about it
-    m_windowId = id == -1 ? NewControlId() : id;
+      // No, we keep the -1 from now on. RR.
+//    m_windowId = id == -1 ? NewControlId() : id;
 
     SetName(name);
     SetWindowStyleFlag(style);
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index b7ed1c12ce..c35b4af51d 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -193,6 +193,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     g_isIdle = TRUE;
     
     /* wake up other threads */
+
     wxMutexGuiLeave();
     wxUsleep(0);
     wxMutexGuiEnter();
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 50d64dbc91..03061a90c8 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -145,16 +145,15 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
                                          GdkEvent *WXUNUSED(event),
                                          const wxChar *name )
 {
-    // to enable logging of the focus events replace 0 with 1
-#if 0
+/*
     static bool s_done = FALSE;
     if ( !s_done )
     {
         wxLog::AddTraceMask("focus");
         s_done = TRUE;
     }
-#endif
     wxLogTrace(_T("FOCUS NOW AT: %s"), name);
+*/
 
     return FALSE;
 }
@@ -656,7 +655,6 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
         wxPrintf( win->GetClassInfo()->GetClassName() );
     wxPrintf( _T(".\n") );
 */
-
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index b7ed1c12ce..c35b4af51d 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -193,6 +193,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     g_isIdle = TRUE;
     
     /* wake up other threads */
+
     wxMutexGuiLeave();
     wxUsleep(0);
     wxMutexGuiEnter();
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 50d64dbc91..03061a90c8 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -145,16 +145,15 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
                                          GdkEvent *WXUNUSED(event),
                                          const wxChar *name )
 {
-    // to enable logging of the focus events replace 0 with 1
-#if 0
+/*
     static bool s_done = FALSE;
     if ( !s_done )
     {
         wxLog::AddTraceMask("focus");
         s_done = TRUE;
     }
-#endif
     wxLogTrace(_T("FOCUS NOW AT: %s"), name);
+*/
 
     return FALSE;
 }
@@ -656,7 +655,6 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
         wxPrintf( win->GetClassInfo()->GetClassName() );
     wxPrintf( _T(".\n") );
 */
-
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
-- 
2.45.2