Add ability to have a wxMenuBar as a common menu

[wxWidgets.git] / src / common / filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 6a8814158c8df56398b65c091116c9f8cc158857..82efd1a6ae8e091640a385b24f42864af4638064 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -6,7 +6,7 @@
 // Created:     28.12.2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Robert Roebling
 // Created:     28.12.2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /*
 /////////////////////////////////////////////////////////////////////////////
 
 /*


@@ -107,10 +107,17 @@
 #endif
 
 #ifdef __MWERKS__
 #endif
 
 #ifdef __MWERKS__

+#ifdef __MACH__
+#include <sys/types.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#else

 #include <stat.h>
 #include <unistd.h>
 #include <unix.h>
 #endif
 #include <stat.h>
 #include <unistd.h>
 #include <unix.h>
 #endif

+#endif

 
 #ifdef __WATCOMC__
 #include <io.h>
 
 #ifdef __WATCOMC__
 #include <io.h>


@@ -1784,18 +1791,18 @@ public :
   }
   MacDefaultExtensionRecord( const MacDefaultExtensionRecord& from )
   {
   }
   MacDefaultExtensionRecord( const MacDefaultExtensionRecord& from )
   {

-    strcpy( m_ext , from.m_ext ) ;
+    wxStrcpy( m_ext , from.m_ext ) ;

     m_type = from.m_type ;
     m_creator = from.m_creator ;
   }
     m_type = from.m_type ;
     m_creator = from.m_creator ;
   }

-  MacDefaultExtensionRecord( const char * extension , OSType type , OSType creator )
+  MacDefaultExtensionRecord( const wxChar * extension , OSType type , OSType creator )

   {
   {

-    strncpy( m_ext , extension , kMacExtensionMaxLength ) ;
+    wxStrncpy( m_ext , extension , kMacExtensionMaxLength ) ;

     m_ext[kMacExtensionMaxLength] = 0 ;
     m_type = type ;
     m_creator = creator ;
   }
     m_ext[kMacExtensionMaxLength] = 0 ;
     m_type = type ;
     m_creator = creator ;
   }

-  char m_ext[kMacExtensionMaxLength] ;
+  wxChar m_ext[kMacExtensionMaxLength] ;

   OSType m_type ;
   OSType m_creator ;
 }  ;
   OSType m_type ;
   OSType m_creator ;
 }  ;


@@ -1819,7 +1826,7 @@ static void MacEnsureDefaultExtensionsLoaded()
     // load the default extensions
     MacDefaultExtensionRecord defaults[1] =
     {
     // load the default extensions
     MacDefaultExtensionRecord defaults[1] =
     {

-      MacDefaultExtensionRecord( "txt" , 'TEXT' , 'ttxt' ) ,
+      MacDefaultExtensionRecord( wxT("txt") , 'TEXT' , 'ttxt' ) ,

 
     } ;
     // we could load the pc exchange prefs here too
 
     } ;
     // we could load the pc exchange prefs here too


@@ -1891,7 +1898,7 @@ void wxFileName::MacRegisterDefaultTypeAndCreator( const wxString& ext , wxUint3
   MacDefaultExtensionRecord rec ;
   rec.m_type = type ;
   rec.m_creator = creator ;
   MacDefaultExtensionRecord rec ;
   rec.m_type = type ;
   rec.m_creator = creator ;

-  strncpy( rec.m_ext , ext.Lower().c_str() , kMacExtensionMaxLength ) ;
+  wxStrncpy( rec.m_ext , ext.Lower().c_str() , kMacExtensionMaxLength ) ;

   gMacDefaultExtensions.Add( rec ) ;
 }
 #endif
   gMacDefaultExtensions.Add( rec ) ;
 }
 #endif