Having just read README.MacOSX, I went and looked at the patch that we
must apply to the Qt sources in order to build lyx on this platform.

There are two changes that must be made. The first one looks like a
simple oversight on Qt's part. Has anybody reported this to Qt so
that they can merge the patch into their sources?

--- src/kernel/qapplication_mac.cpp.orig        Thu Jun 19 01:35:24
2003
+++ src/kernel/qapplication_mac.cpp     Thu Jul  3 08:29:41 2003
@@ -1026,6 +1026,7 @@
 { '}', MAP_KEY(Qt::Key_BraceRight) },
 { '|', MAP_KEY(Qt::Key_Bar) },
 { '~', MAP_KEY(Qt::Key_AsciiTilde) },
+{ '^', MAP_KEY(Qt::Key_AsciiCircum) },
 //terminator
 {   0, MAP_KEY(0) } };


The second change is, IMO, our fault. The name clash would go away if
we used namespaces in the frontends. There are no 'issues' with
wrapping the frontend code inside namespace lyx::frontend are there?
Ie, if it compiles, then all is well?

--- src/kernel/qwindowdefs.h.orig       Wed Jun 11 01:50:44 2003
+++ src/kernel/qwindowdefs.h    Thu Jul  3 08:27:36 2003
@@ -101,7 +101,7 @@
 #ifndef Q_WS_MACX
 typedef struct CGContext *CGContextRef;
 #endif
-typedef struct OpaqueControlRef *ControlRef;
+// typedef struct OpaqueControlRef *ControlRef;
 typedef struct OpaqueWindowGroupRef *WindowGroupRef;
 typedef struct OpaqueGrafPtr *CGrafPtr;
 typedef struct OpaquePMPrintSession *PMPrintSession;

-- 
Angus

Reply via email to