rename lib

th3w1zard1 · Aug 30, 2024 · 3419c9a · 3419c9a
1 parent 61a3985
commit 3419c9a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/winforms/src/toga_winforms/dialogs.py b/winforms/src/toga_winforms/dialogs.py
@@ -21,7 +21,7 @@
 from comtypes import GUID
 from comtypes.hresult import S_OK
 
-from toga_winforms.libs.win_wrappers.com.interfaces import (
+from toga_winforms.libs.py_wrappers.com.interfaces import (
     COMDLG_FILTERSPEC,
     CLSID_FileOpenDialog,
     CLSID_FileSaveDialog,
@@ -31,7 +31,7 @@
     IShellItem,
     IShellItemArray,
 )
-from toga_winforms.libs.win_wrappers.hwnd import (
+from toga_winforms.libs.py_wrappers.hwnd import (
     ES_AUTOVSCROLL,
     ES_MULTILINE,
     ES_READONLY,

diff --git a/winforms/src/toga_winforms/libs/py_wrappers/com/com_helpers.py b/winforms/src/toga_winforms/libs/py_wrappers/com/com_helpers.py
@@ -7,7 +7,7 @@
 
 from comtypes import COMObject
 
-from toga_winforms.libs.win_wrappers.hresult import HRESULT
+from toga_winforms.libs.py_wrappers.hresult import HRESULT
 
 if TYPE_CHECKING:
     from ctypes import _NamedFuncPointer
@@ -110,8 +110,8 @@ def register_idispatch_object(
     import comtypes
     from comtypes import GUID
 
-    from toga_winforms.libs.win_wrappers.com.interfaces import SIGDN
-    from toga_winforms.libs.win_wrappers.hresult import S_OK
+    from toga_winforms.libs.py_wrappers.com.interfaces import SIGDN
+    from toga_winforms.libs.py_wrappers.hresult import S_OK
     try:
         from win32com.shell import shell  # pyright: ignore[reportMissingModuleSource]
     except ModuleNotFoundError:

diff --git a/winforms/src/toga_winforms/libs/py_wrappers/com/interfaces.py b/winforms/src/toga_winforms/libs/py_wrappers/com/interfaces.py
@@ -24,7 +24,7 @@
     GUID,
 )
 
-from toga_winforms.libs.win_wrappers.hresult import (  # pyright: ignore[reportMissingTypeStubs]
+from toga_winforms.libs.py_wrappers.hresult import (  # pyright: ignore[reportMissingTypeStubs]
     HRESULT,
     S_OK,
 )

diff --git a/winforms/src/toga_winforms/libs/py_wrappers/com/progress_dialog.py b/winforms/src/toga_winforms/libs/py_wrappers/com/progress_dialog.py
@@ -10,11 +10,11 @@
 from comtypes.gen import Shell32
 from utility.logger_util import RobustRootLogger
 
-from toga_winforms.libs.win_wrappers.com.interfaces import (
+from toga_winforms.libs.py_wrappers.com.interfaces import (
     CLSID_FileOperation,
     IFileOperationProgressSink,
 )
-from toga_winforms.libs.win_wrappers.hresult import S_OK
+from toga_winforms.libs.py_wrappers.hresult import S_OK
 
 if TYPE_CHECKING:
     from typing_extensions import Literal

diff --git a/winforms/src/toga_winforms/libs/py_wrappers/com/windialogs.py b/winforms/src/toga_winforms/libs/py_wrappers/com/windialogs.py
@@ -14,9 +14,9 @@
 from utility.logger_util import RobustRootLogger
 from utility.system.path import WindowsPath
 
-from toga_winforms.libs.win_wrappers.com.com_helpers import HandleCOMCall
-from toga_winforms.libs.win_wrappers.com.com_types import GUID
-from toga_winforms.libs.win_wrappers.com.interfaces import (
+from toga_winforms.libs.py_wrappers.com.com_helpers import HandleCOMCall
+from toga_winforms.libs.py_wrappers.com.com_types import GUID
+from toga_winforms.libs.py_wrappers.com.interfaces import (
     COMDLG_FILTERSPEC,
     SFGAO,
     SIGDN,
@@ -31,13 +31,13 @@
     IID_IFileDialogCustomize,
     IShellItem,
 )
-from toga_winforms.libs.win_wrappers.hresult import HRESULT, S_OK
+from toga_winforms.libs.py_wrappers.hresult import HRESULT, S_OK
 
 if TYPE_CHECKING:
     from ctypes import Array, _FuncPointer, _Pointer
     from ctypes.wintypes import BOOL, DWORD, LPWSTR
 
-    from toga_winforms.libs.win_wrappers.com.interfaces import IFileDialog, IShellItemArray
+    from toga_winforms.libs.py_wrappers.com.interfaces import IFileDialog, IShellItemArray
 
 
 class FileDialogControlEvents(comtypes.COMObject):

diff --git a/winforms/src/toga_winforms/libs/py_wrappers/context_menu.py b/winforms/src/toga_winforms/libs/py_wrappers/context_menu.py
@@ -10,7 +10,7 @@
 import comtypes  # pyright: ignore[reportMissingTypeStubs]
 import comtypes.client  # pyright: ignore[reportMissingTypeStubs]
 
-from toga_winforms.libs.win_wrappers.hwnd import SimplePyHWND
+from toga_winforms.libs.py_wrappers.hwnd import SimplePyHWND
 
 if TYPE_CHECKING:
     import os

diff --git a/winforms/src/toga_winforms/libs/py_wrappers/hwnd.py b/winforms/src/toga_winforms/libs/py_wrappers/hwnd.py
@@ -4,7 +4,7 @@
 from ctypes import POINTER, WINFUNCTYPE, Structure, c_int, c_wchar_p, windll, c_long, c_uint, c_void_p
 from ctypes.wintypes import ATOM, BOOL, DWORD, HBRUSH, HICON, HINSTANCE, HMENU, HWND, LPARAM, LPCWSTR, LPVOID, UINT, WPARAM
 
-from toga_winforms.libs.win_wrappers.common import LRESULT
+from toga_winforms.libs.py_wrappers.common import LRESULT
 from enum import IntEnum
 from typing import TYPE_CHECKING, Sequence
 

diff --git a/winforms/src/toga_winforms/libs/py_wrappers/winapi/messagebox.py b/winforms/src/toga_winforms/libs/py_wrappers/winapi/messagebox.py
@@ -3,8 +3,8 @@
 from ctypes import POINTER, WINFUNCTYPE, Structure, c_int, c_wchar_p, windll
 from ctypes.wintypes import ATOM, BOOL, DWORD, HBRUSH, HICON, HINSTANCE, HMENU, HWND, LPARAM, LPCWSTR, LPVOID, UINT, WPARAM
 
-from toga_winforms.libs.win_wrappers.common import LRESULT
-from toga_winforms.libs.win_wrappers.hwnd import HCURSOR
+from toga_winforms.libs.py_wrappers.common import LRESULT
+from toga_winforms.libs.py_wrappers.hwnd import HCURSOR
 
 
 def windows_message_box(  # noqa: PLR0913
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ @@
         GUID,
     )
-    from toga_winforms.libs.win_wrappers.hresult import (  # pyright: ignore[reportMissingTypeStubs]
+    from toga_winforms.libs.py_wrappers.hresult import (  # pyright: ignore[reportMissingTypeStubs]
         HRESULT,
         S_OK,
     )
@@ Expand Down @@