X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b781a6729859abc77e6ca5b1f81cbaad974a78f..1454d4e6599bbd18086cdf0cf1b06c2b9004fe3a:/src/mac/utils.cpp?ds=sidebyside

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 6d4fa1b5da..6723ed2ad4 100644
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -27,6 +27,9 @@
 #include <string.h>
 #include <stdarg.h>
 
+#ifndef __UNIX__
+// defined in unix/utilsunx.cpp for Mac OS X
+
 // get full hostname (with domain name if possible)
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {
@@ -123,6 +126,7 @@ void wxFatalError(const wxString& msg, const wxString& title)
 {
     // TODO
 }
+#endif // !__UNIX__
 
 // Emit a beeeeeep
 void wxBell()
@@ -256,6 +260,7 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }    
 
+#ifndef __UNIX__
 wxString wxMacFindFolder( short 					vol,
 								 OSType 				folderType,
 								 Boolean 				createFolder)
@@ -274,12 +279,15 @@ wxString wxMacFindFolder( short 					vol,
 	}
 	return strDir ;
 }
+#endif
 
+#ifndef __UNIX__
 char *wxGetUserHome (const wxString& user)
 {
     // TODO
     return NULL;
 }
+#endif
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
@@ -328,13 +336,18 @@ void wxDisplaySize(int *width, int *height)
 
     *width = screenBits.bounds.right - screenBits.bounds.left  ;
     *height = screenBits.bounds.bottom - screenBits.bounds.top ; 
- #if TARGET_CARBON
+#if TARGET_CARBON
  	SInt16 mheight ;
  	GetThemeMenuBarHeight( &mheight ) ;
      *height -= mheight ;
 #else
      *height -= LMGetMBarHeight() ;
- #endif
+#endif
+}
+
+void wxDisplaySizeMM(int *width, int *height)
+{
+   wxDisplaySize(width, height);
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)