Merge pull request #157 from schriftgestalt/master

Replace deprecated constants
robotools · Dec 13, 2021 · 04285ce · 04285ce
2 parents ad8eba3 + 8b0d105
commit 04285ce
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Documentation/source/conf.py b/Documentation/source/conf.py
diff --git a/Lib/vanilla/vanillaButton.py b/Lib/vanilla/vanillaButton.py
@@ -1,4 +1,4 @@
-from AppKit import NSButton, NSImage, NSBundle, NSRoundedBezelStyle, NSShadowlessSquareBezelStyle, NSHelpButtonBezelStyle, NSMomentaryPushInButton, NSCommandKeyMask, NSAlternateKeyMask, NSAlternateKeyMask, NSShiftKeyMask, NSAlphaShiftKeyMask, NSHelpFunctionKey, NSHomeFunctionKey, NSEndFunctionKey, NSPageUpFunctionKey, NSPageDownFunctionKey, NSDeleteFunctionKey, NSLeftArrowFunctionKey, NSRightArrowFunctionKey, NSUpArrowFunctionKey, NSDownArrowFunctionKey, NSImageLeft, NSImageRight, NSImageAbove, NSImageBelow, NSImageOnly, NSRightTextAlignment, NSLeftTextAlignment, NSNoCellMask
+from AppKit import NSButton, NSImage, NSBundle, NSRoundedBezelStyle, NSShadowlessSquareBezelStyle, NSHelpButtonBezelStyle, NSMomentaryPushInButton, NSCommandKeyMask, NSAlternateKeyMask, NSAlternateKeyMask, NSShiftKeyMask, NSAlphaShiftKeyMask, NSHelpFunctionKey, NSHomeFunctionKey, NSEndFunctionKey, NSPageUpFunctionKey, NSPageDownFunctionKey, NSDeleteFunctionKey, NSLeftArrowFunctionKey, NSRightArrowFunctionKey, NSUpArrowFunctionKey, NSDownArrowFunctionKey, NSImageLeft, NSImageRight, NSImageAbove, NSImageBelow, NSImageOnly, NSTextAlignmentRight, NSTextAlignmentLeft, NSNoCellMask
 from vanilla.vanillaBase import VanillaBaseControl
 
 
@@ -307,9 +307,9 @@ def __init__(self, posSize,
         else:
             position= _imagePositionMap[imagePosition]
             if imagePosition == "left":
-                self._nsObject.setAlignment_(NSRightTextAlignment)
+                self._nsObject.setAlignment_(NSTextAlignmentRight)
             elif imagePosition == "right":
-                self._nsObject.setAlignment_(NSLeftTextAlignment)
+                self._nsObject.setAlignment_(NSTextAlignmentLeft)
         if not bordered:
             self._nsObject.cell().setHighlightsBy_(NSNoCellMask)
         self._nsObject.setImagePosition_(position)

diff --git a/Lib/vanilla/vanillaCheckBox.py b/Lib/vanilla/vanillaCheckBox.py
@@ -1,4 +1,4 @@
-from AppKit import NSSwitchButton, NSShadowlessSquareBezelStyle, NSLeftTextAlignment, NSNoCellMask
+from AppKit import NSSwitchButton, NSShadowlessSquareBezelStyle, NSTextAlignmentLeft, NSNoCellMask
 from vanilla.vanillaButton import Button
 from vanilla.vanillaBase import osVersionCurrent, osVersion10_10, VanillaBaseObject
 
@@ -136,7 +136,7 @@ def __init__(self, posSize, title, callback, sizeStyle):
         super(_CheckBoxManualBuildTextButton, self).__init__(posSize, title=title, callback=callback)
         self._nsObject.setBordered_(False)
         self._setSizeStyle(sizeStyle)
-        self._nsObject.setAlignment_(NSLeftTextAlignment)
+        self._nsObject.setAlignment_(NSTextAlignmentLeft)
         self._nsObject.cell().setHighlightsBy_(NSNoCellMask)
 
 

diff --git a/Lib/vanilla/vanillaTextBox.py b/Lib/vanilla/vanillaTextBox.py
@@ -1,13 +1,13 @@
-from AppKit import NSTextField, NSAttributedString, NSLeftTextAlignment, NSRightTextAlignment, NSCenterTextAlignment, NSJustifiedTextAlignment, NSNaturalTextAlignment
+from AppKit import NSTextField, NSAttributedString, NSTextAlignmentLeft, NSTextAlignmentRight, NSTextAlignmentCenter, NSTextAlignmentJustified, NSTextAlignmentNatural
 from vanilla.vanillaBase import VanillaBaseControl
 
 
 _textAlignmentMap = {
-    "left": NSLeftTextAlignment,
-    "right": NSRightTextAlignment,
-    "center": NSCenterTextAlignment,
-    "justified": NSJustifiedTextAlignment,
-    "natural": NSNaturalTextAlignment,
+    "left": NSTextAlignmentLeft,
+    "right": NSTextAlignmentRight,
+    "center": NSTextAlignmentCenter,
+    "justified": NSTextAlignmentJustified,
+    "natural": NSTextAlignmentNatural,
 }