Added wxTopLevelWindow::HasFocus() as discussed.

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index d00df75d1d312cb3ce3a68eef567328bd64af7eb..cb662e9ad9a99aab120ba2287cce9a7c10a2a2ed 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -213,8 +213,14 @@ wxSize wxControl::DoGetBestSize() const
 wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const
 {
     // take size according to layout
 wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const
 {
     // take size according to layout

-    wxSize bestSize(GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
-                    GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL));
+    wxSize bestSize(
+#ifdef __SMARTPHONE__
+                    0,GetCharHeight()
+#else // !__SMARTPHONE__
+                    GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
+                    GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)
+#endif // __SMARTPHONE__/!__SMARTPHONE__
+    );

 
     // correct size as for undocumented MSW variants cases (WinCE and perhaps others)
     if (bestSize.x==0)
 
     // correct size as for undocumented MSW variants cases (WinCE and perhaps others)
     if (bestSize.x==0)