X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/865bb3251ecf83ddac350b734f4fed1d258e250b..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/gtk1/utilsgtk.cpp diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index 4d780162b6..9a18cfae57 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/utilsgtk.cpp +// Name: src/gtk1/utilsgtk.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,16 +11,18 @@ #include "wx/wxprec.h" #include "wx/utils.h" -#include "wx/string.h" -#include "wx/apptrait.h" -#include "wx/intl.h" -#include "wx/log.h" +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" +#endif +#include "wx/apptrait.h" +#include "wx/gtk1/private/timer.h" +#include "wx/evtloop.h" #include "wx/process.h" -#include "wx/unix/execute.h" - #include #include #include @@ -31,9 +33,7 @@ #include "glib.h" #include "gdk/gdk.h" #include "gtk/gtk.h" -#ifndef __WXGTK20__ #include "gtk/gtkfeatures.h" -#endif #include "gdk/gdkx.h" #ifdef HAVE_X11_XKBLIB_H @@ -56,14 +56,11 @@ extern GtkWidget *wxGetRootWindow(); //---------------------------------------------------------------------------- // misc. //---------------------------------------------------------------------------- -#ifndef __EMX__ -// on OS/2, we use the wxBell from wxBase library void wxBell() { gdk_beep(); } -#endif /* Don't synthesize KeyUp events holding down a key and producing KeyDown events with autorepeat. */ @@ -72,52 +69,15 @@ bool wxSetDetectableAutoRepeat( bool flag ) { Bool result; XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result ); - return result; /* TRUE if keyboard hardware supports this mode */ + return result; /* true if keyboard hardware supports this mode */ } #else bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) { - return FALSE; + return false; } #endif -#ifdef __WXGTK20__ -// Escapes string so that it is valid Pango markup XML string: -wxString wxEscapeStringForPangoMarkup(const wxString& str) -{ - size_t len = str.length(); - wxString out; - out.Alloc(len); - for (size_t i = 0; i < len; i++) - { - wxChar c = str[i]; - switch (c) - { - case _T('&'): - out << _T("&"); - break; - case _T('<'): - out << _T("<"); - break; - case _T('>'): - out << _T(">"); - break; - case _T('\''): - out << _T("'"); - break; - case _T('"'): - out << _T("""); - break; - default: - out << c; - break; - } - } - return out; -} -#endif - - // ---------------------------------------------------------------------------- // display characterstics // ---------------------------------------------------------------------------- @@ -139,25 +99,14 @@ void wxDisplaySizeMM( int *width, int *height ) if (height) *height = gdk_screen_height_mm(); } -void wxClientDisplayRect(int *x, int *y, int *width, int *height) -{ - // This is supposed to return desktop dimensions minus any window - // manager panels, menus, taskbars, etc. If there is a way to do that - // for this platform please fix this function, otherwise it defaults - // to the entire desktop. - if (x) *x = 0; - if (y) *y = 0; - wxDisplaySize(width, height); -} - void wxGetMousePosition( int* x, int* y ) { - gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL ); + gdk_window_get_pointer( NULL, x, y, NULL ); } bool wxColourDisplay() { - return TRUE; + return true; } int wxDisplayDepth() @@ -165,25 +114,6 @@ int wxDisplayDepth() return gdk_window_get_visual( wxGetRootWindow()->window )->depth; } -wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() -{ - static wxToolkitInfo info; -#ifdef __WXGTK20__ - info.shortName = _T("gtk2"); -#else - info.shortName = _T("gtk"); -#endif - info.name = _T("wxGTK"); -#ifdef __WXUNIVERSAL__ - info.shortName << _T("univ"); - info.name << _T("/wxUniversal"); -#endif - info.versionMajor = gtk_major_version; - info.versionMinor = gtk_minor_version; - info.os = wxGTK; - return info; -} - wxWindow* wxFindWindowAtPoint(const wxPoint& pt) { return wxGenericFindWindowAtPoint(pt); @@ -194,47 +124,31 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) // subprocess routines // ---------------------------------------------------------------------------- -extern "C" { -static -void GTK_EndProcessDetector(gpointer data, gint source, - GdkInputCondition WXUNUSED(condition) ) -{ - wxEndProcessData *proc_data = (wxEndProcessData *)data; - - // has the process really terminated? unfortunately GDK (or GLib) seem to - // generate G_IO_HUP notification even when it simply tries to read from a - // closed fd and hasn't terminated at all - int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid); - int status = 0; - int rc = waitpid(pid, &status, WNOHANG); +#if wxUSE_TIMER - if ( rc == 0 ) - { - // no, it didn't exit yet, continue waiting - return; - } +wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) +{ + return new wxGTKTimerImpl(timer); +} - // set exit code to -1 if something bad happened - proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status) - : -1; +#endif // wxUSE_TIMER - // child exited, end waiting - close(source); +// ---------------------------------------------------------------------------- +// wxPlatformInfo-related +// ---------------------------------------------------------------------------- - // don't call us again! - gdk_input_remove(proc_data->tag); +wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const +{ + if ( verMaj ) + *verMaj = gtk_major_version; + if ( verMin ) + *verMin = gtk_minor_version; - wxHandleProcessTermination(proc_data); -} + return wxPORT_GTK; } -int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) +wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() { - int tag = gdk_input_add(fd, - GDK_INPUT_READ, - GTK_EndProcessDetector, - (gpointer)proc_data); - - return tag; + return new wxEventLoop; }