#endif
#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"
}
#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
// ----------------------------------------------------------------------------
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 );
#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() )
// 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);
#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)
{
#ifdef PANGO_VERSION_MAJOR
return "can't check";
#else // !PANGO_VERSION_MAJOR
+ wxUnusedVar(major);
+ wxUnusedVar(minor);
+ wxUnusedVar(micro);
+
return "too old headers";
#endif
}
int status = 0;
int rc = waitpid(pid, &status, WNOHANG);
- if ( rc == 0 )
- {
- // no, it didn't exit yet, continue waiting
- return;
- }
+ if ( rc == 0 )
+ {
+ // This can only happen if the child application closes our dummy
+ // pipe that is used to monitor its lifetime; in that case, our
+ // best bet is to pretend the process did terminate, because
+ // otherwise wxExecute() would hang indefinitely
+ // (OnExceptionWaiting() won't be called again, the descriptor
+ // is closed now).
+ wxLogDebug("Child process (PID %i) still alive, even though notification was received that it terminated.", pid);
+ }
+ else if ( rc == -1 )
+ {
+ // As above, if waitpid() fails, the best we can do is to log the
+ // error and pretend the child terminated:
+ wxLogSysError(_("Failed to check child process' status"));
+ }
// set exit code to -1 if something bad happened
- proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status)
- : -1;
+ proc_data->exitcode = (rc > 0 && WIFEXITED(status))
+ ? WEXITSTATUS(status)
+ : -1;
// child exited, end waiting
close(source);
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()
{
// wxGUIAppTraits
//-----------------------------------------------------------------------------
+wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()
+{
+ return new wxEventLoop();
+}
+
+
#if wxUSE_INTL
void wxGUIAppTraits::SetLocale()
{
wxString wxGUIAppTraits::GetDesktopEnvironment() const
{
+ wxString de = wxSystemOptions::GetOption(_T("gtk.desktop"));
#if wxUSE_DETECT_SM
- static 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__
names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
const gchar * const entryDesc = entries[n].description;
- desc.push_back(entryDesc ? wxString(entryDesc) : _T(""));
+ desc.push_back(wxString(entryDesc));
}
g_option_group_free (gtkOpts);
projects / wxWidgets.git / blobdiff