From db7d4c7d5b62d95f008873dbf16db8fd5ad88cdb Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Wed, 6 May 2009 11:00:26 +0000
Subject: First stage of Cocoa platform addition. Changed identifier id since
 this is a reserved word in Objective C. SCI_LEXER and SCI_NAMESPACE turned on
 automatically for OS X native compilation.

---
 src/XPM.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/XPM.h b/src/XPM.h
index 0ee68c072..07cb5802b 100644
--- a/src/XPM.h
+++ b/src/XPM.h
@@ -16,7 +16,7 @@ namespace Scintilla {
  * Hold a pixmap in XPM format.
  */
 class XPM {
-	int id;		// Assigned by container
+	int pid;		// Assigned by container
 	int height;
 	int width;
 	int nColours;
@@ -42,8 +42,8 @@ public:
 	/// Decompose image into runs and use FillRectangle for each run
 	void Draw(Surface *surface, PRectangle &rc);
 	char **InLinesForm() { return lines; }
-	void SetId(int id_) { id = id_; }
-	int GetId() { return id; }
+	void SetId(int pid_) { pid = pid_; }
+	int GetId() { return pid; }
 	int GetHeight() { return height; }
 	int GetWidth() { return width; }
 	static const char **LinesFormFromTextForm(const char *textForm);
-- 
cgit v1.2.3