update demo for v0.8

Author: Correct-Syntax

demo/demo3-styles.uiss

@@ -1,10 +1,11 @@
 
 
-
+ 
 @style main-frame {
-  background-color: white;
+  background-color: red;
 }
 
+/* button */
 @style button {
   background-color: #F4F4F4;
   top: 20px;
@@ -15,20 +16,40 @@
   border-size: 2px;
 }
 
-@style button-- {
-  background-color: #F4F4F4;
+@style button:hover {
+  background-color: #FDFDFD;
   top: 20px;
   left: 40px;
-  width: 100px;
-  height: 30px;
+  width: 115px;
+  height: 35px;
   border-color: #D1D1D1;
   border-size: 2px;
 }
 
+@style button:press {
+  background-color: #D1D1D1;
+  top: 20px;
+  left: 40px;
+  width: 115px;
+  height: 35px;
+  border-color: #D1D1D1;
+  border-size: 2px;
+}
 
 @style button-text {
-  type: text;
   color: black;
   top: 30px;
   left: 47px;
 }
+
+@style button-text:hover {
+  color: #444;
+  top: 30px;
+  left: 47px;
+}
+
+@style text {
+  color: green;
+  top: 300px;
+  left: 47px;
+}

demo/demo3.py

@@ -6,8 +6,7 @@
 # Usage:
 # It's a custom button...click it!
 
-# TODO:
-# Comments!!!
+# This demo is up-to-date
 
 
 import wx
@@ -22,7 +21,7 @@ def __init__(self):
         # Create the DC
         self._pdc = UIStylePDC(
             self,
-            './demo3-styles.uiss'
+            './custom-widget-demo.uiss'
             ) 
 
         self.DrawDrawing(self._pdc)
@@ -48,47 +47,50 @@ def OnPaint(self, event):
 
     def OnMotion(self, event):
         pnt = event.GetPosition()
-        elem_rect = self._pdc.GetWXRect('button')
+        elem_rect = self._pdc.GetWxRect('button')
         mouse_pnt = wx.Rect(pnt[0], pnt[1], 1, 1)
 
         if mouse_pnt.Intersects(elem_rect) == True:
-            self._pdc.UpdateShapeStyles('button', styles="background-color: #FDFDFD;")
+            self._pdc.UpdateElem('button:hover')
         else:
-            self._pdc.UpdateShapeStyles('button', styles="background-color: #F4F4F4;")
+            self._pdc.UpdateElem('button')
 
         self.RefreshDemo()
 
 
     def OnLeftDown(self, event):
         pnt = event.GetPosition()
-        elem_rect = self._pdc.GetWXRect('button')
+        elem_rect = self._pdc.GetWxRect('button')
 
         # Create a 1x1 rect for the mouse pointer
         mouse_pnt = wx.Rect(pnt[0], pnt[1], 1, 1) 
 
         if mouse_pnt.Intersects(elem_rect) == True:
-            self._pdc.UpdateShapeStyles('button', styles="background-color: #D1D1D1;")
+            self._pdc.UpdateElem('button:press')
+            self._pdc.UpdateElem('button-text:hover')
 
         self.RefreshDemo()
 
     def OnLeftUp(self, event):
         pnt = event.GetPosition()
-        elem_rect = self._pdc.GetWXRect('button')
+        elem_rect = self._pdc.GetWxRect('button')
 
         # Create a 1x1 rect for the mouse pointer
         mouse_pnt = wx.Rect(pnt[0], pnt[1], 1, 1) 
 
         if mouse_pnt.Intersects(elem_rect) == True:
-            self._pdc.UpdateShapeStyles('button', styles="background-color: #F4F4F4;")
+            self._pdc.UpdateElem('button')
+            self._pdc.UpdateElem('button-text')
             self.ButtonCallback()
 
         self.RefreshDemo()
 
     def DrawDrawing(self, dc):
 
         # Initial
-        dc.InitShapeStyles('button')
-        dc.InitTextStyles('button-text', text="UI Style Lang Demo")
+        dc.InitElem('button')
+        dc.InitElem('button-text', "TEXT", "UI Style Lang Demo")
+        dc.InitElem('text', "TEXT", "UI Style Lang Demo")
 
 
     def RefreshDemo(self):
@@ -112,3 +114,4 @@ def ButtonCallback(self):
     frame.Show()
     app.SetTopWindow(frame)
     app.MainLoop()
+