correct hhp2cached path

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index e302a68cdd15bad134a14efb658bcda4e00ef076..02f46c0bc5f69b170aa8b6e25a56d72e6556ee0f 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -314,13 +314,12 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 
 wxString wxGetOsDescription()
 {
 
 wxString wxGetOsDescription()
 {

-    char data[128];

     struct utsname name;
     uname(&name);
     struct utsname name;
     uname(&name);

-       return wxString::Format(_T("Mac OS X (%s %s %s)"),
-                       wxString::FromAscii(name.sysname).c_str(),
-                       wxString::FromAscii(name.release).c_str(),
-                       wxString::FromAscii(name.machine).c_str());
+    return wxString::Format(_T("Mac OS X (%s %s %s)"),
+            wxString::FromAscii(name.sysname).c_str(),
+            wxString::FromAscii(name.release).c_str(),
+            wxString::FromAscii(name.machine).c_str());

 }
 
 #ifndef __DARWIN__
 }
 
 #ifndef __DARWIN__


@@ -1561,7 +1560,7 @@ unsigned int wxMacDataItemBrowserControl::GetLineFromItem(const wxMacDataItem* i
 {
     DataBrowserTableViewRowIndex row;
     OSStatus err = GetItemRow( (DataBrowserItemID) item , &row);
 {
     DataBrowserTableViewRowIndex row;
     OSStatus err = GetItemRow( (DataBrowserItemID) item , &row);

-    wxASSERT( err == noErr);
+    wxCHECK( err == noErr, (unsigned)-1 );

     return row;
 }
 
     return row;
 }
 


@@ -1569,7 +1568,7 @@ wxMacDataItem*  wxMacDataItemBrowserControl::GetItemFromLine(unsigned int n) con
 {
     DataBrowserItemID id;
     OSStatus err =  GetItemID( (DataBrowserTableViewRowIndex) n , &id);
 {
     DataBrowserItemID id;
     OSStatus err =  GetItemID( (DataBrowserTableViewRowIndex) n , &id);

-    wxASSERT( err == noErr);
+    wxCHECK( err == noErr, NULL );

     return (wxMacDataItem*) id;
 }
 
     return (wxMacDataItem*) id;
 }