* root.cc: Move inline definitions of GetDlgItemRect and

	SetDlgItemRect from here...
	* win32.h: ...to here, for potential usage in other dialogs.

diff --git a/ChangeLog b/ChangeLog
index fcac226a6c271373e3632eb5a07b7df89e72b91e..1bc7d2abd373c6fa7371122c0fd105c3ebee0c69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-15  Corinna Vinschen  <corinna@vinschen.de>
+
+       * root.cc: Move inline definitions of GetDlgItemRect and
+       SetDlgItemRect from here...
+       * win32.h: ...to here, for potential usage in other dialogs.
+
 2013-11-15  Corinna Vinschen  <corinna@vinschen.de>
 
        * res.rc: Fix size and position of rootdir textbox and button.

diff --git a/root.cc b/root.cc
index 8e78f7c5d0a9960cf8d0e542f89ccccc2bef5414..96e3d1e4cc48ab2aeb0b990e00e7a23296e264cb 100644 (file)
--- a/root.cc
+++ b/root.cc
@@ -71,20 +71,6 @@ check_if_enable_next (HWND h)
                egetString (h, IDC_ROOT_DIR).size() && root_scope);
 }
 
-static inline void
-GetDlgItemRect (HWND h, int item, LPRECT r)
-{
-  GetWindowRect (GetDlgItem (h, item), r);
-  MapWindowPoints (HWND_DESKTOP, h, (LPPOINT) r, 2);
-}
-
-static inline void
-SetDlgItemRect (HWND h, int item, LPRECT r)
-{
-  MoveWindow (GetDlgItem (h, item), r->left, r->top,
-             r->right - r->left, r->bottom - r->top, TRUE);
-}
-
 static void
 load_dialog (HWND h)
 {

diff --git a/win32.h b/win32.h
index 964a50889421d6366ab98017a52807f4e3b6fbf5..75906294da3448e48e45e9349a399df80be59392 100644 (file)
--- a/win32.h
+++ b/win32.h
@@ -180,4 +180,18 @@ VersionInfo& GetVer ();
 #define OSMajorVersion() (GetVer ().major ())
 #define OSMinorVersion() (GetVer ().minor ())
 
+static inline void
+GetDlgItemRect (HWND h, int item, LPRECT r)
+{
+  GetWindowRect (GetDlgItem (h, item), r);
+  MapWindowPoints (HWND_DESKTOP, h, (LPPOINT) r, 2);
+}
+
+static inline void
+SetDlgItemRect (HWND h, int item, LPRECT r)
+{
+  MoveWindow (GetDlgItem (h, item), r->left, r->top,
+             r->right - r->left, r->bottom - r->top, TRUE);
+}
+
 #endif /* SETUP_WIN32_H */