#include "wx/apptrait.h"
#include "wx/process.h"
#include "wx/sysopt.h"
+#ifdef __UNIX__
#include "wx/unix/execute.h"
+#endif
#include "wx/gtk/private/timer.h"
#include "wx/evtloop.h"
+#include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_WIN32
+#include <gdk/gdkwin32.h>
+#endif
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
#if wxDEBUG_LEVEL
#include "wx/gtk/assertdlg_gtk.h"
#if wxUSE_STACKWALKER
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <sys/wait.h> // for WNOHANG
+#ifdef __UNIX__
#include <unistd.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
+#endif
#if wxUSE_DETECT_SM
#include <X11/SM/SMlib.h>
#include "wx/unix/utilsx11.h"
#endif
+#include "wx/gtk/private/gtk2-compat.h"
+
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
//----------------------------------------------------------------------------
// misc.
//----------------------------------------------------------------------------
-#ifndef __EMX__
-// on OS/2, we use the wxBell from wxBase library
void wxBell()
{
gdk_beep();
}
-#endif
// ----------------------------------------------------------------------------
-// display characterstics
+// display characteristics
// ----------------------------------------------------------------------------
+#ifdef GDK_WINDOWING_X11
void *wxGetDisplay()
{
- return GDK_DISPLAY();
+ return GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(wxGetRootWindow()));
}
+#endif
void wxDisplaySize( int *width, int *height )
{
void wxGetMousePosition( int* x, int* y )
{
- gdk_window_get_pointer( NULL, x, y, NULL );
+ gdk_window_get_pointer(gtk_widget_get_root_window(wxGetRootWindow()), x, y, NULL);
}
bool wxColourDisplay()
int wxDisplayDepth()
{
- return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth;
+ return gdk_visual_get_depth(gtk_widget_get_visual(wxGetRootWindow()));
}
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
wxWCharBuffer wbuf;
if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
{
- wbuf = wxConvUI->cMB2WC(s.c_str());
+ wbuf = wxConvUI->cMB2WC(s);
}
else // another encoding, use generic conversion class
{
// 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
+#ifdef __WXGTK3__
+ return pango_version_check(major, minor, micro);
+#elif defined(PANGO_VERSION_MAJOR)
if (!gtk_check_version (2,11,0))
{
// GTK+ 2.11 requires Pango >= 1.15.3 and pango_version_check
#endif
}
-
// ----------------------------------------------------------------------------
// subprocess routines
// ----------------------------------------------------------------------------
+#ifdef __UNIX__
+
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);
}
-
+#endif // __UNIX__
// ----------------------------------------------------------------------------
// wxPlatformInfo-related
}
-#if wxUSE_INTL
+#if wxUSE_INTL && defined(__UNIX__)
void wxGUIAppTraits::SetLocale()
{
+#ifdef __WXGTK3__
+ setlocale(LC_ALL, "");
+#else
gtk_set_locale();
+#endif
wxUpdateLocaleIsUtf8();
}
#endif
+#ifdef __UNIX__
+
#if wxDEBUG_LEVEL && wxUSE_STACKWALKER
// private helper class
virtual void OnStackFrame(const wxStackFrame& frame)
{
wxString fncname = frame.GetName();
- wxString fncargs = fncname;
-
- size_t n = fncname.find(wxT('('));
- if (n != wxString::npos)
- {
- // remove arguments from function name
- fncname.erase(n);
-
- // remove function name and brackets from arguments
- fncargs = fncargs.substr(n+1, fncargs.length()-n-2);
- }
- else
- fncargs = wxEmptyString;
// append this stack frame's info in the dialog
if (!frame.GetFileName().empty() || !fncname.empty())
gtk_assert_dialog_append_stack_frame(m_dlg,
fncname.mb_str(),
- fncargs.mb_str(),
frame.GetFileName().mb_str(),
frame.GetLine());
}
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 // wxDEBUG_LEVEL && wxUSE_STACKWALKER
gtk_assert_dialog_set_backtrace_callback
(
GTK_ASSERT_DIALOG(dialog),
- (GtkAssertDialogStackFrameCallback)get_stackframe_callback,
+ get_stackframe_callback,
&dump
);
#endif // wxUSE_STACKWALKER
return wxAppTraitsBase::ShowAssertDialog(msg);
}
+#endif // __UNIX__
+
+#if defined(__UNIX__) || defined(__OS2__)
+
wxString wxGUIAppTraits::GetDesktopEnvironment() const
{
wxString de = wxSystemOptions::GetOption(wxT("gtk.desktop"));
return de;
}
+#endif // __UNIX__ || __OS2__
+
#ifdef __WXGTK26__
// see the hack below in wxCmdLineParser::GetUsageString().
#endif // __WXGTK26__
+#ifdef __UNIX__
+
wxString
wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
wxArrayString& desc) const
wxString usage;
#ifdef __WXGTK26__
+#ifndef __WXGTK3__
if (!gtk_check_version(2,6,0))
+#endif
{
// since GTK>=2.6, we can use the glib_check_version() symbol...
- // check whether GLib version is greater than 2.6 but also lower than 2.19
+ // check whether GLib version is greater than 2.6 but also lower than 2.33
// 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
+ // to run this code with future versions which might change it (2.32 is the
// latest one at the time of this writing)
- if (!glib_check_version(2,6,0) && glib_check_version(2,20,0))
+ if (glib_check_version(2,6,0) == NULL && glib_check_version(2,33,0))
{
usage << _("The following standard GTK+ options are also supported:\n");
return usage;
}
+#endif // __UNIX__
projects / wxWidgets.git / blobdiff