-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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 611ab2b4c0b0947c21bb5397d18251b05400167d..37d54450d7eb6adc70c3ae484525d7efb5d49e64 100644 (file)
--- 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
     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);
 
     SetName(name);
     SetWindowStyleFlag(style);

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index b7ed1c12ce07437ccbf4b89f9a2fa102721b4f25..c35b4af51d464f6860aba32b88ebb98a7476b902 100644 (file)
--- 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 */
     g_isIdle = TRUE;
     
     /* wake up other threads */

+

     wxMutexGuiLeave();
     wxUsleep(0);
     wxMutexGuiEnter();
     wxMutexGuiLeave();
     wxUsleep(0);
     wxMutexGuiEnter();

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 50d64dbc9167a40e18bef2e9532f63164232b3b4..03061a90c8449f4dbd85f4bc0ba2d2e9d4139853 100644 (file)
--- 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 )
 {
                                          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;
     }
     static bool s_done = FALSE;
     if ( !s_done )
     {
         wxLog::AddTraceMask("focus");
         s_done = TRUE;
     }

-#endif

     wxLogTrace(_T("FOCUS NOW AT: %s"), name);
     wxLogTrace(_T("FOCUS NOW AT: %s"), name);

+*/

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -656,7 +655,6 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
         wxPrintf( win->GetClassInfo()->GetClassName() );
     wxPrintf( _T(".\n") );
 */
         wxPrintf( win->GetClassInfo()->GetClassName() );
     wxPrintf( _T(".\n") );
 */

-

     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
     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 b7ed1c12ce07437ccbf4b89f9a2fa102721b4f25..c35b4af51d464f6860aba32b88ebb98a7476b902 100644 (file)
--- 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 */
     g_isIdle = TRUE;
     
     /* wake up other threads */

+

     wxMutexGuiLeave();
     wxUsleep(0);
     wxMutexGuiEnter();
     wxMutexGuiLeave();
     wxUsleep(0);
     wxMutexGuiEnter();

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 50d64dbc9167a40e18bef2e9532f63164232b3b4..03061a90c8449f4dbd85f4bc0ba2d2e9d4139853 100644 (file)
--- 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 )
 {
                                          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;
     }
     static bool s_done = FALSE;
     if ( !s_done )
     {
         wxLog::AddTraceMask("focus");
         s_done = TRUE;
     }

-#endif

     wxLogTrace(_T("FOCUS NOW AT: %s"), name);
     wxLogTrace(_T("FOCUS NOW AT: %s"), name);

+*/

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -656,7 +655,6 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
         wxPrintf( win->GetClassInfo()->GetClassName() );
     wxPrintf( _T(".\n") );
 */
         wxPrintf( win->GetClassInfo()->GetClassName() );
     wxPrintf( _T(".\n") );
 */

-

     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;