More efficient access to name and value

[wxWidgets.git] / include / wx / x11 / nanox / X11 / Xlib.h

diff --git a/include/wx/x11/nanox/X11/Xlib.h b/include/wx/x11/nanox/X11/Xlib.h
index 01ebd461b2ba2e313e07285a5409789e56ed979d..0e3aed4d23ae129f97132ac7ac715e7e339de0ca 100644 (file)
--- a/include/wx/x11/nanox/X11/Xlib.h
+++ b/include/wx/x11/nanox/X11/Xlib.h
@@ -5,10 +5,6 @@
 #ifndef _DUMMY_XLIBH_
 #define _DUMMY_XLIBH_
 
 #ifndef _DUMMY_XLIBH_
 #define _DUMMY_XLIBH_
 

-#ifdef __GNUG__
-    #pragma interface "Xlib.h"
-#endif
-

 /* Move away the typedef in XtoNX.h */
 #define XFontStruct XFontStruct1
 #include <XtoNX.h>
 /* Move away the typedef in XtoNX.h */
 #define XFontStruct XFontStruct1
 #include <XtoNX.h>


@@ -48,7 +44,7 @@ typedef struct {
 #define   CWStackMode                 (1<<6)
 
 /* Values */
 #define   CWStackMode                 (1<<6)
 
 /* Values */

- 
+

 typedef struct {
         int x, y;
         int width, height;
 typedef struct {
         int x, y;
         int width, height;


@@ -118,8 +114,8 @@ typedef struct {
 #define XFreeCursor(d, c) GrDestroyCursor(c)
 #define XFreeGC(d, gc) GrDestroyGC(gc)
 #define XSetBackground(d, gc, c) GrSetGCBackground(gc, c)
 #define XFreeCursor(d, c) GrDestroyCursor(c)
 #define XFreeGC(d, gc) GrDestroyGC(gc)
 #define XSetBackground(d, gc, c) GrSetGCBackground(gc, c)

-#define DefaultVisual(d, s) ((Visual*) NULL)
-#define DefaultColormap(d, s) DefaultColormapOfScreen((Screen*) NULL)
+#define DefaultVisual(d, s) (NULL)
+#define DefaultColormap(d, s) DefaultColormapOfScreen(NULL)

 #define DefaultScreenOfDisplay(d) 0
 #define XSetFillStyle(d, gc, s) wxNoop()
 #define XSetLineAttributes(d, gc, a, b, c, e) wxNoop()
 #define DefaultScreenOfDisplay(d) 0
 #define XSetFillStyle(d, gc, s) wxNoop()
 #define XSetLineAttributes(d, gc, a, b, c, e) wxNoop()