#include "wx/log.h"
#endif
-#include "wx/sysopt.h"
#include "wx/apptrait.h"
#include "wx/process.h"
#include "wx/sysopt.h"
#include "wx/gtk/private/timer.h"
#include "wx/evtloop.h"
-#ifdef __WXDEBUG__
+#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>
}
#endif
-// 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;
-}
-
-
// ----------------------------------------------------------------------------
// display characterstics
// ----------------------------------------------------------------------------
void wxDisplaySize( int *width, int *height )
{
- int marginX = wxSystemOptions::GetOptionInt(wxT("gtk.desktopmargin.x"));
- int marginY = wxSystemOptions::GetOptionInt(wxT("gtk.desktopmargin.y"));
-
- if (width) *width = gdk_screen_width() - marginX;
- if (height) *height = gdk_screen_height() - marginY;
+ if (width) *width = gdk_screen_width();
+ if (height) *height = gdk_screen_height();
}
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()
#endif // !wxUSE_UNICODE
-// Returns false if version is certainly greater or equal than major.minor.micro
-// Returns true if version is lower than major.minor.micro OR it cannot be
-// determined and one should not rely on the availability of pango version
-// major.minor.micro, nor the non-availability
+// Returns NULL if version is certainly greater or equal than major.minor.micro
+// Returns string describing the error if version is lower than
+// major.minor.micro OR it cannot be determined and one should not rely on the
+// availability of pango version major.minor.micro, nor the non-availability
const gchar *wx_pango_version_check (int major, int minor, int micro)
{
+ // 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) )
+ GdkInputCondition WXUNUSED(condition))
{
- wxEndProcessData *proc_data = (wxEndProcessData *)data;
+ wxEndProcessData * const
+ proc_data = static_cast<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);
+ // child exited, end waiting
+ close(source);
- if ( rc == 0 )
- {
- // no, it didn't exit yet, continue waiting
- return;
- }
+ // don't call us again!
+ gdk_input_remove(proc_data->tag);
- // set exit code to -1 if something bad happened
- proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status)
- : -1;
-
- // child exited, end waiting
- close(source);
-
- // 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,
if ( !smc_conn )
{
- wxLogWarning(_("Failed to connect to session manager: %s"), smerr);
+ wxLogDebug("Failed to connect to session manager: %s", smerr);
return wxEmptyString;
}
}
#endif
-#ifdef __WXDEBUG__
-
-#if wxUSE_STACKWALKER
+#if wxDEBUG_LEVEL && wxUSE_STACKWALKER
// private helper class
class StackDump : public wxStackWalker
}
}
-#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!
+#if wxDEBUG_LEVEL
+ // 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());
gtk_widget_destroy(dialog);
return returnCode;
+#else // !wxDEBUG_LEVEL
+ // this function is never called in this case
+ wxUnusedVar(msg);
+ return false;
+#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
}
-#endif // __WXDEBUG__
-
wxString wxGUIAppTraits::GetDesktopEnvironment() const
{
wxString de = wxSystemOptions::GetOption(_T("gtk.desktop"));
// see the hack below in wxCmdLineParser::GetUsageString().
// TODO: replace this hack with a g_option_group_get_entries()
-// call as soon as such function exists
+// call as soon as such function exists;
+// see http://bugzilla.gnome.org/show_bug.cgi?id=431021 for the relative
+// feature request
struct _GOptionGroup
{
gchar *name;
wxString usage;
#ifdef __WXGTK26__
- // check whether GTK version is greater than 2.6 but also lower than 2.12
- // because, as we use the undocumented _GOptionGroup struct, we don't want
- // to run this code with future versions which might change it (2.11 is the
- // latest one at the time of this writing)
- if (!gtk_check_version(2,6,0) &&
- gtk_check_version(2,12,0))
+ if (!gtk_check_version(2,6,0))
{
- usage << _("The following standard GTK+ options are also supported:\n");
+ // since GTK>=2.6, we can use the glib_check_version() symbol...
- // 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);
+ // check whether GLib version is greater than 2.6 but also lower than 2.19
+ // 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,20,0))
+ {
+ usage << _("The following standard GTK+ options are also supported:\n");
- // WARNING: here we access the internals of GOptionGroup:
- GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
- unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
- wxArrayString namesOptions, descOptions;
+ // 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);
- for ( size_t n = 0; n < n_entries; n++ )
- {
- if ( entries[n].flags & G_OPTION_FLAG_HIDDEN )
- continue; // skip
+ // WARNING: here we access the internals of GOptionGroup:
+ GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
+ unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
+ wxArrayString namesOptions, descOptions;
- 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(entryDesc ? wxString(entryDesc) : _T(""));
- }
+ names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
+
+ const gchar * const entryDesc = entries[n].description;
+ desc.push_back(wxString(entryDesc));
+ }
- g_option_group_free (gtkOpts);
+ g_option_group_free (gtkOpts);
+ }
}
#else
wxUnusedVar(names);
projects / wxWidgets.git / blobdiff