[Pythoncard-cvs] PythonCard/components slider.py,1.18,1.19

[Kevin A. <ka...@us...>]

Update of /cvsroot/pythoncard/PythonCard/components
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17688/components

Modified Files:
	slider.py 
Log Message:
added ticks, labels, and tickFrequency attributes


Index: slider.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/components/slider.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** slider.py	4 May 2004 17:15:42 -0000	1.18
--- slider.py	9 May 2004 04:11:28 -0000	1.19
***************
*** 20,23 ****
--- 20,26 ----
          attributes = { 
              'layout' : { 'presence' : 'optional', 'default' : 'horizontal', 'values' : [ 'horizontal', 'vertical' ]  },
+             'labels' : { 'presence' : 'optional', 'default' : False },
+             'ticks' : { 'presence' : 'optional', 'default' : False },
+             'tickFrequency' : { 'presence' : 'optional', 'default' : 0 }, 
              'min' : { 'presence' : 'optional', 'default' : 0 }, 
              'max' : { 'presence' : 'optional', 'default' : 100 }, 
***************
*** 42,46 ****
              aResource.position, 
              aResource.size, 
!             style= self.__getLayout( aResource.layout ) | \
                  wx.NO_FULL_REPAINT_ON_RESIZE | wx.CLIP_SIBLINGS,
              name = aResource.name 
--- 45,51 ----
              aResource.position, 
              aResource.size, 
!             style= self.__getLayout(aResource.layout) | \
!                 self.__getLabels(aResource.labels) | \
!                 self.__getTicks(aResource.ticks) | \
                  wx.NO_FULL_REPAINT_ON_RESIZE | wx.CLIP_SIBLINGS,
              name = aResource.name 
***************
*** 50,53 ****
--- 55,62 ----
  
          self._layout = aResource.layout
+         self._labels = aResource.labels
+         self._ticks = aResource.ticks
+         if aResource.ticks and aResource.tickFrequency:
+             self._setTickFrequency(aResource.tickFrequency)
          
          self._bindEvents(event.WIDGET_EVENTS + SliderEvents)
***************
*** 60,64 ****
          else :
              raise 'invalid Slider.layout value: ', aString
!             
      def setRange( self, aMin, aMax ) :
          self.SetRange( aMin, aMax )
--- 69,85 ----
          else :
              raise 'invalid Slider.layout value: ', aString
! 
!     def __getLabels(self, aBoolean):
!         if aBoolean:
!             return wx.SL_LABELS 
!         else :
!             return 0
! 
!     def __getTicks(self, aBoolean):
!         if aBoolean:
!             return wx.SL_AUTOTICKS
!         else :
!             return 0
! 
      def setRange( self, aMin, aMax ) :
          self.SetRange( aMin, aMax )
***************
*** 76,80 ****
--- 97,122 ----
          raise AttributeError, "layout attribute is read-only"
  
+     def _getLabels(self):
+         return self._labels
+ 
+     def _setLabels(self, aBoolean):
+         raise AttributeError, "labels attribute is read-only"
+ 
+     def _getTicks(self):
+         return self._ticks
+ 
+     def _setTicks(self, aBoolean):
+         raise AttributeError, "ticks attribute is read-only"
+ 
+     def _getTickFrequency(self):
+         return self.GetTickFreq()
+ 
+     def _setTickFrequency(self, aInteger):
+         self.SetTickFreq(aInteger, 1)
+         
      layout = property(_getLayout, _setLayout)
+     labels = property(_getLabels, _setLabels)
+     ticks = property(_getTicks, _setTicks)
+     tickFrequency = property(_getTickFrequency, _setTickFrequency)
      max = property(wx.Slider.GetMax, _setMax)
      min = property(wx.Slider.GetMin, _setMin)