Demo updates for new wx namespace, from Jeff Grimmett

[wxWidgets.git] / wxPython / demo / wxRightTextCtrl.py

diff --git a/wxPython/demo/wxRightTextCtrl.py b/wxPython/demo/wxRightTextCtrl.py
index b2fa3e970b1f17c940098ae65e22fb2a29f98046..cc5de1a014f420efb374c3340372dcd7cd50c696 100644 (file)
--- a/wxPython/demo/wxRightTextCtrl.py
+++ b/wxPython/demo/wxRightTextCtrl.py
@@ -1,36 +1,53 @@
-
-from wxPython.wx import *
-from wxPython.lib.rightalign import wxRightTextCtrl
-import wxPython.lib.rightalign
-
+# 11/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
+# 11/30/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o The rightalign library needs converted for this to work correctly.
+# 
+
+############################################################################\
+# Note: this demo has been converted, but the control is deprecated because |
+# wx.TextCtrl now supports the wx.TE_RIGHT style flag, which makes this     |
+# control completely superfluous.                                           |
+############################################################################/
+
+import  wx
+import  wx.lib.rightalign   as right
 
 #----------------------------------------------------------------------
 
-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):
     def __init__(self, parent):
-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)
+
+        fgs = wx.FlexGridSizer(cols=2, vgap=5, hgap=5)
+
+        txt = wx.StaticText(
+                self, -1,
+                "These text controls will align their contents to\n"
+                "the right (on wxMSW) when they don't have focus.", 
+                style=wx.ALIGN_RIGHT 
+                )
 
-        fgs = wxFlexGridSizer(cols=2, vgap=5, hgap=5)
-        txt = wxStaticText(self, -1,
-                           "These text controls will align their contents to\n"
-                           "the right (on wxMSW) when they don't have focus.", style=wxALIGN_RIGHT )
         fgs.Add(txt)
-        fgs.Add(wxRightTextCtrl(self, -1, "", size=(75, -1)))
+        fgs.Add(right.wxRightTextCtrl(self, -1, "", size=(75, -1)))
 
-        fgs.Add(10,10)
-        fgs.Add(wxRightTextCtrl(self, -1, "123.45", size=(75, -1)))
+        fgs.Add((10,10))
+        fgs.Add(right.wxRightTextCtrl(self, -1, "123.45", size=(75, -1)))
 
-        fgs.Add(10,10)
-        fgs.Add(wxRightTextCtrl(self, -1, "234.56", size=(75, -1)))
+        fgs.Add((10,10))
+        fgs.Add(right.wxRightTextCtrl(self, -1, "234.56", size=(75, -1)))
 
-        fgs.Add(10,10)
-        fgs.Add(wxRightTextCtrl(self, -1, "345.67", size=(75, -1)))
+        fgs.Add((10,10))
+        fgs.Add(right.wxRightTextCtrl(self, -1, "345.67", size=(75, -1)))
 
-        fgs.Add(10,10)
-        fgs.Add(wxRightTextCtrl(self, -1, "456.78", size=(75, -1)))
+        fgs.Add((10,10))
+        fgs.Add(right.wxRightTextCtrl(self, -1, "456.78", size=(75, -1)))
 
-        sizer = wxBoxSizer(wxVERTICAL)
-        sizer.Add(fgs, 0, wxALL, 25)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(fgs, 0, wx.ALL, 25)
 
         self.SetSizer(sizer)
         self.SetAutoLayout(True)
@@ -45,9 +62,7 @@ def runTest(frame, nb, log):
 
 #----------------------------------------------------------------------
 
-overview = wxPython.lib.rightalign.__doc__
-
-
+overview = right.__doc__
 
 
 if __name__ == '__main__':