projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
supporting full style mask
[wxWidgets.git]
/
src
/
unix
/
utilsx11.cpp
diff --git
a/src/unix/utilsx11.cpp
b/src/unix/utilsx11.cpp
index b9b5a4d40ef3a3e88afabc55c617cd6d334bed32..63a320083168db6360deb8099877a9cc91ac3aac 100644
(file)
--- a/
src/unix/utilsx11.cpp
+++ b/
src/unix/utilsx11.cpp
@@
-478,8
+478,8
@@
wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
wxMAKE_ATOM(_NET_WM_STATE_FULLSCREEN, disp);
if (wxQueryWMspecSupport(disp, root, _NET_WM_STATE_FULLSCREEN))
{
wxMAKE_ATOM(_NET_WM_STATE_FULLSCREEN, disp);
if (wxQueryWMspecSupport(disp, root, _NET_WM_STATE_FULLSCREEN))
{
- wxLogTrace(
_
T("fullscreen"),
-
_
T("detected _NET_WM_STATE_FULLSCREEN support"));
+ wxLogTrace(
wx
T("fullscreen"),
+
wx
T("detected _NET_WM_STATE_FULLSCREEN support"));
return wxX11_FS_WMSPEC;
}
return wxX11_FS_WMSPEC;
}
@@
-487,12
+487,12
@@
wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
// kwin doesn't understand any other method:
if (wxKwinRunning(disp, root))
{
// kwin doesn't understand any other method:
if (wxKwinRunning(disp, root))
{
- wxLogTrace(
_T("fullscreen"), _
T("detected kwin"));
+ wxLogTrace(
wxT("fullscreen"), wx
T("detected kwin"));
return wxX11_FS_KDE;
}
// finally, fall back to ICCCM heuristic method:
return wxX11_FS_KDE;
}
// finally, fall back to ICCCM heuristic method:
- wxLogTrace(
_T("fullscreen"), _
T("unknown WM, using _WIN_LAYER"));
+ wxLogTrace(
wxT("fullscreen"), wx
T("unknown WM, using _WIN_LAYER"));
return wxX11_FS_GENERIC;
}
return wxX11_FS_GENERIC;
}
@@
-537,7
+537,7
@@
void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow,
// FIXME what about tables??
// FIXME what about tables??
-int wxCharCodeXToWX(KeySym keySym)
+int wxCharCodeXToWX(
WX
KeySym keySym)
{
int id;
switch (keySym)
{
int id;
switch (keySym)
@@
-717,9
+717,9
@@
int wxCharCodeXToWX(KeySym keySym)
return id;
}
return id;
}
-KeySym wxCharCodeWXToX(int id)
+
WX
KeySym wxCharCodeWXToX(int id)
{
{
- KeySym keySym;
+
WX
KeySym keySym;
switch (id)
{
switch (id)
{
@@
-823,7
+823,7
@@
bool wxGetKeyState(wxKeyCode key)
if ( IsModifierKey(iKey) ) // If iKey is a modifier key, use a different method
{
XModifierKeymap *map = XGetModifierMapping(pDisplay);
if ( IsModifierKey(iKey) ) // If iKey is a modifier key, use a different method
{
XModifierKeymap *map = XGetModifierMapping(pDisplay);
- wxCHECK_MSG( map, false,
_
T("failed to get X11 modifiers map") );
+ wxCHECK_MSG( map, false,
wx
T("failed to get X11 modifiers map") );
for (int i = 0; i < 8; ++i)
{
for (int i = 0; i < 8; ++i)
{
@@
-910,7
+910,7
@@
bool wxDoLaunchDefaultBrowser(const wxString& url, int flags)
if (res >= 0 && errors.GetCount() == 0)
{
wxString cmd = output[0];
if (res >= 0 && errors.GetCount() == 0)
{
wxString cmd = output[0];
- cmd <<
_
T(' ') << url;
+ cmd <<
wx
T(' ') << url;
if (wxExecute(cmd))
return true;
}
if (wxExecute(cmd))
return true;
}