changed four-character Apple Window Identifiers from XWT to IBX

[org.ibex.core.git] / src / org / ibex / plat / Darwin.cc

diff --git a/src/org/ibex/plat/Darwin.cc b/src/org/ibex/plat/Darwin.cc
index 7ab8696..9a77ae0 100644 (file)
--- a/src/org/ibex/plat/Darwin.cc
+++ b/src/org/ibex/plat/Darwin.cc
@@ -1,4 +1,7 @@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [LGPL]
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
+
 // Authors: Brian Alliet and Evan Jones
 #ifndef __APPLE_CC__
 #define FSF_GCC
@@ -24,7 +27,7 @@
 #include <org/ibex/plat/Darwin$CarbonOpenGL.h>
 #include <org/ibex/plat/Darwin$FileDialogHelper.h>
 #include <org/ibex/plat/GCJ$Retainer.h>
-#include <org/ibex/HTTP$Proxy.h>
+#include <org/ibex/net/HTTP$Proxy.h>
 #include <org/ibex/util/Semaphore.h>
 
 #include <stdlib.h>
@@ -256,9 +259,9 @@ class SmartCFString {
 };
 
 // CHECKME: Is just making up your own four char codes really correct?
-const static UInt32 kEventClassCarbonMessage = 'ibexa';
-const static UInt32 kEventCarbonMessage = 'ibexb';
-const static UInt32 kEventParamCarbonMessage = 'ibexc';
+const static UInt32 kEventClassCarbonMessage = 'ibxa';
+const static UInt32 kEventCarbonMessage = 'ibxb';
+const static UInt32 kEventParamCarbonMessage = 'ibxc';
 
 static OSStatus carbonMessageEventHandler(EventHandlerCallRef handler, EventRef e, void *userData);
 static EventHandlerUPP carbonMessageEventHandlerUPP;
@@ -740,7 +743,7 @@ void Darwin$CarbonSurface::natDispose() {
     WC(DisposeWindow)(window);
 }
 
-void Darwin$CarbonSurface::natSetIcon(org::ibex::Picture *_p) {
+void Darwin$CarbonSurface::natSetIcon(org::ibex::graphics::Picture *_p) {
 }
 
 void Darwin$CarbonSurface::natSetLocation() {
@@ -889,9 +892,8 @@ void Darwin::natSetClipBoard(jstring js) {
     checkStatus(r,"PutScrapFlavor");
 }
 
-HTTP$Proxy *Darwin::natDetectProxy() {
-    using org::ibex::HTTP$Proxy;
-    HTTP$Proxy *p=0;
+org::ibex::net::HTTP$Proxy *Darwin::natDetectProxy() {
+    org::ibex::net::HTTP$Proxy *p=0;
     CFStringRef string;
     CFNumberRef number;
     SmartCFString smartString;
@@ -910,7 +912,7 @@ HTTP$Proxy *Darwin::natDetectProxy() {
         number = (CFNumberRef) WC(CFDictionaryGetValue)(proxyInfo, kSCPropNetProxies ## proto ## Port); \
         if(number != NULL && WC(CFGetTypeID)(number) != WC(CFNumberGetTypeID)()) number = NULL;    \
         if(string && number && WC(CFNumberGetValue)(number,kCFNumberIntType,&i) && i) {        \
-            if(!p) p = new HTTP$Proxy();                                                        \
+            if(!p) p = new org::ibex::net::HTTP$Proxy();                                                        \
             p->var ## ProxyHost = cfStringToJString(string);                           \
             p->var ## ProxyPort = i;                                                   \
         }                                                                                  \