AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handle XOpenDisplay() failure in GetSM(); reformatted the code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-10-30 17:07:27 +00:00
parent 83c5d35ff3
commit 391bf008a7
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/gtk/utilsgtk.cpp
View File

@ -293,46 +293,52 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
#if wxUSE_DETECT_SM
static wxString GetSM()
{
Display *dpy;
SmcConn smc_conn;
char *vendor;
char *client_id_ret;
dpy = XOpenDisplay(NULL);
smc_conn = SmcOpenConnection(NULL, NULL,
999, 999,
0 /* mask */, NULL /* callbacks */,
NULL, &client_id_ret, 0, NULL);
if (smc_conn)
class Dpy
{
vendor = SmcVendor(smc_conn);
wxString ret = wxString::FromAscii( vendor );
free(vendor);
public:
Dpy() { m_dpy = XOpenDisplay(NULL); }
~Dpy() { if ( m_dpy ) XCloseDisplay(m_dpy); }
SmcCloseConnection(smc_conn, 0, NULL);
free(client_id_ret);
operator Display *() const { return m_dpy; }
private:
Display *m_dpy;
} dpy;
XCloseDisplay(dpy);
return ret;
}
return wxEmptyString;
if ( !dpy )
return wxEmptyString;
char *client_id;
SmcConn smc_conn = SmcOpenConnection(NULL, NULL,
999, 999,
0 /* mask */, NULL /* callbacks */,
NULL, &client_id,
0, NULL);
if ( !smc_conn )
return wxEmptyString;
char *vendor = SmcVendor(smc_conn);
wxString ret = wxString::FromAscii( vendor );
free(vendor);
SmcCloseConnection(smc_conn, 0, NULL);
free(client_id);
return ret;
}
#endif
#endif // wxUSE_DETECT_SM
wxString wxGUIAppTraits::GetDesktopEnvironment() const
{
#if wxUSE_DETECT_SM
wxString SM = GetSM();
const wxString SM = GetSM();
if (SM == wxT("GnomeSM"))
return wxT("GNOME");
if (SM == wxT("KDE"))
return wxT("KDE");
#endif
#endif // wxUSE_DETECT_SM
return wxEmptyString;
}