Merge b9b838f into ec91451

hwf1324 · web-flow · commit 79faa1f23d71 · 2023-09-14T17:06:14.000+10:00
diff --git a/source/gui/_addonStoreGui/controls/messageDialogs.py b/source/gui/_addonStoreGui/controls/messageDialogs.py
@@ -240,13 +240,15 @@ def __init__(self, parent: wx.Window):
 
 		sHelper.sizer.AddSpacer(SPACE_BETWEEN_VERTICAL_DIALOG_ITEMS)
 
-		self.dontShowAgainCheckbox = sHelper.addLabeledControl(
-			pgettext(
-				"addonStore",
-				# Translators: The label of a checkbox in the add-on store warning dialog
-				"&Don't show this message again"
+		self.dontShowAgainCheckbox = sHelper.addItem(
+			wx.CheckBox(
+				self,
+				label=pgettext(
+					"addonStore",
+					# Translators: The label of a checkbox in the add-on store warning dialog
+					"&Don't show this message again"
+				),
 			),
-			wx.CheckBox,
 		)
 
 		bHelper = sHelper.addDialogDismissButtons(ButtonHelper(wx.HORIZONTAL))
diff --git a/source/gui/guiHelper.py b/source/gui/guiHelper.py
@@ -136,7 +136,6 @@ def associateElements(firstElement: wx.Control, secondElement: wx.Control) -> wx
 	# likely a labelled control from LabeledControlHelper
 	if isinstance(firstElement, wx.StaticText) and isinstance(secondElement, (
 		wx.Button,
-		wx.CheckBox,
 		wx.Choice,
 		wx.Slider,
 		wx.SpinCtrl,
@@ -146,6 +145,12 @@ def associateElements(firstElement: wx.Control, secondElement: wx.Control) -> wx
 		sizer.Add(firstElement, flag=wx.ALIGN_CENTER_VERTICAL)
 		sizer.AddSpacer(SPACE_BETWEEN_ASSOCIATED_CONTROL_HORIZONTAL)
 		sizer.Add(secondElement)
+	elif isinstance(firstElement, wx.StaticText) and isinstance(secondElement, wx.CheckBox):
+		# checkbox should go first, and label should go after
+		sizer = wx.BoxSizer(wx.HORIZONTAL)
+		sizer.Add(secondElement)
+		sizer.AddSpacer(SPACE_BETWEEN_ASSOCIATED_CONTROL_HORIZONTAL)
+		sizer.Add(firstElement, flag=wx.ALIGN_CENTER_VERTICAL)
 	# staticText and (ListCtrl, ListBox or TreeCtrl)
 	elif isinstance(firstElement, wx.StaticText) and isinstance(secondElement, (wx.ListCtrl,wx.ListBox,wx.TreeCtrl)):
 		sizer = wx.BoxSizer(wx.VERTICAL)
