x11: Pass the GdkScreen to the XSettingsClient

[~andy/gtk] / gdk / gdkkeyuni.c

diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
index 88f36a48fc1f03118b8472d83574436f9a7258f8..a8c1c3472b7067b64f5863899784db2d5ab8c415 100644 (file)
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -26,6 +24,7 @@
 
 #include "config.h"
 
+#include "gdkkeys.h"
 #include "gdktypes.h"
 
 
@@ -832,13 +831,18 @@ static const struct {
   /* Following items added to GTK, not in the xterm table */
 
   /* A few ASCII control characters */
-
+#ifndef GDK_WINDOWING_WIN32
   { 0xFF08 /* Backspace */, '\b' },
   { 0xFF09 /* Tab       */, '\t'  },
+#endif
+
   { 0xFF0A /* Linefeed  */, '\n' },
   { 0xFF0B /* Vert. Tab */, '\v' },
+
+#ifndef GDK_WINDOWING_WIN32
   { 0xFF0D /* Return    */, '\r' },
   { 0xFF1B /* Escape    */, '\033' },
+#endif
 
   /* Numeric keypad */
 
@@ -863,7 +867,9 @@ static const struct {
 
   /* End numeric keypad */
 
+#ifndef GDK_WINDOWING_WIN32
   { 0xFFFF /* Delete */, '\177' }
+#endif
 };
 
 /**