Merge branch 'main' of https://github.com/mhammond/pywin32 into Native-ARM64-CI-wheels

Author: Avasam

CHANGES.md

@@ -23,6 +23,8 @@ Coming in build 312, as yet unreleased
   This removes the following constants:
   * `win32con.FILE_ATTRIBUTE_ATOMIC_WRITE`
   * `win32con.FILE_ATTRIBUTE_XACTION_WRITE`
+* Removed considerations for MFC < 9 (VS 2008) (mhammond#2669, [@Avasam][Avasam])
+  * This removes the unusable `PyCSliderCtrl.VerifyPos` method
 
 Build 311, released 2025/07/14
 ------------------------------

Pythonwin/Scintilla/lexers/LexBaan.cxx

@@ -228,8 +228,8 @@ static bool IsPreProcLine(Sci_Position line, LexAccessor &styler) {
 		if (ch == '#' && style == SCE_BAAN_PREPROCESSOR) {
 			if (styler.Match(i, "#elif") || styler.Match(i, "#else") || styler.Match(i, "#endif")
 				|| styler.Match(i, "#if") || styler.Match(i, "#ifdef") || styler.Match(i, "#ifndef"))
-				// Above PreProcessors has a seperate fold mechanism.
-				return false;
+                // Above PreProcessors has a separate fold mechanism.
+                return false;
 			else
 				return true;
 		}

Pythonwin/pywin/framework/editor/color/coloreditor.py

@@ -230,7 +230,7 @@ def DoConfigChange(self):
         # way to get sensible behaviour from it is to ensure tabwidth != indentsize.
         # Further, usetabs will only ever go from 1->0, never 0->1.
         # This is _not_ the behaviour Pythonwin wants:
-        # * Tab width is arbitary, so should have no impact on smarts.
+        # * Tab width is arbitrary, so should have no impact on smarts.
         # * bUseTabs setting should reflect how new files are created, and
         #   if Smart Tabs disabled, existing files are edited
         # * If "Smart Tabs" is enabled, bUseTabs should have no bearing

Pythonwin/pywin/framework/intpyapp.py

@@ -354,7 +354,7 @@ def ProcessArgs(self, args, dde=None):
                 raise RuntimeError(
                     "/app only supported for new instances of Pythonwin.exe"
                 )
-            elif argType == "/dde":  # Send arbitary command
+            elif argType == "/dde":  # Send arbitrary command
                 if dde is not None:
                     dde.Exec(par)
                 else:

Pythonwin/pywin/scintilla/document.py

@@ -300,7 +300,7 @@ def __call__(self, std, extra):
                 return getattr(v, self.name)(*(std, extra))
 
 
-# Delegate to the document, but only from a single view (as each view sends it seperately)
+# Delegate to the document, but only from a single view (as each view sends it separately)
 class DocumentNotifyDelegate:
     def __init__(self, doc, name):
         self.doc = doc

Pythonwin/pywin/tools/hierlist.py

@@ -22,7 +22,7 @@
 from win32api import RGB
 
 
-# helper to get the text of an arbitary item
+# helper to get the text of an arbitrary item
 def GetItemText(item):
     if isinstance(item, (tuple, list)):
         use = item[0]
@@ -280,7 +280,7 @@ def TakeDefaultAction(self, item):
 
 ##########################################################################
 #
-# Classes for use with seperate HierListItems.
+# Classes for use with separate HierListItems.
 #
 #
 class HierListWithItems(HierList):

Pythonwin/win32RichEdit.cpp

@@ -156,7 +156,7 @@ static PyObject *PyCRichEditView_wrap_changed(PyObject *self, PyObject *args)
 }
 
 // @pymethod None|PyCRichEditView|SaveTextFile|Saves the contents of the control as a test file
-// @comm Theere is no equivilent MFC method.  This is implemented in this module for performance reasons.
+// @comm There is no equivalent MFC method.  This is implemented in this module for performance reasons.
 static PyObject *PyCRichEditView_save_text_file(PyObject *self, PyObject *args)
 {
     // Ported from Python code!
@@ -212,7 +212,7 @@ static PyObject *PyCRichEditView_save_text_file(PyObject *self, PyObject *args)
     RETURN_NONE;
 }
 
-// @object PyCRichEditView|A class which implementes a CRichEditView.  Derived from <o PyCRichEditView> and <o
+// @object PyCRichEditView|A class which implements a CRichEditView.  Derived from <o PyCRichEditView> and <o
 // PyCRichEditCtrl>.
 static struct PyMethodDef PyCRichEditView_methods[] = {
     {"GetRichEditCtrl", PyCRichEditView_get_rich_edit_ctrl,

Pythonwin/win32app.cpp

@@ -141,7 +141,7 @@ static PyObject *ui_app_add_doc_template(PyObject *self, PyObject *args)
 // @pymethod |PyCWinApp|RemoveDocTemplate|Removes a template to the application list.
 static PyObject *ui_app_remove_doc_template(PyObject *self, PyObject *args)
 {
-    // @comm Note that MFC does not provide an equivilent function.
+    // @comm Note that MFC does not provide an equivalent function.
     PyObject *obTemplate;
     if (!PyArg_ParseTuple(args, "O:RemoveDocTemplate",
                           &obTemplate))  // @pyparm <o PyCDocTemplate>|template||The template to be removed.  Must have

Pythonwin/win32control.cpp

@@ -1855,25 +1855,6 @@ static PyObject *PyCSliderCtrl_clear_sel(PyObject *self, PyObject *args)
     RETURN_NONE;
 }
 
-// @pymethod int|PyCSliderCtrl|VerifyPos|Verify the position is between configured min and max
-static PyObject *PyCSliderCtrl_verify_pos(PyObject *self, PyObject *args)
-{
-    CHECK_NO_ARGS(args);
-    CSliderCtrl *pSC = GetSliderCtrl(self);
-    if (!pSC)
-        return NULL;
-#if _MFC_VER >= 0x0710
-    // This just vanished in VS7
-    PyErr_SetString(PyExc_NotImplementedError, "VerifyPos does not appear in this version of MFC");
-    return NULL;
-#else
-    GUI_BGN_SAVE;
-    pSC->VerifyPos();
-    GUI_END_SAVE;
-#endif
-    RETURN_NONE;
-}
-
 // @pymethod int|PyCSliderCtrl|ClearTics|Clear the control's tic marks
 static PyObject *PyCSliderCtrl_clear_tics(PyObject *self, PyObject *args)
 {
@@ -1919,7 +1900,6 @@ static struct PyMethodDef PyCSliderCtrl_methods[] = {
     {"SetTic", PyCSliderCtrl_set_tic, 1},           // @pymeth SetTic|Set a tick at the position
     {"SetTicFreq", PyCSliderCtrl_set_tic_freq, 1},  // @pymeth SetTicFreq|Set the tic mark frequency
     {"ClearSel", PyCSliderCtrl_clear_sel, 1},       // @pymeth ClearSel|Clear any control selection
-    {"VerifyPos", PyCSliderCtrl_verify_pos, 1},     // @pymeth VerifyPos|Verify the positon between min and max
     {"ClearTics", PyCSliderCtrl_clear_tics, 1},     // @pymeth ClearTics|Clear any tic marks from the control
     {NULL, NULL}};
 

Pythonwin/win32prop.cpp

@@ -440,15 +440,9 @@ PyObject *ui_propsheet_press_button(PyObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "i", &button))
         return NULL;
     GUI_BGN_SAVE;
-    BOOL ok = TRUE;
-#if _MFC_VER < 0x0710
-    ok =
-#endif
-        pPS->PressButton(button);
-
+    pPS->PressButton(button);
     GUI_END_SAVE;
-    if (!ok)
-        RETURN_ERR("PressButton failed");
+
     RETURN_NONE;
 }