/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/utilsgtk.cpp
+// Name: src/gtk1/utilsgtk.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
#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 "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
//----------------------------------------------------------------------------
// 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. */
{
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
// ----------------------------------------------------------------------------
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()
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);
// subprocess routines
// ----------------------------------------------------------------------------
-extern "C"
+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 ( rc == 0 )
- {
- // no, it didn't exit yet, continue waiting
- return;
- }
-
- // set exit code to -1 if something bad happened
- proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status)
- : -1;
+ wxEndProcessData * const
+ proc_data = static_cast<wxEndProcessData *>(data);
- // child exited, end waiting
- close(source);
+ // child exited, end waiting
+ close(source);
- // don't call us again!
- gdk_input_remove(proc_data->tag);
+ // don't call us again!
+ gdk_input_remove(proc_data->tag);
- wxHandleProcessTermination(proc_data);
+ wxHandleProcessTermination(proc_data);
+}
}
-int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
+int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)
{
int tag = gdk_input_add(fd,
GDK_INPUT_READ,
return tag;
}
+#if wxUSE_TIMER
+
+wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+ return new wxGTKTimerImpl(timer);
+}
+
+#endif // wxUSE_TIMER
+
+// ----------------------------------------------------------------------------
+// wxPlatformInfo-related
+// ----------------------------------------------------------------------------
+
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
+{
+ if ( verMaj )
+ *verMaj = gtk_major_version;
+ if ( verMin )
+ *verMin = gtk_minor_version;
+
+ return wxPORT_GTK;
+}
+
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
+{
+ return new wxEventLoop;
+}
+
+#if wxUSE_INTL
+void wxGUIAppTraits::SetLocale()
+{
+ gtk_set_locale();
+}
+#endif
+
projects / wxWidgets.git / blobdiff