changed include guard and added gnome_win

This commit is contained in:
fluxgen 2002-02-17 10:28:18 +00:00
parent c6a79f9e42
commit 21d5810f1d

View file

@ -22,41 +22,21 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.hh,v 1.16 2002/02/08 13:35:20 fluxgen Exp $ // $Id: Screen.hh,v 1.17 2002/02/17 10:28:18 fluxgen Exp $
#ifndef _SCREEN_HH_
#define _SCREEN_HH_
#ifndef SCREEN_HH
#define SCREEN_HH
#include "Theme.hh" #include "Theme.hh"
#ifndef _BASEDISPLAY_HH_
#include "BaseDisplay.hh" #include "BaseDisplay.hh"
#endif
#ifndef _CONFIGMENU_HH_
#include "Configmenu.hh" #include "Configmenu.hh"
#endif
#ifndef _ICON_HH_
#include "Icon.hh" #include "Icon.hh"
#endif
#ifndef _NETIZEN_HH_
#include "Netizen.hh" #include "Netizen.hh"
#endif
#ifndef _ROOTMENU_HH_
#include "Rootmenu.hh" #include "Rootmenu.hh"
#endif
#ifndef _TIMER_HH_
#include "Timer.hh" #include "Timer.hh"
#endif
#ifndef _WORKSPACE_HH_
#include "Workspace.hh" #include "Workspace.hh"
#endif
#ifndef _WORKSPACEMENU_HH_
#include "Workspacemenu.hh" #include "Workspacemenu.hh"
#endif
#ifndef _FLUXBOX_HH_
#include "fluxbox.hh" #include "fluxbox.hh"
#endif
#ifdef SLIT #ifdef SLIT
# include "Slit.hh" # include "Slit.hh"
@ -251,6 +231,7 @@ public:
private: private:
#ifdef GNOME #ifdef GNOME
void initGnomeAtoms(); void initGnomeAtoms();
Window gnome_win;
#endif #endif
Theme *theme; Theme *theme;