X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30083ad8e7c0eb9ea3dcf4f2588149eeb7fe3e32..ed8385818f26035d2f60d3a719250ffab48e6c34:/src/gtk/utilsgtk.cpp?ds=sidebyside diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 698225a0be..1f9ea333a7 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -21,9 +21,13 @@ #include "wx/apptrait.h" #include "wx/process.h" +#include "wx/sysopt.h" #include "wx/unix/execute.h" +#include "wx/gtk/private/timer.h" +#include "wx/evtloop.h" + #ifdef __WXDEBUG__ #include "wx/gtk/assertdlg_gtk.h" #if wxUSE_STACKWALKER @@ -183,16 +187,17 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) #if !wxUSE_UNICODE -wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc) +WXDLLIMPEXP_CORE wxCharBuffer +wxConvertToGTK(const wxString& s, wxFontEncoding enc) { wxWCharBuffer wbuf; if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT ) { - wbuf = wxConvUI->cMB2WC(s); + wbuf = wxConvUI->cMB2WC(s.c_str()); } else // another encoding, use generic conversion class { - wbuf = wxCSConv(enc).cMB2WC(s); + wbuf = wxCSConv(enc).cMB2WC(s.c_str()); } if ( !wbuf && !s.empty() ) @@ -203,17 +208,18 @@ wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc) // we choose ISO8859-1 here arbitrarily, it's just the most common // encoding probably and, also importantly here, conversion from it // never fails as it's done internally by wxCSConv - wbuf = wxCSConv(wxFONTENCODING_ISO8859_1).cMB2WC(s); + wbuf = wxCSConv(wxFONTENCODING_ISO8859_1).cMB2WC(s.c_str()); } return wxConvUTF8.cWC2MB(wbuf); } -wxCharBuffer wxConvertFromGTK(const wxString& s, wxFontEncoding enc) +WXDLLIMPEXP_CORE wxCharBuffer +wxConvertFromGTK(const wxString& s, wxFontEncoding enc) { // this conversion should never fail as GTK+ always uses UTF-8 internally // so there are no complications here - const wxWCharBuffer wbuf(wxConvUTF8.cMB2WC(s)); + const wxWCharBuffer wbuf(wxConvUTF8.cMB2WC(s.c_str())); if ( enc == wxFONTENCODING_SYSTEM ) return wxConvUI->cWC2MB(wbuf); @@ -222,6 +228,28 @@ wxCharBuffer wxConvertFromGTK(const wxString& s, wxFontEncoding enc) #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 +const gchar *wx_pango_version_check (int major, int minor, int micro) +{ +#ifdef PANGO_VERSION_MAJOR + if (!gtk_check_version (2,11,0)) + { + // GTK+ 2.11 requires Pango >= 1.15.3 and pango_version_check + // was added in Pango 1.15.2 thus we know for sure the pango lib we're + // using has the pango_version_check function: + return pango_version_check (major, minor, micro); + } + + return "can't check"; +#else // !PANGO_VERSION_MAJOR + return "too old headers"; +#endif +} + + // ---------------------------------------------------------------------------- // subprocess routines // ---------------------------------------------------------------------------- @@ -286,6 +314,15 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const return wxPORT_GTK; } +#if wxUSE_TIMER + +wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) +{ + return new wxGTKTimerImpl(timer); +} + +#endif // wxUSE_TIMER + #if wxUSE_DETECT_SM static wxString GetSM() { @@ -303,15 +340,19 @@ static wxString GetSM() if ( !dpy ) return wxEmptyString; + char smerr[256]; char *client_id; SmcConn smc_conn = SmcOpenConnection(NULL, NULL, 999, 999, 0 /* mask */, NULL /* callbacks */, NULL, &client_id, - 0, NULL); + WXSIZEOF(smerr), smerr); if ( !smc_conn ) + { + wxLogWarning(_("Failed to connect to session manager: %s"), smerr); return wxEmptyString; + } char *vendor = SmcVendor(smc_conn); wxString ret = wxString::FromAscii( vendor ); @@ -329,6 +370,20 @@ static wxString GetSM() // wxGUIAppTraits //----------------------------------------------------------------------------- +wxEventLoopBase *wxGUIAppTraits::CreateEventLoop() +{ + return new wxEventLoop(); +} + + +#if wxUSE_INTL +void wxGUIAppTraits::SetLocale() +{ + gtk_set_locale(); + wxUpdateLocaleIsUtf8(); +} +#endif + #ifdef __WXDEBUG__ #if wxUSE_STACKWALKER @@ -433,18 +488,112 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg) wxString wxGUIAppTraits::GetDesktopEnvironment() const { + wxString de = wxSystemOptions::GetOption(_T("gtk.desktop")); #if wxUSE_DETECT_SM - const wxString SM = GetSM(); - - if (SM == wxT("GnomeSM")) - return wxT("GNOME"); + if ( de.empty() ) + { + static const wxString s_SM = GetSM(); - if (SM == wxT("KDE")) - return wxT("KDE"); + if (s_SM == wxT("GnomeSM")) + de = wxT("GNOME"); + else if (s_SM == wxT("KDE")) + de = wxT("KDE"); + } #endif // wxUSE_DETECT_SM - return wxEmptyString; + return de; } +#ifdef __WXGTK26__ + +// 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 +struct _GOptionGroup +{ + gchar *name; + gchar *description; + gchar *help_description; + GDestroyNotify destroy_notify; + gpointer user_data; + + GTranslateFunc translate_func; + GDestroyNotify translate_notify; + gpointer translate_data; + + GOptionEntry *entries; + gint n_entries; + + GOptionParseFunc pre_parse_func; + GOptionParseFunc post_parse_func; + GOptionErrorFunc error_func; +}; + +wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt) +{ + wxString ret; + + if (opt->short_name) + ret << _T("-") << opt->short_name; + if (opt->long_name) + { + if (!ret.empty()) + ret << _T(", "); + ret << _T("--") << opt->long_name; + + if (opt->arg_description) + ret << _T("=") << opt->arg_description; + } + + return _T(" ") + ret; +} + +#endif // __WXGTK26__ + +wxString +wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, + wxArrayString& desc) const +{ + 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)) + { + 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); + + // 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])); + + const gchar * const entryDesc = entries[n].description; + desc.push_back(entryDesc ? wxString(entryDesc) : _T("")); + } + + g_option_group_free (gtkOpts); + } +#else + wxUnusedVar(names); + wxUnusedVar(desc); +#endif // __WXGTK26__ + + return usage; +}