Applying patch #10784: eliminate gauge flicker

[wxWidgets.git] / src / osx / core / utilsexc_base.cpp

diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp
index 38fe12a12d03cab8a0d8111f264a1d87d8f06ec1..e3e9f996bc387f131cc45a9d1fb6f568e81dc0c2 100644 (file)
--- a/src/osx/core/utilsexc_base.cpp
+++ b/src/osx/core/utilsexc_base.cpp
@@ -45,6 +45,15 @@
 // Default path style
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 
+#if wxUSE_SOCKETS
+// global pointer which lives in the base library, set from the net one (see
+// sockosx.cpp) and used from the GUI code (see utilsexc_cf.cpp) -- ugly but
+// needed hack, see the above-mentioned files for more information
+class wxSocketManager;
+extern WXDLLIMPEXP_BASE wxSocketManager *wxOSXSocketManagerCF;
+wxSocketManager *wxOSXSocketManagerCF = NULL;
+#endif // wxUSE_SOCKETS
+
 extern bool WXDLLEXPORT wxIsDebuggerRunning()
 {
     // TODO : try to find out ...
@@ -55,14 +64,14 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning()
 
 // have a fast version for mac code that returns the version as a return value
 
-long UMAGetSystemVersion() 
-{ 
+long UMAGetSystemVersion()
+{
     static SInt32 sUMASystemVersion = 0 ;
     if ( sUMASystemVersion == 0 )
     {
         verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
     }
-    return sUMASystemVersion ; 
+    return sUMASystemVersion ;
 }
 
 // our OS version is the same in non GUI and GUI cases
@@ -86,14 +95,12 @@ wxString wxGetOsDescription()
 {
     struct utsname name;
     uname(&name);
-    return wxString::Format(_T("Mac OS X (%s %s %s)"),
+    return wxString::Format(wxT("Mac OS X (%s %s %s)"),
             wxString::FromAscii(name.sysname).c_str(),
             wxString::FromAscii(name.release).c_str(),
             wxString::FromAscii(name.machine).c_str());
 }
 
-#endif // wxOSX_USE_COCOA_OR_CARBON
-
 //===========================================================================
 //  IMPLEMENTATION
 //===========================================================================
@@ -277,3 +284,4 @@ bool wxMacLaunch(char **argv)
     return true ;
 }
 
+#endif // wxOSX_USE_COCOA_OR_CARBON