Replaced header names so that code will compile on Mac OS X Release Candidate version, replaced all carriage returns and Unix newlines, and removed all non-gcc pragmas

9 files changed, 109 insertions, 161 deletions

diff --git a/vcl/aqua/inc/salatsuifontutils.hxx b/vcl/aqua/inc/salatsuifontutils.hxx
index 1ec4930ab217..25c529f60eb6 100644
--- a/vcl/aqua/inc/salatsuifontutils.hxx
+++ b/vcl/aqua/inc/salatsuifontutils.hxx
@@ -2,8 +2,8 @@
  *
  *  $RCSfile: salatsuifontutils.hxx,v $
  *
- *  $Revision: 1.1 $
- *  last change: $Author: bmahbod $ $Date: 2001-03-12 23:15:30 $
+ *  $Revision: 1.2 $
+ *  last change: $Author: pluby $ $Date: 2001-03-13 09:44:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,55 +86,29 @@
 #endif
 
 #include <premac.h>
+#include <Carbon/Carbon.h>
+#include <ApplicationServices/ApplicationServices.h>
+#include <postmac.h>
 
-    #ifndef __MACERRORS__
      #include <CarbonCore/MacErrors.h>
-    #endif
-
-    #ifndef __MACTYPES__
-        #include <CarbonCore/MacTypes.h>
-    #endif
-
-    #ifndef __MACMEMORY__
-        #include <CarbonCore/MacMemory.h>
-    #endif
-
-    #ifndef __SCRIPT__
-        #include <CarbonCore/Script.h>
-    #endif
-
-    #ifndef __STRINGCOMPARE__
-        #include <CarbonCore/StringCompare.h>
-    #endif
-
-    #if (ATSU_TARG_VERSION >= ATSU_1_2)
-        #ifndef __UNICODEUTILITIES__
-            #include <CarbonCore/UnicodeUtilities.h>
-        #endif
-    #endif
+#ifdef __cplusplus
+    extern "C" {
+#endif
 
-    #ifndef __MENUS__

-        #include <HIToolbox/Menus.h>
-    #endif
+// =======================================================================
 
-    #ifndef __ATSUNICODE__
     #include <QD/ATSUnicode.h>
-    #endif
+// =======================================================================
 
-    #ifndef __FONTS__
-        #include <QD/Fonts.h>
-    #endif
+const short kMacOSCharSize = sizeof(char);
 
-#include <postmac.h>
+// -----------------------------------------------------------------------
 
-#if PRAGMA_ONCE
    #pragma once
#endif

#ifdef __cplusplus
    extern "C" {
#endif

// =======================================================================
+const short kFontFamilyNameLength = 32;
+const short kFontStyleNameLength  = 32;
 
-// =======================================================================
+const long  kFontFamilyNameMemSize  = kFontFamilyNameLength * kMacOSCharSize;
 
-const short kMacOSCharSize = sizeof(char);
-
// -----------------------------------------------------------------------
+const long  kFontStyleNameMemSize   = kFontStyleNameLength  * kMacOSCharSize;
 
-const short kFontFamilyNameLength = 32;
const short kFontStyleNameLength  = 32;
-
const long  kFontFamilyNameMemSize  = kFontFamilyNameLength * kMacOSCharSize;

-const long  kFontStyleNameMemSize   = kFontStyleNameLength  * kMacOSCharSize;

 
 // -----------------------------------------------------------------------
 
@@ -175,7 +149,53 @@ enum
 
 // =======================================================================
 
-typedef short ATSUIInstanceIndex;

// -----------------------------------------------------------------------

struct FontNameEncodingRecord
{
 FontPlatformCode  mnFontPlatformCode;
  FontScriptCode    mnFontScriptCode;
    FontLanguageCode  mnFontLanguageCode;
  ItemCount         mnFontItemCount;
};

typedef struct FontNameEncodingRecord   FontNameEncodingRecord;
typedef FontNameEncodingRecord         *FontNameEncodingPtr;
typedef FontNameEncodingPtr            *FontNameEncodingMatrix;

// -----------------------------------------------------------------------

struct FontNamesRecord 
{
 ATSUFontID              mnFontID;
  FontNameEncodingRecord  maFontFamilyNameEncoding;
  FontNameEncodingRecord  maFontStyleNameEncoding;
   ATSUIInstanceIndex      mnFontInstanceIndex;
   ByteOffset              mnFontStyleByteOffset;
 char                    mpFontName[ 1 ];
};

typedef struct FontNamesRecord   FontNamesRecord;
typedef FontNamesRecord         *FontNamesPtr;
typedef FontNamesPtr            *FontNamesMatrix;

// -----------------------------------------------------------------------

struct FontMenuItemRecord 
{
  short               mnFontMenuID;
  short               mnFontItemNum;
 ATSUFontID          mnFontID;
  ATSUIInstanceIndex  mnFontInstanceIndex;
};

typedef struct FontMenuItemRecord   FontMenuItemRecord;
typedef FontMenuItemRecord         *FontMenuItemPtr;
typedef FontMenuItemPtr            *FontMenuItemsHandle;

// =======================================================================
+typedef short ATSUIInstanceIndex;
+
+// -----------------------------------------------------------------------
+
+struct FontNameEncodingRecord
+{
+    FontPlatformCode  mnFontPlatformCode;
+    FontScriptCode    mnFontScriptCode;
+    FontLanguageCode  mnFontLanguageCode;
+    ItemCount         mnFontItemCount;
+};
+
+typedef struct FontNameEncodingRecord   FontNameEncodingRecord;
+typedef FontNameEncodingRecord         *FontNameEncodingPtr;
+typedef FontNameEncodingPtr            *FontNameEncodingMatrix;
+
+// -----------------------------------------------------------------------
+
+struct FontNamesRecord
+{
+    ATSUFontID              mnFontID;
+    FontNameEncodingRecord  maFontFamilyNameEncoding;
+    FontNameEncodingRecord  maFontStyleNameEncoding;
+    ATSUIInstanceIndex      mnFontInstanceIndex;
+    ByteOffset              mnFontStyleByteOffset;
+    char                    mpFontName[ 1 ];
+};
+
+typedef struct FontNamesRecord   FontNamesRecord;
+typedef FontNamesRecord         *FontNamesPtr;
+typedef FontNamesPtr            *FontNamesMatrix;
+
+// -----------------------------------------------------------------------
+
+struct FontMenuItemRecord
+{
+    short               mnFontMenuID;
+    short               mnFontItemNum;
+    ATSUFontID          mnFontID;
+    ATSUIInstanceIndex  mnFontInstanceIndex;
+};
+
+typedef struct FontMenuItemRecord   FontMenuItemRecord;
+typedef FontMenuItemRecord         *FontMenuItemPtr;
+typedef FontMenuItemPtr            *FontMenuItemsHandle;
+
+// =======================================================================
 
 // =======================================================================
 
@@ -275,5 +295,11 @@ void ATSUIPrintFontList( const ItemCount  nFontItemsCount,
 
 // =======================================================================
 
-// =======================================================================

#ifdef __cplusplus
}
#endif

#endif // _SV_SALATSUIFONTUTILS_HXX
+// =======================================================================
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // _SV_SALATSUIFONTUTILS_HXX
 
diff --git a/vcl/aqua/inc/salcolorutils.hxx b/vcl/aqua/inc/salcolorutils.hxx
index d73e0c906933..6dd1d126afc4 100755
--- a/vcl/aqua/inc/salcolorutils.hxx
+++ b/vcl/aqua/inc/salcolorutils.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salcolorutils.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: bmahbod $ $Date: 2001-03-12 23:15:31 $
+ *  last change: $Author: pluby $ $Date: 2001-03-13 09:44:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,22 +67,7 @@
 #endif
 
 #include <premac.h>
-
-    #ifndef __MACERRORS__
      #include <CarbonCore/MacErrors.h>
-    #endif
-
-    #ifndef __MACTYPES__
-        #include <CarbonCore/MacTypes.h>
-    #endif
-
-    #ifndef __MACMEMORY__
-        #include <CarbonCore/MacMemory.h>
-    #endif
-
-    #ifndef __QUICKDRAW__
-        #include <QD/Quickdraw.h>
-    #endif
-
+#include <ApplicationServices/ApplicationServices.h>
 #include <postmac.h>
 
 #ifndef _SV_SALBTYPE_HXX
@@ -101,7 +86,7 @@
     #include <salmathutils.hxx>
 #endif
 
-#if PRAGMA_ONCE
    #pragma once
#endif

// ------------------------------------------------------------------
+// ------------------------------------------------------------------
 
 SalColor RGBColor2SALColor ( const RGBColor *pRGBColor );
 
diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/aqua/inc/saldata.hxx
index e3155110a7da..329d1d9d0a78 100644
--- a/vcl/aqua/inc/saldata.hxx
+++ b/vcl/aqua/inc/saldata.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: saldata.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: bmahbod $ $Date: 2001-03-12 23:15:31 $
+ *  last change: $Author: pluby $ $Date: 2001-03-13 09:44:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,7 +82,7 @@
     #include <VCLWindow.h>
 #endif
 
-#if PRAGMA_ONCE
    #pragma once
#endif

#ifdef __cplusplus
+#ifdef __cplusplus
 
     class SalInstance;
     class SalObject;
diff --git a/vcl/aqua/inc/salfontutils.hxx b/vcl/aqua/inc/salfontutils.hxx
index bc94b66164aa..c0e4af9ff5a8 100644
--- a/vcl/aqua/inc/salfontutils.hxx
+++ b/vcl/aqua/inc/salfontutils.hxx
@@ -2,8 +2,8 @@
  *
  *  $RCSfile: salfontutils.hxx,v $
  *
- *  $Revision: 1.1 $
- *  last change: $Author: bmahbod $ $Date: 2001-03-12 23:15:31 $
+ *  $Revision: 1.2 $
+ *  last change: $Author: pluby $ $Date: 2001-03-13 09:44:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,7 +73,7 @@
     #include <outfont.hxx>
 #endif
 
-#if PRAGMA_ONCE
    #pragma once
#endif

// =======================================================================
+// =======================================================================
 
 // =======================================================================
 
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h
index d94cf38a22b6..8e4972b7e84f 100644
--- a/vcl/aqua/inc/salgdi.h
+++ b/vcl/aqua/inc/salgdi.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salgdi.h,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: bmahbod $ $Date: 2001-03-12 23:15:31 $
+ *  last change: $Author: pluby $ $Date: 2001-03-13 09:44:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,26 +63,7 @@
 #define _SV_SALGDI_H
 
 #include <premac.h>
-
-    #ifndef __MACERRORS__
      #include <CarbonCore/MacErrors.h>
-    #endif
-
-    #ifndef __MACTYPES__
-        #include <CarbonCore/MacTypes.h>
-    #endif
-
-    #ifndef __MACMEMORY__
-        #include <CarbonCore/MacMemory.h>
-    #endif
-
-    #ifndef __QUICKDRAW__
-        #include <QD/Quickdraw.h>
-    #endif
-
-    #ifndef __QDOFFSCREEN__
-        #include <QD/QDOffscreen.h>
-    #endif
-
+#include <ApplicationServices/ApplicationServices.h>
 #include <postmac.h>
 
 #ifndef _SV_SV_H
@@ -93,7 +74,7 @@
     #include <VCLWindow.h>
 #endif
 
-#if PRAGMA_ONCE
    #pragma once
#endif

// -------------------
+// -------------------
 // - Structures -
 // -------------------
 
diff --git a/vcl/aqua/inc/salmathutils.hxx b/vcl/aqua/inc/salmathutils.hxx
index 1f0ce01f68c6..e879951aeb61 100755
--- a/vcl/aqua/inc/salmathutils.hxx
+++ b/vcl/aqua/inc/salmathutils.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salmathutils.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: bmahbod $ $Date: 2001-03-12 23:15:31 $
+ *  last change: $Author: pluby $ $Date: 2001-03-13 09:44:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,11 @@
 #ifndef _SV_SALMATHUTILS_HXX
 #define _SV_SALMATHUTILS_HXX
 
-#if PRAGMA_ONCE
    #pragma once
#endif

#ifdef __cplusplus
    extern "C" {
#endif

// ------------------------------------------------------------------
+#ifdef __cplusplus
+    extern "C" {
+#endif
+
+// ------------------------------------------------------------------
 //
 //                            Structures
 //
@@ -110,4 +114,8 @@ unsigned long  Euclidian2Norm ( const LRectCoorVector  pVec );
 
 // ------------------------------------------------------------------
 
-#ifdef __cplusplus
}
#endif

#endif // _SV_SALMATHUTILS_HXX
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // _SV_SALMATHUTILS_HXX
diff --git a/vcl/aqua/inc/salpixmaputils.hxx b/vcl/aqua/inc/salpixmaputils.hxx
index 79f0de4bb759..025333b66e57 100755
--- a/vcl/aqua/inc/salpixmaputils.hxx
+++ b/vcl/aqua/inc/salpixmaputils.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salpixmaputils.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: bmahbod $ $Date: 2001-03-12 23:15:31 $
+ *  last change: $Author: pluby $ $Date: 2001-03-13 09:44:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,30 +63,7 @@
 #define _SV_SALPIXMAPUTILS_HXX
 
 #include <premac.h>
-
-    #ifndef __FIXMATH__
-        #include <CarbonCore/FixMath.h>
-    #endif
-
-    #ifndef __MACERRORS__
      #include <CarbonCore/MacErrors.h>
-    #endif
-
-    #ifndef __MACTYPES__
-        #include <CarbonCore/MacTypes.h>
-    #endif
-
-    #ifndef __MACMEMORY__
-        #include <CarbonCore/MacMemory.h>
-    #endif
-
-    #ifndef __QUICKDRAW__
-        #include <QD/Quickdraw.h>
-    #endif
-
-    #ifndef __QDOFFSCREEN__
-        #include <QD/QDOffscreen.h>
-    #endif
-
+#include <ApplicationServices/ApplicationServices.h>
 #include <postmac.h>
 
 #ifndef _GEN_HXX
@@ -109,7 +86,7 @@
     #include <salcolorutils.hxx>
 #endif
 
-#if PRAGMA_ONCE
    #pragma once
#endif

// ------------------------------------------------------------------
+// ------------------------------------------------------------------
 
 
 PixMapHandle GetNewPixMap ( const Size           &rPixMapSize,
@@ -125,4 +102,6 @@ PixMapHandle GetCGrafPortPixMap ( const Size           &rPixMapSize,
                                   const CGrafPtr        pCGraf
                                 );
 
-// ------------------------------------------------------------------

#endif   // _SV_SALPIXMAPUTILS_HXX
+// ------------------------------------------------------------------
+
+#endif  // _SV_SALPIXMAPUTILS_HXX
diff --git a/vcl/aqua/inc/salvd.h b/vcl/aqua/inc/salvd.h
index ba39f47fd6e3..297db03cff5a 100644
--- a/vcl/aqua/inc/salvd.h
+++ b/vcl/aqua/inc/salvd.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salvd.h,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: bmahbod $ $Date: 2001-03-12 23:15:31 $
+ *  last change: $Author: pluby $ $Date: 2001-03-13 09:44:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,30 +63,7 @@
 #define _SV_SALVD_H
 
 #include <premac.h>
-
-    #ifndef __MACERRORS__
      #include <CarbonCore/MacErrors.h>
-    #endif
-
-    #ifndef __MACTYPES__
-        #include <CarbonCore/MacTypes.h>
-    #endif
-
-    #ifndef __MACMEMORY__
-        #include <CarbonCore/MacMemory.h>
-    #endif
-
-    #ifndef __FONTS__
-        #include <QD/Fonts.h>
-    #endif
-
-    #ifndef __QUICKDRAW__
-        #include <QD/Quickdraw.h>
-    #endif
-
-    #ifndef __QDOFFSCREEN__
-        #include <QD/QDOffscreen.h>
-    #endif
-
+#include <ApplicationServices/ApplicationServices.h>
 #include <postmac.h>
 
 #ifndef _SV_SV_H
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 95ae71208cfb..4e03a1e8f313 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -2,8 +2,8 @@
  *
  *  $RCSfile: salgdi.cxx,v $
  *
- *  $Revision: 1.53 $
- *  last change: $Author: bmahbod $ $Date: 2001-03-12 23:15:32 $
+ *  $Revision: 1.54 $
+ *  last change: $Author: pluby $ $Date: 2001-03-13 09:44:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,7 +91,7 @@
     #include <salrectangleutils.hxx>
 #endif
 
-#if PRAGMA_ONCE
    #pragma once
#endif

// =======================================================================
+// =======================================================================
 
 // =======================================================================
 
@@ -266,8 +266,6 @@ void SalGraphics::ResetClipRegion()
 
 void SalGraphics::BeginSetClipRegion( ULONG nRectCount )
 {
-    #pragma unused(nRectCount)
-
     if ( maGraphicsData.mhClipRgn != NULL )
     {
         DisposeRgn( maGraphicsData.mhClipRgn );
@@ -748,8 +746,6 @@ void SalGraphics::CopyArea( long    nDstX,
                             USHORT  nFlags
                           )
 {
-    #pragma unused(nFlags)
-
     if ( BeginGraphics( &maGraphicsData ) )
     {
         const BitMap  *pDstBitMap = GetPortBitMapForCopyBits( maGraphicsData.mpCGrafPort );
@@ -1115,8 +1111,6 @@ void SalGraphics::Invert( long       nX,
                           SalInvert  nFlags
                         )
 {
-    #pragma unused(nSalFlags)
-
     // Implementation not yet complete
 
     if ( BeginGraphics( &maGraphicsData ) )
@@ -1142,8 +1136,6 @@ void SalGraphics::Invert( ULONG            nPoints,
                           SalInvert        nSalFlags
                         )
 {
-    #pragma unused(nSalFlags)
-
     // Implementation not yet complete
 
     if ( ( pPtAry != NULL ) && ( nPoints > 1 ) )