// global data
//-----------------------------------------------------------------------------
-static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
+static GtkWidget *gs_RootWindow = NULL;
//-----------------------------------------------------------------------------
// wxYield
//-----------------------------------------------------------------------------
-// not static because used by textctrl.cpp
-//
-// MT-FIXME
-bool wxIsInsideYield = false;
-
bool wxApp::Yield(bool onlyIfNeeded)
{
- if ( wxIsInsideYield )
+ if ( m_isInsideYield )
{
if ( !onlyIfNeeded )
{
}
#endif // wxUSE_THREADS
- wxIsInsideYield = true;
+ m_isInsideYield = true;
#if wxUSE_LOG
// disable log flushing from here because a call to wxYield() shouldn't
wxLog::Resume();
#endif
- wxIsInsideYield = false;
+ m_isInsideYield = false;
return true;
}
}
#endif // wxUSE_THREADS
- // We should have the wxUSE_WCHAR_T test on the _outside_
-#if wxUSE_WCHAR_T
// gtk+ 2.0 supports Unicode through UTF-8 strings
wxConvCurrent = &wxConvUTF8;
-#else // !wxUSE_WCHAR_T
- if (!wxOKlibc())
- wxConvCurrent = (wxMBConv*) NULL;
-#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
// decide which conversion to use for the file names