From: Carl Hetherington <cth@carlh.net>
Date: Mon, 16 Jan 2023 22:57:38 +0000 (+0100)
Subject: Add indent option to wxGridBagSizer version of add_label_to_sizer
X-Git-Tag: v2.16.41~27
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ac9f0b8c968f5bffc60a49ffb71a7c7a248f4e32

Add indent option to wxGridBagSizer version of add_label_to_sizer

Also remove the use of wxRIGHT as I don't think it was doing anything
before.
---

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index e600b63c8..7a41f66e7 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -125,14 +125,14 @@ add_label_to_sizer (wxSizer* s, wxStaticText* t, bool, int prop, int flags)
 
 
 wxStaticText *
-add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer(wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span, bool indent)
 {
-	int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
+	int flags = wxALIGN_CENTER_VERTICAL | wxLEFT;
 #ifdef __WXOSX__
 	setup_osx_flags (s, left, flags);
 #endif
 	auto m = create_label (p, t, left);
-	s->Add (m, pos, span, flags);
+	s->Add(m, pos, span, flags, indent ? DCPOMATIC_SIZER_X_GAP : 0);
 	return m;
 }
 
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 1143c5b53..e18cfc5a7 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -110,7 +110,7 @@ extern bool confirm_dialog (wxWindow *, wxString);
 extern wxStaticText* create_label (wxWindow* p, wxString t, bool left);
 extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0, int flags = wxLEFT | wxRIGHT);
 extern wxStaticText* add_label_to_sizer (wxSizer *, wxStaticText *, bool left, int prop = 0, int flags = wxLEFT | wxRIGHT);
-extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
+extern wxStaticText* add_label_to_sizer(wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan, bool indent = false);
 extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxStaticText *, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
 extern std::string wx_to_std (wxString);
 extern wxString std_to_wx (std::string);