#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 "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 )
{
if (height) *height = gdk_screen_height_mm();
}
-void wxGetMousePosition( int* x, int* y )
-{
- gdk_window_get_pointer(gtk_widget_get_root_window(wxGetRootWindow()), x, y, NULL);
-}
-
bool wxColourDisplay()
{
return true;
int wxDisplayDepth()
{
- return gtk_widget_get_visual(wxGetRootWindow())->depth;
+ return gdk_visual_get_depth(gtk_widget_get_visual(wxGetRootWindow()));
}
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
// 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 gboolean EndProcessDetector(GIOChannel* source, GIOCondition, void* data)
{
return int(id);
}
-
+#endif // __UNIX__
// ----------------------------------------------------------------------------
// wxPlatformInfo-related
}
-#if wxUSE_INTL
-void wxGUIAppTraits::SetLocale()
-{
- gtk_set_locale();
- wxUpdateLocaleIsUtf8();
-}
-#endif
+#ifdef __UNIX__
#if wxDEBUG_LEVEL && wxUSE_STACKWALKER
// 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(),
- frame.GetFileName().mb_str(),
+ fncname.utf8_str(),
+ frame.GetFileName().utf8_str(),
frame.GetLine());
+ }
}
private:
{
StackDump* dump = static_cast<StackDump*>(p);
// skip over frames up to including wxOnAssert()
- dump->ProcessFrames(3);
+ dump->ProcessFrames(6);
}
#endif // wxDEBUG_LEVEL && 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;
}
-#ifdef __WXGTK26__
+#endif // __UNIX__ || __OS2__
// see the hack below in wxCmdLineParser::GetUsageString().
// TODO: replace this hack with a g_option_group_get_entries()
return wxT(" ") + ret;
}
-#endif // __WXGTK26__
+#ifdef __UNIX__
wxString
wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
{
wxString usage;
-#ifdef __WXGTK26__
- if (!gtk_check_version(2,6,0))
+ // 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.32 is the
+ // latest one at the time of this writing)
+ if (glib_check_version(2,33,0))
{
- // 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.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.32 is the
- // latest one at the time of this writing)
- if (glib_check_version(2,6,0) == NULL && glib_check_version(2,33,0))
- {
- usage << _("The following standard GTK+ options are also supported:\n");
+ usage << _("The following standard GTK+ options are also supported:\n");
- // passing true here means that the function can open the default
- // display while parsing (not really used here anyhow)
- GOptionGroup *gtkOpts = gtk_get_option_group(true);
+ // passing true here means that the function can open the default
+ // display while parsing (not really used here anyhow)
+ GOptionGroup *gtkOpts = gtk_get_option_group(true);
- // WARNING: here we access the internals of GOptionGroup:
- GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
- unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
- wxArrayString namesOptions, descOptions;
+ // WARNING: here we access the internals of GOptionGroup:
+ GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
+ unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
+ wxArrayString namesOptions, descOptions;
- for ( size_t n = 0; n < n_entries; n++ )
- {
- if ( entries[n].flags & G_OPTION_FLAG_HIDDEN )
- continue; // skip
-
- names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
+ for ( size_t n = 0; n < n_entries; n++ )
+ {
+ if ( entries[n].flags & G_OPTION_FLAG_HIDDEN )
+ continue; // skip
- const gchar * const entryDesc = entries[n].description;
- desc.push_back(wxString(entryDesc));
- }
+ names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
- g_option_group_free (gtkOpts);
+ const gchar * const entryDesc = entries[n].description;
+ desc.push_back(wxString(entryDesc));
}
+
+ g_option_group_free (gtkOpts);
}
-#else
- wxUnusedVar(names);
- wxUnusedVar(desc);
-#endif // __WXGTK26__
return usage;
}
+#endif // __UNIX__
projects / wxWidgets.git / blobdiff