[Python-ogre-commit] SF.net SVN: python-ogre: [398] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [398] trunk/python-ogre
|
From: <and...@us...> - 2007-09-28 15:31:43
|
Revision: 398
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=398&view=rev
Author: andy_miller
Date: 2007-09-28 08:31:47 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
Updates for plib to save files correctly under windows (file open with "w" instead of "wa")
Removed a couple of problem functions under linux compile
Updated to latest quickgui SVN 162
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/plib/ssgSaveAC.cxx
trunk/python-ogre/ThirdParty/plib/ssgSaveASC.cxx
trunk/python-ogre/ThirdParty/plib/ssgSaveASE.cxx
trunk/python-ogre/ThirdParty/plib/ssgSaveDXF.cxx
trunk/python-ogre/ThirdParty/plib/ssgSaveOBJ.cxx
trunk/python-ogre/ThirdParty/plib/ssgSaveTRI.cxx
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuList.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuList.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPoint.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuad.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuad.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRect.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRect.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISize.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIText.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIText.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalTrackBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalTrackBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.h
trunk/python-ogre/code_generators/plib/generate_code.py
trunk/python-ogre/code_generators/plib/hand_made_wrappers.py
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/plib/Makefile.am
trunk/python-ogre/ThirdParty/plib/Makefile.in
trunk/python-ogre/ThirdParty/plib/sg.vcproj.JNPR.amiller.user
trunk/python-ogre/ThirdParty/plib/ssg.vcproj.JNPR.amiller.user
Deleted: trunk/python-ogre/ThirdParty/plib/Makefile.am
===================================================================
--- trunk/python-ogre/ThirdParty/plib/Makefile.am 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/plib/Makefile.am 2007-09-28 15:31:47 UTC (rev 398)
@@ -1,16 +0,0 @@
-if BUILD_SG
-
-lib_LIBRARIES = libplibsg.a
-
-include_HEADERS = sg.h
-
-libplibsg_a_SOURCES = sg.cxx sgd.cxx \
- sgIsect.cxx sgdIsect.cxx \
- sgPerlinNoise.cxx
-
-INCLUDES = -I$(top_srcdir)/src/util
-
-endif
-
-EXTRA_DIST = sg.dsp
-
Deleted: trunk/python-ogre/ThirdParty/plib/Makefile.in
===================================================================
--- trunk/python-ogre/ThirdParty/plib/Makefile.in 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/plib/Makefile.in 2007-09-28 15:31:47 UTC (rev 398)
@@ -1,486 +0,0 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-SOURCES = $(libplibsg_a_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-subdir = src/sg
-DIST_COMMON = $(am__include_HEADERS_DIST) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
-CONFIG_CLEAN_FILES =
-AR = ar
-ARFLAGS = cru
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
-libLIBRARIES_INSTALL = $(INSTALL_DATA)
-LIBRARIES = $(lib_LIBRARIES)
-libplibsg_a_AR = $(AR) $(ARFLAGS)
-libplibsg_a_LIBADD =
-am__libplibsg_a_SOURCES_DIST = sg.cxx sgd.cxx sgIsect.cxx sgdIsect.cxx \
- sgPerlinNoise.cxx
-@BUILD_SG_TRUE@am_libplibsg_a_OBJECTS = sg.$(OBJEXT) sgd.$(OBJEXT) \
-@BUILD_SG_TRUE@ sgIsect.$(OBJEXT) sgdIsect.$(OBJEXT) \
-@BUILD_SG_TRUE@ sgPerlinNoise.$(OBJEXT)
-libplibsg_a_OBJECTS = $(am_libplibsg_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/sg.Po ./$(DEPDIR)/sgIsect.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/sgPerlinNoise.Po ./$(DEPDIR)/sgd.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/sgdIsect.Po
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
- -o $@
-SOURCES = $(libplibsg_a_SOURCES)
-DIST_SOURCES = $(am__libplibsg_a_SOURCES_DIST)
-am__include_HEADERS_DIST = sg.h
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_FNT_FALSE = @BUILD_FNT_FALSE@
-BUILD_FNT_TRUE = @BUILD_FNT_TRUE@
-BUILD_JS_FALSE = @BUILD_JS_FALSE@
-BUILD_JS_TRUE = @BUILD_JS_TRUE@
-BUILD_NET_FALSE = @BUILD_NET_FALSE@
-BUILD_NET_TRUE = @BUILD_NET_TRUE@
-BUILD_PSL_FALSE = @BUILD_PSL_FALSE@
-BUILD_PSL_TRUE = @BUILD_PSL_TRUE@
-BUILD_PUAUX_FALSE = @BUILD_PUAUX_FALSE@
-BUILD_PUAUX_TRUE = @BUILD_PUAUX_TRUE@
-BUILD_PUI_FALSE = @BUILD_PUI_FALSE@
-BUILD_PUI_TRUE = @BUILD_PUI_TRUE@
-BUILD_PW_FALSE = @BUILD_PW_FALSE@
-BUILD_PW_TRUE = @BUILD_PW_TRUE@
-BUILD_SG_FALSE = @BUILD_SG_FALSE@
-BUILD_SG_TRUE = @BUILD_SG_TRUE@
-BUILD_SL_FALSE = @BUILD_SL_FALSE@
-BUILD_SL_TRUE = @BUILD_SL_TRUE@
-BUILD_SSGAUX_FALSE = @BUILD_SSGAUX_FALSE@
-BUILD_SSGAUX_TRUE = @BUILD_SSGAUX_TRUE@
-BUILD_SSG_FALSE = @BUILD_SSG_FALSE@
-BUILD_SSG_TRUE = @BUILD_SSG_TRUE@
-BUILD_UL_FALSE = @BUILD_UL_FALSE@
-BUILD_UL_TRUE = @BUILD_UL_TRUE@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-@BUILD_SG_TRUE@lib_LIBRARIES = libplibsg.a
-@BUILD_SG_TRUE@include_HEADERS = sg.h
-@BUILD_SG_TRUE@libplibsg_a_SOURCES = sg.cxx sgd.cxx \
-@BUILD_SG_TRUE@ sgIsect.cxx sgdIsect.cxx \
-@BUILD_SG_TRUE@ sgPerlinNoise.cxx
-
-@BUILD_SG_TRUE@INCLUDES = -I$(top_srcdir)/src/util
-EXTRA_DIST = sg.dsp
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cxx .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/sg/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/sg/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLIBRARIES: $(lib_LIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
- @$(POST_INSTALL)
- @list='$(lib_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
- $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
- else :; fi; \
- done
-
-uninstall-libLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LIBRARIES)'; for p in $$list; do \
- p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-
-clean-libLIBRARIES:
- -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
-libplibsg.a: $(libplibsg_a_OBJECTS) $(libplibsg_a_DEPENDENCIES)
- -rm -f libplibsg.a
- $(libplibsg_a_AR) libplibsg.a $(libplibsg_a_OBJECTS) $(libplibsg_a_LIBADD)
- $(RANLIB) libplibsg.a
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgIsect.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgPerlinNoise.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgdIsect.Po@am__quote@
-
-.cxx.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
-.cxx.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
-install-includeHEADERS: $(include_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-
-uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES) $(HEADERS)
-installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLIBRARIES mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includeHEADERS
-
-install-exec-am: install-libLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
- uninstall-libLIBRARIES
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLIBRARIES ctags distclean distclean-compile \
- distclean-generic distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am \
- install-includeHEADERS install-info install-info-am \
- install-libLIBRARIES install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-includeHEADERS uninstall-info-am \
- uninstall-libLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Deleted: trunk/python-ogre/ThirdParty/plib/sg.vcproj.JNPR.amiller.user
===================================================================
--- trunk/python-ogre/ThirdParty/plib/sg.vcproj.JNPR.amiller.user 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/plib/sg.vcproj.JNPR.amiller.user 2007-09-28 15:31:47 UTC (rev 398)
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
- ProjectType="Visual C++"
- Version="8.00"
- ShowAllFiles="false"
- >
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- >
- <DebugSettings
- Command=""
- WorkingDirectory=""
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- Remote="1"
- RemoteMachine="AMILLER-X31-1"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment=""
- EnvironmentMerge="true"
- DebuggerFlavor=""
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- >
- <DebugSettings
- Command=""
- WorkingDirectory=""
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- Remote="1"
- RemoteMachine="AMILLER-X31-1"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment=""
- EnvironmentMerge="true"
- DebuggerFlavor=""
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- </Configurations>
-</VisualStudioUserFile>
Deleted: trunk/python-ogre/ThirdParty/plib/ssg.vcproj.JNPR.amiller.user
===================================================================
--- trunk/python-ogre/ThirdParty/plib/ssg.vcproj.JNPR.amiller.user 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/plib/ssg.vcproj.JNPR.amiller.user 2007-09-28 15:31:47 UTC (rev 398)
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
- ProjectType="Visual C++"
- Version="8.00"
- ShowAllFiles="false"
- >
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- >
- <DebugSettings
- Command=""
- WorkingDirectory=""
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- Remote="1"
- RemoteMachine="AMILLER-X31-1"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment=""
- EnvironmentMerge="true"
- DebuggerFlavor=""
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- >
- <DebugSettings
- Command=""
- WorkingDirectory=""
- CommandArguments=""
- Attach="false"
- DebuggerType="3"
- Remote="1"
- RemoteMachine="AMILLER-X31-1"
- RemoteCommand=""
- HttpUrl=""
- PDBPath=""
- SQLDebugging=""
- Environment=""
- EnvironmentMerge="true"
- DebuggerFlavor=""
- MPIRunCommand=""
- MPIRunArguments=""
- MPIRunWorkingDirectory=""
- ApplicationCommand=""
- ApplicationArguments=""
- ShimCommand=""
- MPIAcceptMode=""
- MPIAcceptFilter=""
- />
- </Configuration>
- </Configurations>
-</VisualStudioUserFile>
Modified: trunk/python-ogre/ThirdParty/plib/ssgSaveAC.cxx
===================================================================
--- trunk/python-ogre/ThirdParty/plib/ssgSaveAC.cxx 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/plib/ssgSaveAC.cxx 2007-09-28 15:31:47 UTC (rev 398)
@@ -179,7 +179,7 @@
{
int i ;
- save_fd = fopen ( filename, "wa" ) ;
+ save_fd = fopen ( filename, "w" ) ;
if ( save_fd == NULL )
{
Modified: trunk/python-ogre/ThirdParty/plib/ssgSaveASC.cxx
===================================================================
--- trunk/python-ogre/ThirdParty/plib/ssgSaveASC.cxx 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/plib/ssgSaveASC.cxx 2007-09-28 15:31:47 UTC (rev 398)
@@ -209,7 +209,7 @@
int ssgSaveASC ( const char *filename, ssgEntity *ent )
{
- save_fd = fopen ( filename, "wa" ) ;
+ save_fd = fopen ( filename, "w" ) ;
if ( save_fd == NULL )
{
Modified: trunk/python-ogre/ThirdParty/plib/ssgSaveASE.cxx
===================================================================
--- trunk/python-ogre/ThirdParty/plib/ssgSaveASE.cxx 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/plib/ssgSaveASE.cxx 2007-09-28 15:31:47 UTC (rev 398)
@@ -327,7 +327,7 @@
int ssgSaveASE ( const char *filename, ssgEntity *ent )
{
- save_fd = fopen ( filename, "wa" ) ;
+ save_fd = fopen ( filename, "w" ) ;
if ( save_fd == NULL )
{
Modified: trunk/python-ogre/ThirdParty/plib/ssgSaveDXF.cxx
===================================================================
--- trunk/python-ogre/ThirdParty/plib/ssgSaveDXF.cxx 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/plib/ssgSaveDXF.cxx 2007-09-28 15:31:47 UTC (rev 398)
@@ -126,7 +126,7 @@
int ssgSaveDXF ( const char *filename, ssgEntity *ent )
{
- fileout = fopen ( filename, "wa" ) ;
+ fileout = fopen ( filename, "w" ) ;
if ( fileout == NULL )
{
Modified: trunk/python-ogre/ThirdParty/plib/ssgSaveOBJ.cxx
===================================================================
--- trunk/python-ogre/ThirdParty/plib/ssgSaveOBJ.cxx 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/plib/ssgSaveOBJ.cxx 2007-09-28 15:31:47 UTC (rev 398)
@@ -178,7 +178,7 @@
John Burkardt
*/
{
- fileout = fopen ( filename, "wa" ) ;
+ fileout = fopen ( filename, "w" ) ;
if ( fileout == NULL )
{
Modified: trunk/python-ogre/ThirdParty/plib/ssgSaveTRI.cxx
===================================================================
--- trunk/python-ogre/ThirdParty/plib/ssgSaveTRI.cxx 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/plib/ssgSaveTRI.cxx 2007-09-28 15:31:47 UTC (rev 398)
@@ -96,7 +96,7 @@
*/
{
- fileout = fopen ( filename, "wa" ) ;
+ fileout = fopen ( filename, "w" ) ;
if ( fileout == NULL )
{
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp 2007-09-28 15:31:47 UTC (rev 398)
@@ -5,14 +5,14 @@
namespace QuickGUI
{
- Button::Button(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
- Label(name,type,dimensions,pMode,sMode,texture,container,ParentWidget,gm),
+ Button::Button(const Ogre::String& name, Type type, const Rect& pixelDimensions, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
+ Label(name,type,pixelDimensions,texture,container,ParentWidget,gm),
mButtonDown(false)
{
// Other widgets call this constructor, and they handle quad/quadcontainer their own way.
if(mWidgetType == TYPE_BUTTON)
{
- mQuad->setLayer(Quad::LAYER_CHILD);
+ mQuad->setLayer(mParentWidget->getQuad()->getLayer());
}
mButtonDownTexture = mTextureName + ".down" + mTextureExtension;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.h 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.h 2007-09-28 15:31:47 UTC (rev 398)
@@ -39,7 +39,7 @@
@param
ParentWidget parent widget which created this widget.
*/
- Button(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm);
+ Button(const Ogre::String& name, Type type, const Rect& pixelDimensions, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm);
/**
* Useful when you want to simulate the button being pressed down by the mouse.
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp 2007-09-28 15:31:47 UTC (rev 398)
@@ -4,8 +4,8 @@
namespace QuickGUI
{
- ComboBox::ComboBox(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
- Label(name,type,dimensions,pMode,sMode,texture,container,ParentWidget,gm)
+ ComboBox::ComboBox(const Ogre::String& name, Type type, const Rect& pixelDimensions, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
+ Label(name,type,pixelDimensions,texture,container,ParentWidget,gm)
{
// Other widgets call this constructor, and they handle quad/quadcontainer their own way.
if(mWidgetType == TYPE_COMBOBOX)
@@ -19,24 +19,16 @@
addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&ComboBox::onMouseButtonDown,this);
addEventHandler(EVENT_MOUSE_BUTTON_UP,&ComboBox::onMouseButtonUp,this);
- // Create CloseButton - remember to position it relative to it's parent (TitleBar)
- // Height of the Title Bar
- Ogre::Real height = (mAbsoluteDimensions.height / mAbsoluteDimensions.width);
- // Button has same height as width - Make the button slightly smaller that the titlebar height
- Ogre::Real buttonHeight = 0.8;
- Ogre::Real buttonWidth = (height * buttonHeight);
- // Make a 5 pixel buffer
- Ogre::Real buffer = 5.0 / mPixelDimensions.width;
- Rect bDimensions = Rect((1 - (buttonWidth + buffer)),0.1,buttonWidth,buttonHeight);
- mButton = new Button(mInstanceName+".ComboButton",TYPE_BUTTON,bDimensions,QGUI_GMM_RELATIVE,QGUI_GMM_RELATIVE,mTextureName + ".button" + mTextureExtension,mQuadContainer,this,mGUIManager);
+ Ogre::Real ButtonSize = mSize.height - 4;
+ mButton = new Button(mInstanceName+".ComboButton",TYPE_BUTTON,Rect(mSize.width - ButtonSize - 2,2,ButtonSize,ButtonSize),mTextureName + ".button" + mTextureExtension,mQuadContainer,this,mGUIManager);
mButton->addEventHandler(Widget::EVENT_MOUSE_BUTTON_DOWN,&ComboBox::toggleDropDownListVisibility,this);
mButton->addEventHandler(Widget::EVENT_MOUSE_BUTTON_UP,&ComboBox::applyButtonDownImage,this);
mButton->addEventHandler(Widget::EVENT_MOUSE_ENTER,&ComboBox::applyButtonDownImage,this);
mButton->addEventHandler(Widget::EVENT_MOUSE_LEAVE,&ComboBox::applyButtonDownImage,this);
- mTextBoundsRelativeSize = Size(1 - buttonWidth,1);
+ mTextBoundsPixelSize = Size(mSize.width - ButtonSize - 2,mSize.height);
- mList = new List(mInstanceName+".List",TYPE_LIST,Rect(0,1,1,0),QGUI_GMM_RELATIVE,QGUI_GMM_RELATIVE,mTextureName + ".list" + mTextureExtension,mQuadContainer,this,mGUIManager);
+ mList = new List(mInstanceName+".List",TYPE_LIST,Rect(0,mSize.height,mSize.width,0),mTextureName + ".list" + mTextureExtension,mQuadContainer,this,mGUIManager);
mList->setShowWithParent(false);
mList->setOffset(mOffset + 2);
mList->hide();
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h 2007-09-28 15:31:47 UTC (rev 398)
@@ -43,7 +43,7 @@
@param
ParentWidget parent widget which created this widget.
*/
- ComboBox(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm);
+ ComboBox(const Ogre::String& name, Type type, const Rect& pixelDimensions, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm);
/*
* Event Handler tied to ListItems, causing them to hide lists on mouse button up.
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.cpp 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.cpp 2007-09-28 15:31:47 UTC (rev 398)
@@ -3,22 +3,19 @@
namespace QuickGUI
{
- HorizontalScrollBar::HorizontalScrollBar(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, const Ogre::String& texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
- Image(name,type,dimensions,pMode,sMode,texture,container,ParentWidget,gm),
+ HorizontalScrollBar::HorizontalScrollBar(const Ogre::String& name, Type type, const Rect& pixelDimensions, const Ogre::String& texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
+ Image(name,type,pixelDimensions,texture,container,ParentWidget,gm),
mMinSliderPosition(0),
mMaxSliderPosition(1),
- mSliderPixelHeight(mPixelDimensions.height),
- mScrollButtonPixelSize(Size(mPixelDimensions.height,mPixelDimensions.height)),
mMouseDownOnTrack(false),
mSmallChange(0.1),
mLargeChange(0.4),
- mRelativeSliderPosition(Point::ZERO),
mRepeatTimer(0),
mScrollRepeatTime(0.5)
{
if(mWidgetType == TYPE_SCROLLBAR_HORIZONTAL)
{
- mQuad->setLayer(Quad::LAYER_CHILD);
+ mQuad->setLayer(mParentWidget->getQuad()->getLayer());
}
addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&HorizontalScrollBar::onMouseDownOnTrack,this);
@@ -30,30 +27,29 @@
mScrollLeftTextureName = mTextureName + ".left" + mTextureExtension;
mScrollRightTextureName = mTextureName + ".right" + mTextureExtension;
- mSlider = new Button(mInstanceName+".Slider",TYPE_BUTTON,Rect(0,0,1,1),QGUI_GMM_RELATIVE,QGUI_GMM_RELATIVE,mSliderTextureName,mQuadContainer,this,mGUIManager);
+ mSlider = new Button(mInstanceName+".Slider",TYPE_BUTTON,Rect(0,0,mSize.height,mSize.height),mSliderTextureName,mQuadContainer,this,mGUIManager);
mSlider->enableDragging(true);
mSlider->constrainDragging(true,false);
- mSlider->getQuad()->setLayer(mQuad->getLayer());
mSlider->addEventHandler(EVENT_DRAGGED,&HorizontalScrollBar::onSliderDragged,this);
- Ogre::Real scrollBarHeight = mPixelDimensions.height;
- mScrollLeft1 = new Button(mInstanceName+".Left1",TYPE_BUTTON,Rect(0,0,scrollBarHeight,scrollBarHeight),QGUI_GMM_PIXELS,QGUI_GMM_PIXELS,mScrollLeftTextureName,mQuadContainer,this,mGUIManager);
- mScrollLeft1->getQuad()->setLayer(mQuad->getLayer());
+ Ogre::Real scrollBarHeight = mSize.height;
+ mScrollLeft1 = new Button(mInstanceName+".Left1",TYPE_BUTTON,Rect(0,0,mSize.height,mSize.height),mScrollLeftTextureName,mQuadContainer,this,mGUIManager);
+ mScrollLeft1->setShowWithParent(false);
mScrollLeft1->hide();
mScrollLeft1->addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&HorizontalScrollBar::onScrollLeftDown,this);
- mScrollLeft2 = new Button(mInstanceName+".Left2",TYPE_BUTTON,Rect(0,0,scrollBarHeight,scrollBarHeight),QGUI_GMM_PIXELS,QGUI_GMM_PIXELS,mScrollLeftTextureName,mQuadContainer,this,mGUIManager);
- mScrollLeft2->getQuad()->setLayer(mQuad->getLayer());
+ mScrollLeft2 = new Button(mInstanceName+".Left2",TYPE_BUTTON,Rect(0,0,mSize.height,mSize.height),mScrollLeftTextureName,mQuadContainer,this,mGUIManager);
+ mScrollLeft2->setShowWithParent(false);
mScrollLeft2->hide();
mScrollLeft2->addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&HorizontalScrollBar::onScrollLeftDown,this);
- mScrollRight1 = new Button(mInstanceName+".Right1",TYPE_BUTTON,Rect(0,0,scrollBarHeight,scrollBarHeight),QGUI_GMM_PIXELS,QGUI_GMM_PIXELS,mScrollRightTextureName,mQuadContainer,this,mGUIManager);
- mScrollRight1->getQuad()->setLayer(mQuad->getLayer());
+ mScrollRight1 = new Button(mInstanceName+".Right1",TYPE_BUTTON,Rect(0,0,mSize.height,mSize.height),mScrollRightTextureName,mQuadContainer,this,mGUIManager);
+ mScrollRight1->setShowWithParent(false);
mScrollRight1->hide();
mScrollRight1->addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&HorizontalScrollBar::onScrollRightDown,this);
- mScrollRight2 = new Button(mInstanceName+".Right2",TYPE_BUTTON,Rect(0,0,scrollBarHeight,scrollBarHeight),QGUI_GMM_PIXELS,QGUI_GMM_PIXELS,mScrollRightTextureName,mQuadContainer,this,mGUIManager);
- mScrollRight2->getQuad()->setLayer(mQuad->getLayer());
+ mScrollRight2 = new Button(mInstanceName+".Right2",TYPE_BUTTON,Rect(0,0,mSize.height,mSize.height),mScrollRightTextureName,mQuadContainer,this,mGUIManager);
+ mScrollRight2->setShowWithParent(false);
mScrollRight2->hide();
mScrollRight2->addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&HorizontalScrollBar::onScrollRightDown,this);
@@ -74,23 +70,21 @@
mSlider->setXPosition(mMinSliderPosition);
else if(sliderEnd > mMaxSliderPosition)
mSlider->setXPosition(mMaxSliderPosition - mSlider->getWidth());
-
- mRelativeSliderPosition = mSlider->getPosition();
}
void HorizontalScrollBar::_positionScrollButtons()
{
Rect leftDimensions = mScrollLeft1->getDimensions();
Rect rightDimensions = mScrollRight1->getDimensions();
- mScrollLeft1->setPosition(0,0.5 - (leftDimensions.height/2.0));
- mScrollRight1->setPosition(leftDimensions.width,0.5 - (rightDimensions.height/2.0));
- mScrollLeft2->setPosition(1 - rightDimensions.width - leftDimensions.width,0.5 - (leftDimensions.height/2.0));
- mScrollRight2->setPosition(1 - rightDimensions.width,0.5 - (rightDimensions.height/2.0));
+ mScrollLeft1->setPosition(0,(mSize.height/2.0) - (leftDimensions.height/2.0));
+ mScrollRight1->setPosition(leftDimensions.width,(mSize.height/2.0) - (rightDimensions.height/2.0));
+ mScrollLeft2->setPosition(mSize.width - rightDimensions.width - leftDimensions.width,(mSize.height/2.0) - (leftDimensions.height/2.0));
+ mScrollRight2->setPosition(mSize.width - rightDimensions.width,(mSize.height/2.0) - (rightDimensions.height/2.0));
}
void HorizontalScrollBar::_scroll(Ogre::Real change, ScrollEventArgs args)
{
- mSlider->move(change,0);
+ mSlider->moveX(change * mSize.width);
_constrainSlider();
@@ -101,12 +95,9 @@
void HorizontalScrollBar::_setValue(Ogre::Real value)
{
- if( value < 0.0 )
- value = 0.0;
- if( value > (mMaxSliderPosition - mSlider->getWidth()) )
- value = (mMaxSliderPosition - mSlider->getWidth());
+ Ogre::Real pixelX = (value * (mMaxSliderPosition - mMinSliderPosition)) + mMinSliderPosition;
- mSlider->setXPosition(mMinSliderPosition + value);
+ mSlider->setXPosition(pixelX);
_constrainSlider();
}
@@ -167,28 +158,19 @@
return mScrollRepeatTime;
}
- Size HorizontalScrollBar::getScrollButtonSize(GuiMetricsMode mode)
+ Size HorizontalScrollBar::getScrollButtonSize()
{
- switch(mode)
- {
- case QGUI_GMM_ABSOLUTE:
- return Size(mScrollButtonPixelSize.width / mGUIManager->getViewportWidth(),mScrollButtonPixelSize.height / mGUIManager->getViewportHeight());
- case QGUI_GMM_PIXELS:
- return mScrollButtonPixelSize;
- case QGUI_GMM_RELATIVE:
- default:
- return Size(mScrollButtonPixelSize.width / mPixelDimensions.width,mScrollButtonPixelSize.height / mPixelDimensions.height);
- }
+ return mScrollLeft1->getSize();
}
- Ogre::Real HorizontalScrollBar::getSliderHeight(GuiMetricsMode mode)
+ Ogre::Real HorizontalScrollBar::getSliderHeight()
{
- return mSlider->getHeight(mode);
+ return mSlider->getHeight();
}
- Ogre::Real HorizontalScrollBar::getSliderWidth(GuiMetricsMode mode)
+ Ogre::Real HorizontalScrollBar::getSliderWidth()
{
- return mSlider->getWidth(mode);
+ return mSlider->getWidth();
}
Ogre::Real HorizontalScrollBar::getSmallChange()
@@ -199,10 +181,6 @@
Ogre::Real HorizontalScrollBar::getValue()
{
Ogre::Real retVal = ((mSlider->getXPosition() - mMinSliderPosition) / (mMaxSliderPosition - mMinSliderPosition));
-
- if(retVal < 0)
- retVal = 0;
-
return retVal;
}
@@ -212,9 +190,11 @@
{
mMouseDownOnTrack = true;
+ Point mousePosition = dynamic_cast<const MouseEventArgs&>(args).position - getScreenPosition();
+
ScrollEventArgs scrollArgs(this);
// if mouse clicked left of track, scroll left.
- if(dynamic_cast<const MouseEventArgs&>(args).position.x < mSlider->getXPosition(QGUI_GMM_PIXELS))
+ if(mousePosition.x < mSlider->getXPosition())
{
scrollArgs.sliderIncreasedPosition = false;
_scroll(-mLargeChange,scrollArgs);
@@ -244,7 +224,6 @@
void HorizontalScrollBar::onSizeChanged(const EventArgs& args)
{
- mSlider->setWidth(mSlider->getWidth());
_positionScrollButtons();
_constrainSlider();
}
@@ -272,8 +251,7 @@
void HorizontalScrollBar::onSliderDragged(const EventArgs& args)
{
ScrollEventArgs scrollArgs(this);
- Point currentRelativeSliderPosition = dynamic_cast<const WidgetEventArgs&>(args).widget->getPosition();
- if(currentRelativeSliderPosition.x < mRelativeSliderPosition.x)
+ if(dynamic_cast<const MouseEventArgs&>(args).moveDelta.x < 0)
scrollArgs.sliderIncreasedPosition = false;
else
scrollArgs.sliderIncreasedPosition = true;
@@ -328,7 +306,7 @@
{
Rect temp = mScrollRight1->getDimensions();
mMinSliderPosition = temp.x + temp.width;
- mMaxSliderPosition = 1.0;
+ mMaxSliderPosition = mSize.width;
}
break;
case BUTTON_LAYOUT_ADJACENT_RIGHT:
@@ -367,7 +345,7 @@
break;
case BUTTON_LAYOUT_NONE:
mMinSliderPosition = 0.0;
- mMaxSliderPosition = 1.0;
+ mMaxSliderPosition = mSize.width;
break;
case BUTTON_LAYOUT_OPPOSITE:
{
@@ -380,8 +358,6 @@
break;
}
- // adjust slider size to fit within the new region: (mMinSliderPosition to mMaxSliderPosition)
- mSlider->setWidth(mSlider->getWidth() * (mMaxSliderPosition - mMinSliderPosition));
_constrainSlider();
if(mVisible)
@@ -399,17 +375,14 @@
mLargeChange = change;
}
- void HorizontalScrollBar::setScrollButtonSize(Size s, GuiMetricsMode mode)
+ void HorizontalScrollBar::setScrollButtonSize(Size pixelSize)
{
- mScrollLeft1->setSize(s,mode);
- mScrollLeft2->setSize(s,mode);
- mScrollRight1->setSize(s,mode);
- mScrollRight2->setSize(s,mode);
+ mScrollLeft1->setSize(pixelSize);
+ mScrollLeft2->setSize(pixelSize);
+ mScrollRight1->setSize(pixelSize);
+ mScrollRight2->setSize(pixelSize);
_positionScrollButtons();
-
- mScrollButtonPixelSize = mScrollLeft1->getSize(QGUI_GMM_PIXELS);
-
setButtonLayout(mButtonLayout);
}
@@ -418,16 +391,15 @@
mScrollRepeatTime = timeInSeconds;
}
- void HorizontalScrollBar::setSliderHeight(Ogre::Real height, GuiMetricsMode mode)
+ void HorizontalScrollBar::setSliderHeight(Ogre::Real pixelHeight)
{
- mSlider->setHeight(height,mode);
- mSlider->setYPosition(0.5 - (mSlider->getHeight()/2.0));
- mSliderPixelHeight = mSlider->getHeight(QGUI_GMM_PIXELS);
+ mSlider->setHeight(pixelHeight);
+ mSlider->setYPosition((mSize.height/2.0) - (mSlider->getHeight()/2.0));
}
- void HorizontalScrollBar::setSliderWidth(Ogre::Real relativeWidth)
+ void HorizontalScrollBar::setSliderWidth(Ogre::Real pixelWidth)
{
- mSlider->setWidth(relativeWidth * (mMaxSliderPosition - mMinSliderPosition));
+ mSlider->setWidth(pixelWidth * (mMaxSliderPosition - mMinSliderPosition));
_constrainSlider();
}
@@ -438,12 +410,14 @@
void HorizontalScrollBar::setValue(Ogre::Real value)
{
+ value = (value * mSize.width) + mMinSliderPosition;
+
if( value < 0.0 )
value = 0.0;
if( value > (mMaxSliderPosition - mSlider->getWidth()) )
value = (mMaxSliderPosition - mSlider->getWidth());
- mSlider->setXPosition(mMinSliderPosition + value);
+ mSlider->setXPosition(value);
ScrollEventArgs scrollArgs(this);
Ogre::Real currentValue = getValue();
@@ -457,29 +431,8 @@
void HorizontalScrollBar::show()
{
- mQuad->setVisible(true);
-
- // show children, except for Windows and lists of MenuList or ComboBox Widget.
- std::vector<Widget*>::iterator it;
- for( it = mChildWidgets.begin(); it != mChildWidgets.end(); ++it )
- {
- if( ((*it)->getWidgetType() == TYPE_BUTTON) &&
- ((*it)->getInstanceName() != mSlider->getInstanceName()) )
- continue;
-
- (*it)->show();
- }
-
+ Image::show();
_showButtons();
-
- // Only fire event if we change visibility. If we were already visible, don't fire.
- if(!mVisible)
- {
- WidgetEventArgs args(this);
- fireEvent(EVENT_SHOWN,args);
- }
-
- mVisible = true;
}
void HorizontalScrollBar::timeElapsed(Ogre::Real time)
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.h 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.h 2007-09-28 15:31:47 UTC (rev 398)
@@ -6,7 +6,7 @@
namespace QuickGUI
{
- class HorizontalScrollBar :
+ class _QuickGUIExport HorizontalScrollBar :
public Image
{
public:
@@ -41,7 +41,7 @@
@note
Vertical or Horizontal TrackBars are derived from a comparison between width and height.
*/
- HorizontalScrollBar(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, const Ogre::String& texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm);
+ HorizontalScrollBar(const Ogre::String& name, Type type, const Rect& pixelDimensions, const Ogre::String& texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm);
// Same as setValue, except that the scroll event is not fired.
void _setValue(Ogre::Real value);
@@ -62,9 +62,9 @@
* before another scroll occurs.
*/
Ogre::Real getRepeatTime();
- Size getScrollButtonSize(GuiMetricsMode mode = QGUI_GMM_RELATIVE);
- Ogre::Real getSliderHeight(GuiMetricsMode mode = QGUI_GMM_RELATIVE);
- Ogre::Real getSliderWidth(GuiMetricsMode mode = QGUI_GMM_RELATIVE);
+ Size getScrollButtonSize();
+ Ogre::Real getSliderHeight();
+ Ogre::Real getSliderWidth();
Ogre::Real getSmallChange();
/**
* Gets the numerical value representing the position of the left end of the slider, relative to the track bounds.
@@ -82,13 +82,13 @@
void setBaseTexture(const Ogre::String& textureName);
void setButtonLayout(ButtonLayout layout);
void setLargeChange(Ogre::Real change);
- void setScrollButtonSize(Size s, GuiMetricsMode mode = QGUI_GMM_RELATIVE);
+ void setScrollButtonSize(Size s);
/**
* Sets the amount of time the left mouse button is down over a button or bar
* before another scroll occurs.
*/
void setScrollRepeatTime(Ogre::Real timeInSeconds);
- void setSliderHeight(Ogre::Real height, GuiMetricsMode mode = QGUI_GMM_RELATIVE);
+ void setSliderHeight(Ogre::Real height);
void setSmallChange(Ogre::Real change);
/**
* Sets the numerical value representing the position of the left end of the slider, relative to the track bounds.
@@ -108,7 +108,7 @@
Ogre::Real mRepeatTimer;
// last recorded slider position
- Point mRelativeSliderPosition;
+ Point mSliderPosition;
Ogre::Real mMinSliderPosition;
Ogre::Real mMaxSliderPosition;
@@ -120,7 +120,6 @@
Button* mSlider;
Ogre::String mSliderTextureName;
- Ogre::Real mSliderPixelHeight;
void setSliderWidth(Ogre::Real relativeWidth);
void _constrainSlider();
@@ -128,7 +127,6 @@
Ogre::String mScrollLeftTextureName;
Ogre::String mScrollRightTextureName;
- Size mScrollButtonPixelSize;
Button* mScrollLeft1;
Button* mScrollLeft2;
Button* mScrollRight1;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.cpp 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.cpp 2007-09-28 15:31:47 UTC (rev 398)
@@ -3,31 +3,28 @@
namespace QuickGUI
{
- HorizontalTrackBar::HorizontalTrackBar(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
- Image(name,type,dimensions,pMode,sMode,texture,container,ParentWidget,gm),
+ HorizontalTrackBar::HorizontalTrackBar(const Ogre::String& name, Type type, const Rect& pixelDimensions, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
+ Image(name,type,pixelDimensions,texture,container,ParentWidget,gm),
mNumRegions(1),
mCurrentValue(0),
- mMouseDownOnSlider(false),
mLargeChange(3)
{
// Other widgets call this constructor, and they handle quad/quadcontainer their own way.
if(mWidgetType == TYPE_TRACKBAR_HORIZONTAL)
{
- mQuad->setLayer(Quad::LAYER_CHILD);
+ mQuad->setLayer(mParentWidget->getQuad()->getLayer());
}
addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&HorizontalTrackBar::onMouseButtonDown,this);
// Creat slider button at the beginning of the HorizontalTrackBar, whether horizonal (left) or vertical (bot)
- mSliderButton = new Button(mInstanceName+".SliderButton",TYPE_BUTTON,Rect(0,0,13,mPixelDimensions.height),QGUI_GMM_RELATIVE,QGUI_GMM_PIXELS,mSliderTextureName,mQuadContainer,this,mGUIManager);
+ mSliderButton = new Button(mInstanceName+".SliderButton",TYPE_BUTTON,Rect(0,0,13,mSize.height),mSliderTextureName,mQuadContainer,this,mGUIManager);
mSliderButton->enableDragging(true);
mSliderButton->constrainDragging(true,false);
mSliderButton->addEventHandler(EVENT_DRAGGED,&HorizontalTrackBar::onSliderDragged,this);
mSliderButton->addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&HorizontalTrackBar::onMouseDownOnSlider,this);
mSliderButton->addEventHandler(EVENT_MOUSE_BUTTON_UP,&HorizontalTrackBar::onMouseUpOnSlider,this);
mSliderButton->addEventHandler(EVENT_LOSE_FOCUS,&HorizontalTrackBar::onMouseUpOnSlider,this);
-
- mRelativeSliderSize = mSliderButton->getSize();
_getSliderPositions();
@@ -52,10 +49,11 @@
{
mSliderPositions.clear();
- Ogre::Real trackLength = 1 - mRelativeSliderSize.width;
+ Ogre::Real sliderPixelWidth = mSliderButton->getWidth();
+ Ogre::Real trackLength = mSize.width - sliderPixelWidth;
mRegionLength = trackLength / mNumRegions;
- Ogre::Real xStart = (mRelativeSliderSize.width/2.0);
+ Ogre::Real xStart = (sliderPixelWidth/2.0);
mSliderPositions.push_back(xStart);
for( int i = 0; i < mNumRegions; ++i )
{
@@ -70,9 +68,7 @@
int HorizontalTrackBar::getClosestSliderPosition(const Point& pixelPoint)
{
- Point p = pixelPoint;
- p.x = (p.x - mPixelDimensions.x) / mPixelDimensions.width;
- p.y = (p.y - mPixelDimensions.y) / mPixelDimensions.height;
+ Point p = pixelPoint - getScreenPosition();
if( p.x <= mSliderPositions[0] )
return 0;
@@ -115,15 +111,12 @@
}
void HorizontalTrackBar::onMouseDownOnSlider(const EventArgs& args)
- {
- mMouseDownOnSlider = true;
-
+ {
mSliderButton->lockTexture();
}
void HorizontalTrackBar::onMouseUpOnSlider(const EventArgs& args)
{
- mMouseDownOnSlider = false;
mSliderButton->unlockTexture();
if(mGUIManager->getMouseOverWidget()->getInstanceName() != mSliderButton->getInstanceName())
@@ -135,12 +128,11 @@
void HorizontalTrackBar::onMouseButtonDown(const EventArgs& args)
{
Point mousePos = dynamic_cast<const MouseEventArgs&>(args).position;
- mousePos.x = (mousePos.x - mPixelDimensions.x) / mPixelDimensions.width;
- mousePos.y = (mousePos.y - mPixelDimensions.y) / mPixelDimensions.height;
+ mousePos = mousePos - getScreenPosition();
- if( (mousePos.x > (mSliderPositions[mCurrentValue] + ((mRegionLength + mRelativeSliderSize.width)/2.0))) && (mCurrentValue < mNumRegions) )
+ if( (mousePos.x > (mSliderPositions[mCurrentValue] + ((mRegionLength + mSliderButton->getWidth())/2.0))) && (mCurrentValue < mNumRegions) )
setValue(mCurrentValue + mLargeChange);
- else if( (mousePos.x < (mSliderPositions[mCurrentValue] - ((mRegionLength - mRelativeSliderSize.width)/2.0))) && (mCurrentValue > 0) )
+ else if( (mousePos.x < (mSliderPositions[mCurrentValue] - ((mRegionLength - mSliderButton->getWidth())/2.0))) && (mCurrentValue > 0) )
setValue(mCurrentValue - mLargeChange);
}
@@ -183,10 +175,9 @@
setNumRegions(NumTicks - 1);
}
- void HorizontalTrackBar::setSliderSize(Size s, GuiMetricsMode mode)
+ void HorizontalTrackBar::setSliderSize(Size pixelSize)
{
- mSliderButton->setSize(s,mode);
- mRelativeSliderSize = mSliderButton->getSize();
+ mSliderButton->setSize(pixelSize);
}
void HorizontalTrackBar::setTexture(const Ogre::String& textureName, bool updateBaseTexture)
@@ -205,7 +196,7 @@
mCurrentValue = Value;
- mSliderButton->setXPosition(mSliderPositions[mCurrentValue] - (mRelativeSliderSize.width/2.0));
+ mSliderButton->setXPosition(mSliderPositions[mCurrentValue] - (mSliderButton->getWidth()/2.0));
WidgetEventArgs e(this);
e.handled = false;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.h 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.h 2007-09-28 15:31:47 UTC (rev 398)
@@ -38,7 +38,7 @@
@note
Vertical or Horizontal TrackBars are derived from a comparison between width and height.
*/
- HorizontalTrackBar(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm);
+ HorizontalTrackBar(const Ogre::String& name, Type type, const Rect& pixelDimensions, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm);
/**
* Add user defined event that will be called when amount of progress has changed.
@@ -99,7 +99,7 @@
* Sets the number of positions Slider can be moved to. Related to setNumRegions.
*/
void setNumTicks(unsigned int NumTicks);
- void setSliderSize(Size s, GuiMetricsMode mode = QGUI_GMM_RELATIVE);
+ void setSliderSize(Size pixelSize);
/**
* Applies the texture to the Quad if exists in some form, and updates the Image used for
* transparency picking.
@@ -131,9 +131,6 @@
// ----- SLIDER BUTTON PROPERTIES --------------------
Button* mSliderButton;
Ogre::String mSliderTextureName;
- Size mRelativeSliderSize;
- // Each region has a beggining and end. mCurrentPos tracks where slider is.
- int mSliderIndex;
void _getButtonSize();
void onSliderDragged(const EventArgs& args);
@@ -141,10 +138,6 @@
// ----- EVENT HANDLERS --------------------
void onMouseDownOnSlider(const EventArgs& args);
void onMouseUpOnSlider(const EventArgs& args);
-
- bool mMouseDownOnSlider;
- // Record the difference in index positions between the slider and cursor, when cursor goes down.
- int mMouseDownSliderDifference;
std::vector<MemberFunctionSlot*> mOnValueChangedHandlers;
};
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp 2007-09-28 15:31:47 UTC (rev 398)
@@ -2,8 +2,8 @@
namespace QuickGUI
{
- Image::Image(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
- Widget(name,type,dimensions,pMode,sMode,texture,container,ParentWidget,gm)
+ Image::Image(const Ogre::String& name, Type type, const Rect& pixelDimensions, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
+ Widget(name,type,pixelDimensions,texture,container,ParentWidget,gm)
{
// Other widgets call this constructor, and they handle quad/quadcontainer their own way.
if(mWidgetType == TYPE_IMAGE)
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.h 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.h 2007-09-28 15:31:47 UTC (rev 398)
@@ -31,7 +31,7 @@
@param
ParentWidget parent widget which created this widget.
*/
- Image(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm);
+ Image(const Ogre::String& name, Type type, const Rect& pixelDimensions, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm);
protected:
virtual ~Image();
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp 2007-09-28 14:52:54 UTC (rev 397)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp 2007-09-28 15:31:47 UTC (rev 398)
@@ -3,14 +3,13 @@
namespace QuickGUI
{
- Label::Label(const Ogre::String& name, Type type, const Rect& dimensions, GuiMetricsMode pMode, GuiMetricsMode sMode, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
- Image(name,type,dimensions,pMode,sMode,texture,container,ParentWidget,gm),
+ Label::Label(const Ogre::String& name, Type type, const Rect& pixelDimensions, Ogre::String texture, QuadContainer* container, Widget* ParentWidget, GUIManager* gm) :
+ Image(name,type,pixelDimensions,texture,container,ParentWidget,gm),
mDefaultTexture(mTextureName),
mVerticalAlignment(QGUI_VA_MID),
mHorizontalAlignment(QGUI_HA_MID),
- mTextBoundsRelativeOffset(Point::ZERO),
- mTextBoundsRelativeSize(Size(1,1)),
- mTextBoundsAbsoluteDimensions(mAbsoluteDimensions),
+ mTextBoundsPixelOffset(Point::ZERO),
+ mTextBoundsPixelSize(Size(pixelDimensions.width,pixelDimensions.height)),
mTextColor(Ogre::ColourValue::White),
mDisabledTextColor(Ogre::ColourValue(0.75,0.75,0.75,1))
{
@@ -19,8 +18,8 @@
// Other widgets call this constructor, and they handle quad/quadcontainer their own way.
if(mWidgetType == TYPE_LABEL)
{
- mQuad->setLayer(Quad::LAYER_CHILD);
- mText->setLayer(Quad::LAYER_CHILD);
+ mQuad->setLayer(mParentWidget->getQuad()->getLayer());...
[truncated message content] |
