Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5364 in orxonox.OLD for trunk/src/lib/gui


Ignore:
Timestamp:
Oct 11, 2005, 11:48:19 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: some more definition of the GUI

Location:
trunk/src/lib/gui/gl_gui
Files:
8 edited
6 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/gui/gl_gui/Makefile.am

    r5363 r5364  
    1111libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
    1212                        glgui_widget.cc \
    13                         glgui_button.cc
     13                        glgui_button.cc \
     14                        glgui_pushbutton.cc \
     15                        glgui_container.cc \
     16                        glgui_box.cc \
     17                        glgui_frame.cc \
     18                        glgui_window.cc
     19
    1420
    1521noinst_HEADERS= glmenu/glmenu_imagescreen.h \
    1622                glgui.h \
    1723                glgui_widget.h \
    18                 glgui_button.h
     24                glgui_button.h \
     25                glgui_pushbutton.h \
     26                glgui_container.h \
     27                glgui_box.h \
     28                glgui_frame.h \
     29                glgui_window.h
     30
    1931
    2032

  • trunk/src/lib/gui/gl_gui/Makefile.in

    r5363 r5364  
    5656am_libORXglgui_a_OBJECTS = libORXglgui_a-glmenu_imagescreen.$(OBJEXT) \
    5757        libORXglgui_a-glgui_widget.$(OBJEXT) \
    58         libORXglgui_a-glgui_button.$(OBJEXT)
     58        libORXglgui_a-glgui_button.$(OBJEXT) \
     59        libORXglgui_a-glgui_pushbutton.$(OBJEXT) \
     60        libORXglgui_a-glgui_container.$(OBJEXT) \
     61        libORXglgui_a-glgui_box.$(OBJEXT) \
     62        libORXglgui_a-glgui_frame.$(OBJEXT) \
     63        libORXglgui_a-glgui_window.$(OBJEXT)
    5964libORXglgui_a_OBJECTS = $(am_libORXglgui_a_OBJECTS)
    6065DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6166depcomp = $(SHELL) $(top_srcdir)/depcomp
    6267am__depfiles_maybe = depfiles
    63 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libORXglgui_a-glgui_button.Po \
     68@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libORXglgui_a-glgui_box.Po \
     69@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_button.Po \
     70@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_container.Po \
     71@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_frame.Po \
     72@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Po \
    6473@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_widget.Po \
     74@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glgui_window.Po \
    6575@AMDEP_TRUE@    ./$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po
    6676CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    … …  
    189199libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
    190200                        glgui_widget.cc \
    191                         glgui_button.cc
     201                        glgui_button.cc \
     202                        glgui_pushbutton.cc \
     203                        glgui_container.cc \
     204                        glgui_box.cc \
     205                        glgui_frame.cc \
     206                        glgui_window.cc
    192207
    193208noinst_HEADERS = glmenu/glmenu_imagescreen.h \
    194209                glgui.h \
    195210                glgui_widget.h \
    196                 glgui_button.h
     211                glgui_button.h \
     212                glgui_pushbutton.h \
     213                glgui_container.h \
     214                glgui_box.h \
     215                glgui_frame.h \
     216                glgui_window.h
    197217
    198218EXTRA_DIST =
    … …  
    244264        -rm -f *.tab.c
    245265
     266@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_box.Po@am__quote@
    246267@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_button.Po@am__quote@
     268@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_container.Po@am__quote@
     269@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_frame.Po@am__quote@
     270@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Po@am__quote@
    247271@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_widget.Po@am__quote@
     272@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glgui_window.Po@am__quote@
    248273@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXglgui_a-glmenu_imagescreen.Po@am__quote@
    249274
    … …  
    311336@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    312337@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_button.obj `if test -f 'glgui_button.cc'; then $(CYGPATH_W) 'glgui_button.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_button.cc'; fi`
     338
     339libORXglgui_a-glgui_pushbutton.o: glgui_pushbutton.cc
     340@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_pushbutton.o -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Tpo" -c -o libORXglgui_a-glgui_pushbutton.o `test -f 'glgui_pushbutton.cc' || echo '$(srcdir)/'`glgui_pushbutton.cc; \
     341@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Tpo"; exit 1; fi
     342@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_pushbutton.cc' object='libORXglgui_a-glgui_pushbutton.o' libtool=no @AMDEPBACKSLASH@
     343@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_pushbutton.TPo' @AMDEPBACKSLASH@
     344@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     345@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_pushbutton.o `test -f 'glgui_pushbutton.cc' || echo '$(srcdir)/'`glgui_pushbutton.cc
     346
     347libORXglgui_a-glgui_pushbutton.obj: glgui_pushbutton.cc
     348@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_pushbutton.obj -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Tpo" -c -o libORXglgui_a-glgui_pushbutton.obj `if test -f 'glgui_pushbutton.cc'; then $(CYGPATH_W) 'glgui_pushbutton.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_pushbutton.cc'; fi`; \
     349@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Tpo"; exit 1; fi
     350@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_pushbutton.cc' object='libORXglgui_a-glgui_pushbutton.obj' libtool=no @AMDEPBACKSLASH@
     351@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_pushbutton.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_pushbutton.TPo' @AMDEPBACKSLASH@
     352@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     353@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_pushbutton.obj `if test -f 'glgui_pushbutton.cc'; then $(CYGPATH_W) 'glgui_pushbutton.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_pushbutton.cc'; fi`
     354
     355libORXglgui_a-glgui_container.o: glgui_container.cc
     356@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_container.o -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_container.Tpo" -c -o libORXglgui_a-glgui_container.o `test -f 'glgui_container.cc' || echo '$(srcdir)/'`glgui_container.cc; \
     357@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_container.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_container.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_container.Tpo"; exit 1; fi
     358@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_container.cc' object='libORXglgui_a-glgui_container.o' libtool=no @AMDEPBACKSLASH@
     359@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_container.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_container.TPo' @AMDEPBACKSLASH@
     360@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     361@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_container.o `test -f 'glgui_container.cc' || echo '$(srcdir)/'`glgui_container.cc
     362
     363libORXglgui_a-glgui_container.obj: glgui_container.cc
     364@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_container.obj -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_container.Tpo" -c -o libORXglgui_a-glgui_container.obj `if test -f 'glgui_container.cc'; then $(CYGPATH_W) 'glgui_container.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_container.cc'; fi`; \
     365@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_container.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_container.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_container.Tpo"; exit 1; fi
     366@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_container.cc' object='libORXglgui_a-glgui_container.obj' libtool=no @AMDEPBACKSLASH@
     367@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_container.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_container.TPo' @AMDEPBACKSLASH@
     368@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     369@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_container.obj `if test -f 'glgui_container.cc'; then $(CYGPATH_W) 'glgui_container.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_container.cc'; fi`
     370
     371libORXglgui_a-glgui_box.o: glgui_box.cc
     372@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_box.o -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_box.Tpo" -c -o libORXglgui_a-glgui_box.o `test -f 'glgui_box.cc' || echo '$(srcdir)/'`glgui_box.cc; \
     373@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_box.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_box.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_box.Tpo"; exit 1; fi
     374@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_box.cc' object='libORXglgui_a-glgui_box.o' libtool=no @AMDEPBACKSLASH@
     375@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_box.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_box.TPo' @AMDEPBACKSLASH@
     376@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     377@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_box.o `test -f 'glgui_box.cc' || echo '$(srcdir)/'`glgui_box.cc
     378
     379libORXglgui_a-glgui_box.obj: glgui_box.cc
     380@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_box.obj -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_box.Tpo" -c -o libORXglgui_a-glgui_box.obj `if test -f 'glgui_box.cc'; then $(CYGPATH_W) 'glgui_box.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_box.cc'; fi`; \
     381@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_box.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_box.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_box.Tpo"; exit 1; fi
     382@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_box.cc' object='libORXglgui_a-glgui_box.obj' libtool=no @AMDEPBACKSLASH@
     383@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_box.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_box.TPo' @AMDEPBACKSLASH@
     384@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     385@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_box.obj `if test -f 'glgui_box.cc'; then $(CYGPATH_W) 'glgui_box.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_box.cc'; fi`
     386
     387libORXglgui_a-glgui_frame.o: glgui_frame.cc
     388@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_frame.o -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_frame.Tpo" -c -o libORXglgui_a-glgui_frame.o `test -f 'glgui_frame.cc' || echo '$(srcdir)/'`glgui_frame.cc; \
     389@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_frame.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_frame.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_frame.Tpo"; exit 1; fi
     390@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_frame.cc' object='libORXglgui_a-glgui_frame.o' libtool=no @AMDEPBACKSLASH@
     391@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_frame.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_frame.TPo' @AMDEPBACKSLASH@
     392@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     393@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_frame.o `test -f 'glgui_frame.cc' || echo '$(srcdir)/'`glgui_frame.cc
     394
     395libORXglgui_a-glgui_frame.obj: glgui_frame.cc
     396@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_frame.obj -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_frame.Tpo" -c -o libORXglgui_a-glgui_frame.obj `if test -f 'glgui_frame.cc'; then $(CYGPATH_W) 'glgui_frame.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_frame.cc'; fi`; \
     397@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_frame.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_frame.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_frame.Tpo"; exit 1; fi
     398@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_frame.cc' object='libORXglgui_a-glgui_frame.obj' libtool=no @AMDEPBACKSLASH@
     399@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_frame.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_frame.TPo' @AMDEPBACKSLASH@
     400@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     401@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_frame.obj `if test -f 'glgui_frame.cc'; then $(CYGPATH_W) 'glgui_frame.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_frame.cc'; fi`
     402
     403libORXglgui_a-glgui_window.o: glgui_window.cc
     404@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_window.o -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_window.Tpo" -c -o libORXglgui_a-glgui_window.o `test -f 'glgui_window.cc' || echo '$(srcdir)/'`glgui_window.cc; \
     405@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_window.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_window.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_window.Tpo"; exit 1; fi
     406@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_window.cc' object='libORXglgui_a-glgui_window.o' libtool=no @AMDEPBACKSLASH@
     407@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_window.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_window.TPo' @AMDEPBACKSLASH@
     408@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     409@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_window.o `test -f 'glgui_window.cc' || echo '$(srcdir)/'`glgui_window.cc
     410
     411libORXglgui_a-glgui_window.obj: glgui_window.cc
     412@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXglgui_a-glgui_window.obj -MD -MP -MF "$(DEPDIR)/libORXglgui_a-glgui_window.Tpo" -c -o libORXglgui_a-glgui_window.obj `if test -f 'glgui_window.cc'; then $(CYGPATH_W) 'glgui_window.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_window.cc'; fi`; \
     413@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXglgui_a-glgui_window.Tpo" "$(DEPDIR)/libORXglgui_a-glgui_window.Po"; else rm -f "$(DEPDIR)/libORXglgui_a-glgui_window.Tpo"; exit 1; fi
     414@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='glgui_window.cc' object='libORXglgui_a-glgui_window.obj' libtool=no @AMDEPBACKSLASH@
     415@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXglgui_a-glgui_window.Po' tmpdepfile='$(DEPDIR)/libORXglgui_a-glgui_window.TPo' @AMDEPBACKSLASH@
     416@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     417@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXglgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXglgui_a-glgui_window.obj `if test -f 'glgui_window.cc'; then $(CYGPATH_W) 'glgui_window.cc'; else $(CYGPATH_W) '$(srcdir)/glgui_window.cc'; fi`
    313418uninstall-info-am:
    314419

  • trunk/src/lib/gui/gl_gui/glgui_box.cc

    r5363 r5364  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
    1717
    18 #include "glgui_button.h"
     18#include "glgui_box.h"
    1919
    2020using namespace std;
    … …  
    2323 * standard constructor
    2424*/
    25 GLGuiButton::GLGuiButton ()
     25GLGuiBox::GLGuiBox ()
    2626{
    2727  this->init();
    … …  
    3333 * standard deconstructor
    3434*/
    35 GLGuiButton::~GLGuiButton()
     35GLGuiBox::~GLGuiBox()
    3636{
    3737
    … …  
    4141 * initializes the GUI-element
    4242 */
    43 void GLGuiButton::init()
     43void GLGuiBox::init()
    4444{
    45   this->setClassID(CL_GLGUI_BUTTON, "GLGuiButton");
     45  this->setClassID(CL_GLGUI_BOX, "GLGuiBox");
    4646
    4747}
    4848
    4949/**
    50  * draws the GLGuiButton
     50 * draws the GLGuiBox
    5151 */
    52 void GLGuiButton::draw()
     52void GLGuiBox::draw()
    5353{
    5454

  • trunk/src/lib/gui/gl_gui/glgui_box.h

    r5363 r5364  
    11/*!
    2  * @file glgui_button.h
    3  * The gl_BUTTON widget of th openglGUI
     2 * @file glgui_.h
     3 * The gl_box widget of th openglGUI
    44 *
    55 */
    66
    7 #ifndef _GLGUI_BUTTON_H
    8 #define _GLGUI_BUTTON_H
     7#ifndef _GLGUI_BOX_H
     8#define _GLGUI_BOX_H
    99
    10 #include "glgui_widget.h"
    11 
    12 typedef enum
    13 {
    14   GLGui_Button_Active,
    15   GLGui_Button_Inactive,
    16   GLGui_Button_Pressed,
    17   GLGui_Button_Released,
    18   GLGui_Button_Activating,
    19   GLGui_Button_Deactivating,
    20 
    21 } GLGui_ButtonState;
     10#include "glgui_container.h"
    2211
    2312// FORWARD DECLARATION
    2413
    25 //! This is part of the openglGUI class
     14//! This is BOX part of the openglGUI class
    2615/**
    2716 *
    2817 */
    29 class GLGuiButton : public GLGuiWidget {
     18class GLGuiBox : public GLGuiContainer {
    3019
    3120 public:
    32   GLGuiButton();
    33   virtual ~GLGuiButton();
     21  GLGuiBox();
     22  virtual ~GLGuiBox();
    3423
    3524  void init();
    … …  
    3827
    3928 private:
    40   char*                text;
    41   GLGui_ButtonState    state;
    4229
    4330};

  • trunk/src/lib/gui/gl_gui/glgui_container.cc

    r5360 r5364  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
    1717
    18 #include "glgui_.h"
     18#include "glgui_container.h"
     19
     20#include "list.h"
     21
    1922
    2023using namespace std;
    … …  
    2326 * standard constructor
    2427*/
    25 GLGui::GLGui ()
     28GLGuiContainer::GLGuiContainer ()
    2629{
    2730  this->init();
    28 
     31  this->children = new tList<GLGuiWidget>;
    2932}
    3033
    … …  
    3336 * standard deconstructor
    3437*/
    35 GLGui::~GLGui()
     38GLGuiContainer::~GLGuiContainer()
    3639{
    37 
     40  delete this->children;
    3841}
    3942
    … …  
    4144 * initializes the GUI-element
    4245 */
    43 GLGui::init()
     46void GLGuiContainer::init()
    4447{
    45   this->setClassID(CL_GLGUI_, "GLGui");
     48  this->setClassID(CL_GLGUI_CONTAINER, "GLGuiContainer");
    4649
    4750}
    4851
    49 /**
    50  * draws the GLGui
    51  */
    52 void GLGui::draw()
     52void GLGuiContainer::showAll()
     53{
     54
     55  tIterator<GLGuiWidget>* itC = this->children->getIterator();
     56  GLGuiWidget* enumC = itC->firstElement();
     57  while (enumC != NULL)
     58  {
     59    if (enumC->isA(CL_GLGUI_CONTAINER))
     60      static_cast<GLGuiContainer*>(enumC)->showAll();
     61    else
     62     enumC->show();
     63    enumC = itC->nextElement();
     64  }
     65  delete itC;
     66
     67  this->show();
     68
     69}
     70
     71void GLGuiContainer::hideAll()
    5372{
    5473
    5574}
     75
     76
     77/**
     78 * draws the GLGuiContainer
     79 */
     80void GLGuiContainer::draw()
     81{
     82
     83}

  • trunk/src/lib/gui/gl_gui/glgui_container.h

    r5360 r5364  
    11/*!
    2  * @file glgui_.h
    3  * The gl_ widget of th openglGUI
     2 * @file glgui_container.h
     3 * The gl_container widget of th openglGUI
    44 *
    55 */
    66
    7 #ifndef _GLGUI__H
    8 #define _GLGUI__H
     7#ifndef _GLGUI_CONTAINER_H
     8#define _GLGUI_CONTAINER_H
    99
    10 #include "base_object.h"
     10#include "glgui_widget.h"
    1111
    1212// FORWARD DECLARATION
     13template<class T> class tList;
    1314
    1415//! This is part of the openglGUI class
    … …  
    1617 *
    1718 */
    18 class GLGui : public GLGui {
     19class GLGuiContainer : public GLGuiWidget {
    1920
    2021 public:
    21   GLGui();
    22   virtual ~GLGui();
     22  GLGuiContainer();
     23  virtual ~GLGuiContainer();
    2324
    2425  void init();
     26
     27  void hideAll();
     28  void showAll();
    2529
    2630  virtual void draw();
    2731
    2832 private:
     33  tList<GLGuiWidget>*           children;
    2934
    3035};

  • trunk/src/lib/gui/gl_gui/glgui_frame.cc

    r5363 r5364  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
    1717
    18 #include "glgui_button.h"
     18#include "glgui_frame.h"
    1919
    2020using namespace std;
    … …  
    2323 * standard constructor
    2424*/
    25 GLGuiButton::GLGuiButton ()
     25GLGuiFrame::GLGuiFrame ()
    2626{
    2727  this->init();
    … …  
    3333 * standard deconstructor
    3434*/
    35 GLGuiButton::~GLGuiButton()
     35GLGuiFrame::~GLGuiFrame()
    3636{
    3737
    … …  
    4141 * initializes the GUI-element
    4242 */
    43 void GLGuiButton::init()
     43void GLGuiFrame::init()
    4444{
    45   this->setClassID(CL_GLGUI_BUTTON, "GLGuiButton");
     45  this->setClassID(CL_GLGUI_FRAME, "GLGuiFrame");
    4646
    4747}
    4848
    4949/**
    50  * draws the GLGuiButton
     50 * draws the GLGuiFrame
    5151 */
    52 void GLGuiButton::draw()
     52void GLGuiFrame::draw()
    5353{
    5454

  • trunk/src/lib/gui/gl_gui/glgui_frame.h

    r5363 r5364  
    11/*!
    2  * @file glgui_button.h
    3  * The gl_BUTTON widget of th openglGUI
     2 * @file glgui_frame.h
     3 * The gl_frame widget of th openglGUI
    44 *
    55 */
    66
    7 #ifndef _GLGUI_BUTTON_H
    8 #define _GLGUI_BUTTON_H
     7#ifndef _GLGUI_FRAME_H
     8#define _GLGUI_FRAME_H
    99
    10 #include "glgui_widget.h"
    11 
    12 typedef enum
    13 {
    14   GLGui_Button_Active,
    15   GLGui_Button_Inactive,
    16   GLGui_Button_Pressed,
    17   GLGui_Button_Released,
    18   GLGui_Button_Activating,
    19   GLGui_Button_Deactivating,
    20 
    21 } GLGui_ButtonState;
     10#include "glgui_container.h"
    2211
    2312// FORWARD DECLARATION
    2413
    25 //! This is part of the openglGUI class
     14//! This is Frame part of the openglGUI class
    2615/**
    2716 *
    2817 */
    29 class GLGuiButton : public GLGuiWidget {
     18class GLGuiFrame : public GLGuiContainer {
    3019
    3120 public:
    32   GLGuiButton();
    33   virtual ~GLGuiButton();
     21  GLGuiFrame();
     22  virtual ~GLGuiFrame();
    3423
    3524  void init();
    … …  
    3827
    3928 private:
    40   char*                text;
    41   GLGui_ButtonState    state;
    4229
    4330};

  • trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc

    r5360 r5364  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
    1717
    18 #include "glgui_.h"
     18#include "glgui_pushbutton.h"
    1919
    2020using namespace std;
    … …  
    2323 * standard constructor
    2424*/
    25 GLGui::GLGui ()
     25GLGuiPushButton::GLGuiPushButton ()
    2626{
    2727  this->init();
    … …  
    3333 * standard deconstructor
    3434*/
    35 GLGui::~GLGui()
     35GLGuiPushButton::~GLGuiPushButton()
    3636{
    3737
    … …  
    4141 * initializes the GUI-element
    4242 */
    43 GLGui::init()
     43void GLGuiPushButton::init()
    4444{
    45   this->setClassID(CL_GLGUI_, "GLGui");
     45  this->setClassID(CL_GLGUI_PUSHBUTTON, "GLGuiPushButton");
    4646
    4747}
    4848
    4949/**
    50  * draws the GLGui
     50 * draws the GLGuiPushButton
    5151 */
    52 void GLGui::draw()
     52void GLGuiPushButton::draw()
    5353{
    5454

  • trunk/src/lib/gui/gl_gui/glgui_pushbutton.h

    r5360 r5364  
    11/*!
    2  * @file glgui_.h
    3  * The gl_ widget of th openglGUI
     2 * @file glgui_pushbutton.h
     3 * The gl_pushbutton widget of th openglGUI
    44 *
    55 */
    66
    7 #ifndef _GLGUI__H
    8 #define _GLGUI__H
     7#ifndef _GLGUI_PUSHBUTTON_H
     8#define _GLGUI_PUSHBUTTON_H
    99
    10 #include "base_object.h"
     10#include "glgui_button.h"
    1111
    1212// FORWARD DECLARATION
    … …  
    1616 *
    1717 */
    18 class GLGui : public GLGui {
     18class GLGuiPushButton : public GLGuiButton {
    1919
    2020 public:
    21   GLGui();
    22   virtual ~GLGui();
     21  GLGuiPushButton();
     22  virtual ~GLGuiPushButton();
    2323
    2424  void init();
    … …  
    3030};
    3131
    32 #endif /* _GLGUI__H */
     32#endif /* _GLGUI_PUSHBUTTON_H */

  • trunk/src/lib/gui/gl_gui/glgui_widget.cc

    r5363 r5364  
    2626{
    2727  this->init();
    28 
     28  this->setVisibility(true);
    2929}
    3030

  • trunk/src/lib/gui/gl_gui/glgui_widget.h

    r5363 r5364  
    2323  void init();
    2424
     25  void show();
     26  void hide();
     27
     28
    2529  virtual void draw() = 0;
    2630  virtual void update() = 0;

  • trunk/src/lib/gui/gl_gui/glgui_window.cc

    r5363 r5364  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
    1717
    18 #include "glgui_button.h"
     18#include "glgui_window.h"
    1919
    2020using namespace std;
    … …  
    2323 * standard constructor
    2424*/
    25 GLGuiButton::GLGuiButton ()
     25GLGuiWindow::GLGuiWindow ()
    2626{
    2727  this->init();
    … …  
    3333 * standard deconstructor
    3434*/
    35 GLGuiButton::~GLGuiButton()
     35GLGuiWindow::~GLGuiWindow()
    3636{
    3737
    … …  
    4141 * initializes the GUI-element
    4242 */
    43 void GLGuiButton::init()
     43void GLGuiWindow::init()
    4444{
    45   this->setClassID(CL_GLGUI_BUTTON, "GLGuiButton");
     45  this->setClassID(CL_GLGUI_WINDOW, "GLGuiWindow");
    4646
    4747}
    4848
    4949/**
    50  * draws the GLGuiButton
     50 * draws the GLGuiWindow
    5151 */
    52 void GLGuiButton::draw()
     52void GLGuiWindow::draw()
    5353{
    5454

  • trunk/src/lib/gui/gl_gui/glgui_window.h

    r5363 r5364  
    11/*!
    2  * @file glgui_button.h
    3  * The gl_BUTTON widget of th openglGUI
     2 * @file glgui_window.h
     3 * The gl_WINDOW widget of th openglGUI
    44 *
    55 */
    66
    7 #ifndef _GLGUI_BUTTON_H
    8 #define _GLGUI_BUTTON_H
     7#ifndef _GLGUI_WINDOW_H
     8#define _GLGUI_WINDOW_H
    99
    10 #include "glgui_widget.h"
    11 
    12 typedef enum
    13 {
    14   GLGui_Button_Active,
    15   GLGui_Button_Inactive,
    16   GLGui_Button_Pressed,
    17   GLGui_Button_Released,
    18   GLGui_Button_Activating,
    19   GLGui_Button_Deactivating,
    20 
    21 } GLGui_ButtonState;
     10#include "glgui_container.h"
    2211
    2312// FORWARD DECLARATION
    2413
    25 //! This is part of the openglGUI class
     14//! This is window part of the openglGUI class
    2615/**
    2716 *
    2817 */
    29 class GLGuiButton : public GLGuiWidget {
     18class GLGuiWindow : public GLGuiContainer {
    3019
    3120 public:
    32   GLGuiButton();
    33   virtual ~GLGuiButton();
     21  GLGuiWindow();
     22  virtual ~GLGuiWindow();
    3423
    3524  void init();
    … …  
    3827
    3928 private:
    40   char*                text;
    41   GLGui_ButtonState    state;
    4229
    4330};
Note: See TracChangeset for help on using the changeset viewer.