added checkbox to enable setting (or not) individual wxBitmapButton bitmaps

[wxWidgets.git] / wxPython / wx / lib / rightalign.py

diff --git a/wxPython/wx/lib/rightalign.py b/wxPython/wx/lib/rightalign.py
index 2a485134dd0506fd1c1a987c959b262a419a8465..6ee642acd4fc738ac7ac9f7ec279fea3998b14cd 100644 (file)
--- a/wxPython/wx/lib/rightalign.py
+++ b/wxPython/wx/lib/rightalign.py
@@ -11,6 +11,15 @@
 # Copyright:   (c) 2001 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
 # Copyright:   (c) 2001 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------

+# 12/11/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o 2.5 compatability update.
+# o Added deprecation warning.
+#
+# 12/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxRightTextCtrl -> RightTextCtrl
+#

 
 """
 Some time ago, I asked about how to right-align
 
 """
 Some time ago, I asked about how to right-align


@@ -28,29 +37,46 @@ left-aligned if it has focus.
 Hope this can help someone, as much as this list helps me.
 
 Josu Oyanguren
 Hope this can help someone, as much as this list helps me.
 
 Josu Oyanguren

-Ubera Servicios Informáticos.
+Ubera Servicios Informaticos.

 
 
 P.S.  This only works well on wxMSW.
 """
 
 
 
 P.S.  This only works well on wxMSW.
 """
 

-from wxPython.wx import *
+import  warnings
+import  wx

 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 

-class wxRightTextCtrl(wxTextCtrl):
+warningmsg = r"""\
+
+##############################################################\
+# THIS MODULE IS DEPRECATED                                   |
+#                                                             |
+# This control still functions, but it is deprecated because  |
+# wx.TextCtrl now supports the wx.TE_RIGHT style flag         |
+##############################################################/
+
+
+"""
+
+warnings.warn(warningmsg, DeprecationWarning, stacklevel=2)
+
+#----------------------------------------------------------------------
+
+class RightTextCtrl(wx.TextCtrl):

     def __init__(self, parent, id, *args, **kwargs):
     def __init__(self, parent, id, *args, **kwargs):

-        wxTextCtrl.__init__(self, parent, id, *args, **kwargs)
-        EVT_KILL_FOCUS(self, self.OnKillFocus)
-        EVT_PAINT(self, self.OnPaint)
+        wx.TextCtrl.__init__(self, parent, id, *args, **kwargs)
+        self.Bind(wx.EVT_KILL_FOCUS, self.OnKillFocus)
+        self.Bind(wx.EVT_PAINT, self.OnPaint)

 
     def OnPaint(self, event):
 
     def OnPaint(self, event):

-        dc = wxPaintDC(self)
+        dc = wx.PaintDC(self)

         dc.SetFont(self.GetFont())
         dc.Clear()
         text = self.GetValue()
         textwidth, textheight = dc.GetTextExtent(text)
         dc.SetFont(self.GetFont())
         dc.Clear()
         text = self.GetValue()
         textwidth, textheight = dc.GetTextExtent(text)

-        dcwidth, dcheight = self.GetClientSizeTuple()
+        dcwidth, dcheight = self.GetClientSize()

 
         y = (dcheight - textheight) / 2
         x = dcwidth - textwidth - 2
 
         y = (dcheight - textheight) / 2
         x = dcwidth - textwidth - 2


@@ -58,19 +84,20 @@ class wxRightTextCtrl(wxTextCtrl):
         if self.IsEnabled():
             fclr = self.GetForegroundColour()
         else:
         if self.IsEnabled():
             fclr = self.GetForegroundColour()
         else:

-            fclr = wxSystemSettings_GetColour(wxSYS_COLOUR_GRAYTEXT)
+            fclr = wx.SystemSettings_GetColour(wx.SYS_COLOUR_GRAYTEXT)
+

         dc.SetTextForeground(fclr)
 
         dc.SetTextForeground(fclr)
 

-        dc.SetClippingRegionXY(0, 0, dcwidth, dcheight)
+        dc.SetClippingRegion((0, 0), (dcwidth, dcheight))

         dc.DrawText(text, x, y)
 
         if x < 0:
             toofat = '...'
             markwidth = dc.GetTextExtent(toofat)[0]
         dc.DrawText(text, x, y)
 
         if x < 0:
             toofat = '...'
             markwidth = dc.GetTextExtent(toofat)[0]

-            dc.SetPen(wxPen(dc.GetBackground().GetColour(), 1, wxSOLID ))
+            dc.SetPen(wx.Pen(dc.GetBackground().GetColour(), 1, wx.SOLID ))

             dc.DrawRectangle(0,0, markwidth, dcheight)
             dc.DrawRectangle(0,0, markwidth, dcheight)

-            dc.SetPen(wxPen(wxRED, 1, wxSOLID ))
-            dc.SetBrush(wxTRANSPARENT_BRUSH)
+            dc.SetPen(wx.Pen(wx.RED, 1, wx.SOLID ))
+            dc.SetBrush(wx.TRANSPARENT_BRUSH)

             dc.DrawRectangle(1, 1, dcwidth-2, dcheight-2)
             dc.DrawText(toofat, 1, y)
 
             dc.DrawRectangle(1, 1, dcwidth-2, dcheight-2)
             dc.DrawText(toofat, 1, y)