components/wxwidgets/patches/wxwidgets-06-Tmacro.patch
author Vladimir Marek <Vladimir.Marek@oracle.com>
Tue, 10 May 2011 14:43:11 -0700
changeset 262 7e3572caa313
permissions -rw-r--r--
7031528 move wxGTK to userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
262
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     1
From 5e1b0e4ade49f064c19d8b0e8fcdb31dc04c039b Mon Sep 17 00:00:00 2001
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     2
From: Vadim Zeitlin <[email protected]>
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     3
Date: Wed, 9 Sep 2009 15:48:05 +0200
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     4
Subject: [PATCH 5/5] Predefine wxNEEDS_T to fix wxrc compilation with Sun CC.
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     5
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     6
After the recent changes _T() is not defined any longer when using Sun CC but
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     7
this file does need it to be defined and seems to compile fine when it is, so
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     8
define wxNEEDS_T before including any wx headers.
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     9
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    10
See #10660.
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    11
---
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    12
 utils/wxrc/wxrc.cpp |    3 +++
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    13
 1 files changed, 3 insertions(+), 0 deletions(-)
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    14
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    15
diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    16
index cca4ba1..c255db7 100644
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    17
--- a/utils/wxrc/wxrc.cpp
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    18
+++ b/utils/wxrc/wxrc.cpp
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    19
@@ -8,6 +8,9 @@
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    20
 // Licence:     wxWindows licence
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    21
 /////////////////////////////////////////////////////////////////////////////
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    22
 
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    23
+// To fix compilation when using Sun CC we must define _T() for this file.
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    24
+#define wxNEEDS_T
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    25
+
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    26
 // For compilers that support precompilation, includes "wx/wx.h".
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    27
 #include "wx/wxprec.h"
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    28
 
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    29
-- 
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    30
1.6.3.3
7e3572caa313 7031528 move wxGTK to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    31