#include "wx/gtk/private/timer.h"
#include "wx/evtloop.h"
-#ifdef __WXDEBUG__
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#if wxDEBUG_LEVEL
#include "wx/gtk/assertdlg_gtk.h"
#if wxUSE_STACKWALKER
#include "wx/stackwalk.h"
#endif // wxUSE_STACKWALKER
-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL
#include <stdarg.h>
#include <string.h>
#include <sys/wait.h> // for WNOHANG
#include <unistd.h>
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkx.h"
-
-#ifdef HAVE_X11_XKBLIB_H
- /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with
- * field named "explicit" - which is, of course, an error for a C++
- * compiler. To be on the safe side, just redefine it everywhere. */
- #define explicit __wx_explicit
-
- #include "X11/XKBlib.h"
-
- #undef explicit
-#endif // HAVE_X11_XKBLIB_H
-
-
#if wxUSE_DETECT_SM
- #include "X11/Xlib.h"
- #include "X11/SM/SMlib.h"
+ #include <X11/SM/SMlib.h>
+
+ #include "wx/unix/utilsx11.h"
#endif
//-----------------------------------------------------------------------------
}
#endif
-/* Don't synthesize KeyUp events holding down a key and producing
- KeyDown events with autorepeat. */
-#ifdef HAVE_X11_XKBLIB_H
-bool wxSetDetectableAutoRepeat( bool flag )
-{
- Bool result;
- XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
- return result; /* true if keyboard hardware supports this mode */
-}
-#else
-bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
-{
- return false;
-}
-#endif
-
// ----------------------------------------------------------------------------
// display characterstics
// ----------------------------------------------------------------------------
int wxDisplayDepth()
{
- return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth;
+ return gtk_widget_get_visual(wxGetRootWindow())->depth;
}
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
// NOTE: you don't need to use this macro to check for Pango features
// added in pango-1.4 or earlier since GTK 2.4 (our minimum requirement
// for GTK lib) required pango 1.4...
-
+
#ifdef PANGO_VERSION_MAJOR
if (!gtk_check_version (2,11,0))
{
// ----------------------------------------------------------------------------
extern "C" {
-static
-void GTK_EndProcessDetector(gpointer data, gint source,
- GdkInputCondition WXUNUSED(condition))
+static gboolean EndProcessDetector(GIOChannel* source, GIOCondition, void* data)
{
wxEndProcessData * const
proc_data = static_cast<wxEndProcessData *>(data);
// child exited, end waiting
- close(source);
-
- // don't call us again!
- gdk_input_remove(proc_data->tag);
+ close(g_io_channel_unix_get_fd(source));
wxHandleProcessTermination(proc_data);
+
+ // don't call us again!
+ return false;
}
}
int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)
{
- int tag = gdk_input_add(fd,
- GDK_INPUT_READ,
- GTK_EndProcessDetector,
- (gpointer)proc_data);
-
- return tag;
+ GIOChannel* channel = g_io_channel_unix_new(fd);
+ GIOCondition cond = GIOCondition(G_IO_IN | G_IO_HUP | G_IO_ERR);
+ unsigned id = g_io_add_watch(channel, cond, EndProcessDetector, proc_data);
+ g_io_channel_unref(channel);
+ return int(id);
}
#if wxUSE_DETECT_SM
static wxString GetSM()
{
- class Dpy
- {
- public:
- Dpy() { m_dpy = XOpenDisplay(NULL); }
- ~Dpy() { if ( m_dpy ) XCloseDisplay(m_dpy); }
-
- operator Display *() const { return m_dpy; }
- private:
- Display *m_dpy;
- } dpy;
-
+ wxX11Display dpy;
if ( !dpy )
return wxEmptyString;
}
#endif
-#ifdef __WXDEBUG__
-
-#if wxUSE_STACKWALKER
+#if wxDEBUG_LEVEL && wxUSE_STACKWALKER
// private helper class
class StackDump : public wxStackWalker
GtkAssertDialog *m_dlg;
};
-// the callback functions must be extern "C" to comply with GTK+ declarations
-extern "C"
+static void get_stackframe_callback(void* p)
{
- void get_stackframe_callback(StackDump *dump)
- {
- // skip over frames up to including wxOnAssert()
- dump->ProcessFrames(3);
- }
+ StackDump* dump = static_cast<StackDump*>(p);
+ // skip over frames up to including wxOnAssert()
+ dump->ProcessFrames(3);
}
-#endif // wxUSE_STACKWALKER
+#endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER
bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
{
- // under GTK2 we prefer to use a dialog widget written using directly GTK+;
- // in fact we cannot use a dialog written using wxWidgets: it would need
- // the wxWidgets idle processing to work correctly!
- GtkWidget *dialog = gtk_assert_dialog_new();
- gtk_assert_dialog_set_message(GTK_ASSERT_DIALOG(dialog), msg.mb_str());
+#if wxDEBUG_LEVEL
+ // we can't show the dialog from another thread
+ if ( wxIsMainThread() )
+ {
+ // under GTK2 we prefer to use a dialog widget written using directly
+ // in GTK+ as use a dialog written using wxWidgets would need the
+ // wxWidgets idle processing to work correctly which might not be the
+ // case when assert happens
+ GtkWidget *dialog = gtk_assert_dialog_new();
+ gtk_assert_dialog_set_message(GTK_ASSERT_DIALOG(dialog), msg.mb_str());
#if wxUSE_STACKWALKER
- // don't show more than maxLines or we could get a dialog too tall to be
- // shown on screen: 20 should be ok everywhere as even with 15 pixel high
- // characters it is still only 300 pixels...
- static const int maxLines = 20;
-
- // save current stack frame...
- StackDump dump(GTK_ASSERT_DIALOG(dialog));
- dump.SaveStack(maxLines);
-
- // ...but process it only if the user needs it
- gtk_assert_dialog_set_backtrace_callback(GTK_ASSERT_DIALOG(dialog),
- (GtkAssertDialogStackFrameCallback)get_stackframe_callback,
- &dump);
-#endif // wxUSE_STACKWALKER
-
- gint result = gtk_dialog_run(GTK_DIALOG (dialog));
- bool returnCode = false;
- switch (result)
- {
- case GTK_ASSERT_DIALOG_STOP:
- wxTrap();
- break;
- case GTK_ASSERT_DIALOG_CONTINUE:
- // nothing to do
- break;
- case GTK_ASSERT_DIALOG_CONTINUE_SUPPRESSING:
- // no more asserts
- returnCode = true;
- break;
-
- default:
- wxFAIL_MSG( _T("unexpected return code from GtkAssertDialog") );
+ // save the current stack ow...
+ StackDump dump(GTK_ASSERT_DIALOG(dialog));
+ dump.SaveStack(100); // showing more than 100 frames is not very useful
+
+ // ...but process it only if the user needs it
+ gtk_assert_dialog_set_backtrace_callback
+ (
+ GTK_ASSERT_DIALOG(dialog),
+ get_stackframe_callback,
+ &dump
+ );
+#endif // wxUSE_STACKWALKER
+
+ gint result = gtk_dialog_run(GTK_DIALOG (dialog));
+ bool returnCode = false;
+ switch (result)
+ {
+ case GTK_ASSERT_DIALOG_STOP:
+ wxTrap();
+ break;
+ case GTK_ASSERT_DIALOG_CONTINUE:
+ // nothing to do
+ break;
+ case GTK_ASSERT_DIALOG_CONTINUE_SUPPRESSING:
+ // no more asserts
+ returnCode = true;
+ break;
+
+ default:
+ wxFAIL_MSG( wxT("unexpected return code from GtkAssertDialog") );
+ }
+
+ gtk_widget_destroy(dialog);
+ return returnCode;
}
+#endif // wxDEBUG_LEVEL
- gtk_widget_destroy(dialog);
- return returnCode;
+ return wxAppTraitsBase::ShowAssertDialog(msg);
}
-#endif // __WXDEBUG__
-
wxString wxGUIAppTraits::GetDesktopEnvironment() const
{
- wxString de = wxSystemOptions::GetOption(_T("gtk.desktop"));
+ wxString de = wxSystemOptions::GetOption(wxT("gtk.desktop"));
#if wxUSE_DETECT_SM
if ( de.empty() )
{
wxString ret;
if (opt->short_name)
- ret << _T("-") << opt->short_name;
+ ret << wxT("-") << opt->short_name;
if (opt->long_name)
{
if (!ret.empty())
- ret << _T(", ");
- ret << _T("--") << opt->long_name;
+ ret << wxT(", ");
+ ret << wxT("--") << opt->long_name;
if (opt->arg_description)
- ret << _T("=") << opt->arg_description;
+ ret << wxT("=") << opt->arg_description;
}
- return _T(" ") + ret;
+ return wxT(" ") + ret;
}
#endif // __WXGTK26__
// because, as we use the undocumented _GOptionGroup struct, we don't want
// to run this code with future versions which might change it (2.19 is the
// latest one at the time of this writing)
- if (!glib_check_version(2,6,0) && glib_check_version(2,19,0))
+ if (!glib_check_version(2,6,0) && glib_check_version(2,20,0))
{
usage << _("The following standard GTK+ options are also supported:\n");
projects / wxWidgets.git / blobdiff