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 6d4fa1b5da5ae663c4879cffae8772bfc6cc474e..6723ed2ad4432cf16167aa1c8660cffc3372523a 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -27,6 +27,9 @@
 #include <string.h>
 #include <stdarg.h>
 
 #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)
 {
 // 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
 }
 {
     // TODO
 }

+#endif // !__UNIX__

 
 // Emit a beeeeeep
 void wxBell()
 
 // Emit a beeeeeep
 void wxBell()


@@ -256,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)


@@ -274,12 +279,15 @@ wxString wxMacFindFolder( short                                   vol,
        }
        return strDir ;
 }
        }
        return strDir ;
 }

+#endif

 
 

+#ifndef __UNIX__

 char *wxGetUserHome (const wxString& user)
 {
     // TODO
     return NULL;
 }
 char *wxGetUserHome (const wxString& user)
 {
     // TODO
     return NULL;
 }

+#endif

 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
 
 // 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 ; 
 
     *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() ;
        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)
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)