Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check for wxUSE_TIMER in headers, not the files including them

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-11 00:00:33 +00:00
parent 28fcfbfe09
commit 3c029873c6
7 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/unix/utilsx11.cpp
View File

@@ -41,7 +41,6 @@
#endif
// Various X11 Atoms used in this file:
static Atom _NET_WM_ICON = 0;
static Atom _NET_WM_STATE = 0;
static Atom _NET_WM_STATE_FULLSCREEN = 0;
static Atom _NET_WM_STATE_STAYS_ON_TOP = 0;
@@ -106,10 +105,13 @@ private:
// Setting icons for window manager:
// ----------------------------------------------------------------------------
#if wxUSE_IMAGE && !wxUSE_NANOX
static Atom _NET_WM_ICON = 0;
void
wxSetIconsX11(WXDisplay* display, WXWindow window, const wxIconBundle& ib)
{
#if !wxUSE_NANOX
size_t size = 0;
const size_t numIcons = ib.GetIconCount();
@@ -184,9 +186,9 @@ wxSetIconsX11(WXDisplay* display, WXWindow window, const wxIconBundle& ib)
WindowCast(window),
_NET_WM_ICON );
}
#endif // !wxUSE_NANOX
}
#endif // wxUSE_IMAGE && !wxUSE_NANOX
// ----------------------------------------------------------------------------
// Fullscreen mode: