X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d24b23b76eca69c0faecf6146f52f6d8f93d4b78..fea35690f171f9677bd9f949c0af3dc16d1a9576:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 8932e2198d..748f9d57d4 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/gtk1/app.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "app.h" -#endif - #ifdef __VMS // vms_jackets.h should for proper working be included before anything else # include @@ -21,19 +17,23 @@ #include "wx/wxprec.h" #include "wx/app.h" -#include "wx/gdicmn.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/memory.h" -#include "wx/font.h" -#include "wx/settings.h" -#include "wx/dialog.h" -#include "wx/msgdlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/dialog.h" + #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/memory.h" + #include "wx/font.h" + #include "wx/gdicmn.h" + #include "wx/image.h" + #include "wx/module.h" +#endif + #include "wx/file.h" #include "wx/filename.h" -#include "wx/module.h" -#include "wx/image.h" #include "wx/thread.h" #ifdef __WXGPE__ @@ -74,9 +74,13 @@ #include #include #include + #ifdef HAVE_SYS_SELECT_H + #include + #endif #endif // HAVE_POLL/!HAVE_POLL -#include "wx/gtk/win_gtk.h" +#include "wx/unix/private.h" +#include "wx/gtk1/win_gtk.h" #include @@ -84,7 +88,7 @@ // global data //----------------------------------------------------------------------------- -bool g_mainThreadLocked = FALSE; +bool g_mainThreadLocked = false; gint g_pendingTag = 0; static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; @@ -108,7 +112,7 @@ static wxMutex gs_idleTagsMutex; // not static because used by textctrl.cpp // // MT-FIXME -bool wxIsInsideYield = FALSE; +bool wxIsInsideYield = false; bool wxApp::Yield(bool onlyIfNeeded) { @@ -119,26 +123,28 @@ bool wxApp::Yield(bool onlyIfNeeded) wxFAIL_MSG( wxT("wxYield called recursively" ) ); } - return FALSE; + return false; } #if wxUSE_THREADS if ( !wxThread::IsMain() ) { // can't call gtk_main_iteration() from other threads like this - return TRUE; + return true; } #endif // wxUSE_THREADS - wxIsInsideYield = TRUE; + wxIsInsideYield = true; // We need to remove idle callbacks or the loop will // never finish. wxTheApp->RemoveIdleTag(); +#if wxUSE_LOG // disable log flushing from here because a call to wxYield() shouldn't // normally result in message boxes popping up &c wxLog::Suspend(); +#endif while (gtk_events_pending()) gtk_main_iteration(); @@ -151,12 +157,14 @@ bool wxApp::Yield(bool onlyIfNeeded) // return value of Processidle(). ProcessIdle(); +#if wxUSE_LOG // let the logs be flashed again wxLog::Resume(); +#endif - wxIsInsideYield = FALSE; + wxIsInsideYield = false; - return TRUE; + return true; } //----------------------------------------------------------------------------- @@ -172,21 +180,17 @@ bool wxApp::Yield(bool onlyIfNeeded) void wxApp::WakeUpIdle() { -#ifndef __WXGTK20__ #if wxUSE_THREADS if (!wxThread::IsMain()) wxMutexGuiEnter(); #endif // wxUSE_THREADS_ -#endif // __WXGTK2__ wxapp_install_idle_handler(); -#ifndef __WXGTK20__ #if wxUSE_THREADS if (!wxThread::IsMain()) wxMutexGuiLeave(); #endif // wxUSE_THREADS_ -#endif // __WXGTK2__ } //----------------------------------------------------------------------------- @@ -244,11 +248,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) if (wxTopLevelWindows.GetCount() > 0) { wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData(); -#ifdef __WXGTK20__ - if (win->IsKindOf(CLASSINFO(wxMessageDialog))) -#else if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog))) -#endif win->OnInternalIdle(); } return TRUE; @@ -306,23 +306,23 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout) fd_set readfds; fd_set writefds; fd_set exceptfds; - FD_ZERO(&readfds); - FD_ZERO(&writefds); - FD_ZERO(&exceptfds); + wxFD_ZERO(&readfds); + wxFD_ZERO(&writefds); + wxFD_ZERO(&exceptfds); unsigned int i; for ( i = 0; i < nfds; i++ ) { - wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") ); + wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") ); if ( ufds[i].events & G_IO_IN ) - FD_SET(ufds[i].fd, &readfds); + wxFD_SET(ufds[i].fd, &readfds); if ( ufds[i].events & G_IO_PRI ) - FD_SET(ufds[i].fd, &exceptfds); + wxFD_SET(ufds[i].fd, &exceptfds); if ( ufds[i].events & G_IO_OUT ) - FD_SET(ufds[i].fd, &writefds); + wxFD_SET(ufds[i].fd, &writefds); if ( ufds[i].fd > fdMax ) fdMax = ufds[i].fd; @@ -336,13 +336,13 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout) { ufds[i].revents = 0; - if ( FD_ISSET(ufds[i].fd, &readfds ) ) + if ( wxFD_ISSET(ufds[i].fd, &readfds ) ) ufds[i].revents |= G_IO_IN; - if ( FD_ISSET(ufds[i].fd, &exceptfds ) ) + if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) ) ufds[i].revents |= G_IO_PRI; - if ( FD_ISSET(ufds[i].fd, &writefds ) ) + if ( wxFD_ISSET(ufds[i].fd, &writefds ) ) ufds[i].revents |= G_IO_OUT; } @@ -356,14 +356,14 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) gdk_threads_enter(); wxMutexGuiLeave(); - g_mainThreadLocked = TRUE; + g_mainThreadLocked = true; // we rely on the fact that glib GPollFD struct is really just pollfd but // I wonder how wise is this in the long term (VZ) gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout ); wxMutexGuiEnter(); - g_mainThreadLocked = FALSE; + g_mainThreadLocked = false; gdk_threads_leave(); @@ -392,7 +392,7 @@ void wxapp_install_idle_handler() wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); - g_isIdle = FALSE; + g_isIdle = false; if (g_pendingTag == 0) g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); @@ -432,7 +432,7 @@ END_EVENT_TABLE() wxApp::wxApp() { #ifdef __WXDEBUG__ - m_isInAssert = FALSE; + m_isInAssert = false; #endif // __WXDEBUG__ m_idleTag = 0; @@ -460,7 +460,7 @@ wxApp::~wxApp() bool wxApp::OnInitGui() { if ( !wxAppBase::OnInitGui() ) - return FALSE; + return false; GdkVisual *visual = gdk_visual_get_system(); @@ -468,14 +468,9 @@ bool wxApp::OnInitGui() // chosen a specific visual, then derive the GdkVisual from that if (m_glVisualInfo != NULL) { -#ifdef __WXGTK20__ - // seems gtk_widget_set_default_visual no longer exists? - GdkVisual* vis = gtk_widget_get_default_visual(); -#else GdkVisual* vis = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo) ->visualid ); gtk_widget_set_default_visual( vis ); -#endif GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); gtk_widget_set_default_colormap( colormap ); @@ -489,13 +484,8 @@ bool wxApp::OnInitGui() else if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual)) { -#ifdef __WXGTK20__ - /* seems gtk_widget_set_default_visual no longer exists? */ - GdkVisual* vis = gtk_widget_get_default_visual(); -#else GdkVisual* vis = gdk_visual_get_best(); gtk_widget_set_default_visual( vis ); -#endif GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); gtk_widget_set_default_colormap( colormap ); @@ -554,7 +544,7 @@ bool wxApp::OnInitGui() } } - return TRUE; + return true; } GdkVisual *wxApp::GetGdkVisual() @@ -574,7 +564,7 @@ GdkVisual *wxApp::GetGdkVisual() bool wxApp::Initialize(int& argc, wxChar **argv) { bool init_result; - + #if wxUSE_THREADS // GTK 1.2 up to version 1.2.3 has broken threads if ((gtk_major_version == 1) && @@ -594,46 +584,13 @@ bool wxApp::Initialize(int& argc, wxChar **argv) // We should have the wxUSE_WCHAR_T test on the _outside_ #if wxUSE_WCHAR_T - #if defined(__WXGTK20__) - // gtk+ 2.0 supports Unicode through UTF-8 strings - wxConvCurrent = &wxConvUTF8; - #else // GTK 1.x if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; - #endif #else // !wxUSE_WCHAR_T if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T -#ifdef __WXGTK20__ - // decide which conversion to use for the file names - - // (1) this variable exists for the sole purpose of specifying the encoding - // of the filenames for GTK+ programs, so use it if it is set - wxString encName(wxGetenv(_T("G_FILENAME_ENCODING"))); - if (encName == _T("@locale")) - encName.clear(); - encName.MakeUpper(); -#if wxUSE_INTL - if (encName.empty()) - { - // (2) if a non default locale is set, assume that the user wants his - // filenames in this locale too - encName = wxLocale::GetSystemEncodingName().Upper(); - // (3) finally use UTF-8 by default - if (encName.empty() || encName == _T("US-ASCII")) - encName = _T("UTF-8"); - wxSetEnv(_T("G_FILENAME_ENCODING"), encName); - } -#else - if (encName.empty()) - encName = _T("UTF-8"); -#endif // wxUSE_INTL - static wxConvBrokenFileNames fileconv(encName); - wxConvFileName = &fileconv; -#endif // __WXGTK20__ - #if wxUSE_UNICODE // gtk_init() wants UTF-8, not wchar_t, so convert int i; @@ -646,7 +603,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) argvGTK[argc] = NULL; int argcGTK = argc; - + #ifdef __WXGPE__ init_result = true; // is there a _check() version of this? gpe_application_init( &argcGTK, &argvGTK ); @@ -686,7 +643,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?")); return false; } - + // we can not enter threads before gtk_init is done gdk_threads_enter(); @@ -717,11 +674,11 @@ void wxApp::CleanUp() void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) { - m_isInAssert = TRUE; + m_isInAssert = true; wxAppBase::OnAssert(file, line, cond, msg); - m_isInAssert = FALSE; + m_isInAssert = false; } #endif // __WXDEBUG__ @@ -735,6 +692,6 @@ void wxApp::RemoveIdleTag() { gtk_idle_remove( wxTheApp->m_idleTag ); wxTheApp->m_idleTag = 0; - g_isIdle = TRUE; + g_isIdle = true; } }