Got rid of some wierd VisualAge debug nonsense that had appeared in this after the...

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 5d1e9faf41fc24fda8a45f7dfa5497b94cb2856d..6723ed2ad4432cf16167aa1c8660cffc3372523a 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -260,6 +260,7 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }    
 
   return (wxBusyCursorCount > 0);
 }    
 

+#ifndef __UNIX__

 wxString wxMacFindFolder( short                                        vol,
                                                                 OSType                                 folderType,
                                                                 Boolean                                createFolder)
 wxString wxMacFindFolder( short                                        vol,
                                                                 OSType                                 folderType,
                                                                 Boolean                                createFolder)


@@ -278,6 +279,7 @@ wxString wxMacFindFolder( short                                     vol,
        }
        return strDir ;
 }
        }
        return strDir ;
 }

+#endif

 
 #ifndef __UNIX__
 char *wxGetUserHome (const wxString& user)
 
 #ifndef __UNIX__
 char *wxGetUserHome (const wxString& user)


@@ -343,6 +345,11 @@ void wxDisplaySize(int *width, int *height)
 #endif
 }
 
 #endif
 }
 

+void wxDisplaySizeMM(int *width, int *height)
+{
+   wxDisplaySize(width, height);
+}
+

 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);