Fix discrepancy between different ways of measuring text extents under Mac.

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index c33db8913b7c8d548e17e2d7e839d6adf117513a..3c6d04dcd1e55985d679f271a6756f196b8a793d 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -161,16 +161,6 @@ wxString wxDecToHex(int dec)
 // misc functions
 // ----------------------------------------------------------------------------
 
 // misc functions
 // ----------------------------------------------------------------------------
 

-// Don't synthesize KeyUp events holding down a key and producing KeyDown
-// events with autorepeat. On by default and always on in wxMSW. wxGTK version
-// in utilsgtk.cpp.
-#ifndef __WXGTK__
-bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
-{
-    return true;    // detectable auto-repeat is the only mode MSW supports
-}
-#endif // !wxGTK
-

 // Return the current date/time
 wxString wxNow()
 {
 // Return the current date/time
 wxString wxNow()
 {


@@ -933,6 +923,16 @@ void wxQsort(void *const pbase, size_t total_elems,
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+// this function is only really implemented for X11-based ports, including GTK1
+// (GTK2 sets detectable auto-repeat automatically anyhow)
+#if !(defined(__WXX11__) || defined(__WXMOTIF__) || \
+        (defined(__WXGTK__) && !defined(__WXGTK20__)))
+bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
+{
+    return true;
+}
+#endif // !X11-based port
+

 // ----------------------------------------------------------------------------
 // Launch default browser
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Launch default browser
 // ----------------------------------------------------------------------------