-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
This commit is contained in:
Robert Roebling 1999-05-12 15:19:35 +00:00
parent dc4769eb08
commit 053dcf1a77
5 changed files with 8 additions and 9 deletions

View File

@ -152,7 +152,8 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
wxASSERT_MSG( m_isWindow, _T("Init() must have been called before!") ); wxASSERT_MSG( m_isWindow, _T("Init() must have been called before!") );
// generate a new id if the user doesn't care about it // 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); SetName(name);
SetWindowStyleFlag(style); SetWindowStyleFlag(style);

View File

@ -193,6 +193,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
g_isIdle = TRUE; g_isIdle = TRUE;
/* wake up other threads */ /* wake up other threads */
wxMutexGuiLeave(); wxMutexGuiLeave();
wxUsleep(0); wxUsleep(0);
wxMutexGuiEnter(); wxMutexGuiEnter();

View File

@ -145,16 +145,15 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
GdkEvent *WXUNUSED(event), GdkEvent *WXUNUSED(event),
const wxChar *name ) const wxChar *name )
{ {
// to enable logging of the focus events replace 0 with 1 /*
#if 0
static bool s_done = FALSE; static bool s_done = FALSE;
if ( !s_done ) if ( !s_done )
{ {
wxLog::AddTraceMask("focus"); wxLog::AddTraceMask("focus");
s_done = TRUE; 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( win->GetClassInfo()->GetClassName() );
wxPrintf( _T(".\n") ); wxPrintf( _T(".\n") );
*/ */
if (!win->m_hasVMT) return FALSE; if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE; if (g_blockEventsOnScroll) return TRUE;

View File

@ -193,6 +193,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
g_isIdle = TRUE; g_isIdle = TRUE;
/* wake up other threads */ /* wake up other threads */
wxMutexGuiLeave(); wxMutexGuiLeave();
wxUsleep(0); wxUsleep(0);
wxMutexGuiEnter(); wxMutexGuiEnter();

View File

@ -145,16 +145,15 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
GdkEvent *WXUNUSED(event), GdkEvent *WXUNUSED(event),
const wxChar *name ) const wxChar *name )
{ {
// to enable logging of the focus events replace 0 with 1 /*
#if 0
static bool s_done = FALSE; static bool s_done = FALSE;
if ( !s_done ) if ( !s_done )
{ {
wxLog::AddTraceMask("focus"); wxLog::AddTraceMask("focus");
s_done = TRUE; 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( win->GetClassInfo()->GetClassName() );
wxPrintf( _T(".\n") ); wxPrintf( _T(".\n") );
*/ */
if (!win->m_hasVMT) return FALSE; if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE; if (g_blockEventsOnScroll) return TRUE;