# HG changeset patch # User Frank Benoit # Date 1199949709 -3600 # Node ID c83c51423d031b6849e646d6af39622b352c5175 # Parent 7fb1ab01193333d62efe8aa84d9126bba83e6057 remove commented prototypes diff -r 7fb1ab011933 -r c83c51423d03 dwt/internal/gtk/OS.d --- a/dwt/internal/gtk/OS.d Thu Jan 10 08:18:45 2008 +0100 +++ b/dwt/internal/gtk/OS.d Thu Jan 10 08:21:49 2008 +0100 @@ -170,229 +170,11 @@ } -private int PANGO_PIXELS( int v ); -//private GdkWindow* GDK_ROOT_PARENT(); -//private GdkDisplay* GDK_DISPLAY(); -//private GType GTK_TYPE_FIXED(); -//private GType GTK_TYPE_CELL_RENDERER_TEXT(); -//private GType GTK_TYPE_CELL_RENDERER_PIXBUF(); -//private GType GTK_TYPE_CELL_RENDERER_TOGGLE(); -//private bool GTK_IS_WINDOW(GtkWidget *); -//private bool GTK_IS_CONTAINER(GtkWidget*); -//private int GTK_IS_PLUG(GtkWidget*); -//private GType GTK_TYPE_MENU(); -//private GType GTK_TYPE_WIDGET(); -/+private GType GTK_WIDGET_FLAGS(GtkWidget*); -private GType GTK_WIDGET_STATE(GtkWidget*); -private GType GTK_WIDGET_HAS_DEFAULT(GtkWidget*); -private GType GTK_WIDGET_HAS_FOCUS(GtkWidget*); -private GType GTK_WIDGET_IS_SENSITIVE(GtkWidget*); -private GType GTK_WIDGET_MAPPED(GtkWidget*); -private GType GTK_WIDGET_SENSITIVE(GtkWidget*); -private void GTK_WIDGET_SET_FLAGS(GtkWidget*, int); -private void GTK_WIDGET_UNSET_FLAGS(GtkWidget*, int); -private bool GTK_WIDGET_VISIBLE(GtkWidget*); -private GType G_OBJECT_CLASS (); -private GType G_OBJECT_GET_CLASS (); -private GType G_OBJECT_TYPE_NAME (); -private GType G_TYPE_BOOLEAN(); -private GType G_TYPE_INT(); -private GType G_OBJECT_TYPE( GObject* ); -private GType G_TYPE_STRING(); -+/ // fontconfig.h struct FcConfig{}; private extern(C) int FcConfigAppFontAddFile (FcConfig *config, char *file); - -/++++ -// temporary added, because was not yet available -struct XAnyEvent { - int type; - uint serial; - int send_event; - void * display; - uint window; -} -union XEvent{ - int type; - XAnyEvent xany; -} - -struct XRenderPictureAttributes{ - int repeat; - uint alpha_map; - int alpha_x_origin; - int alpha_y_origin; - int clip_x_origin; - int clip_y_origin; - uint clip_mask; - int graphics_exposures; - int subwindow_mode; - int poly_edge; - int poly_mode; - uint dither; - int component_alpha; -} -struct XRenderDirectFormat { - short red; - short redMask; - short green; - short greenMask; - short blue; - short blueMask; - short alpha; - short alphaMask; -} -struct XRenderPictFormat { - uint id; - int type; - int depth; - XRenderDirectFormat direct; - uint colormap; -} - -struct XTransform { - int [3][3] matrix; -} -struct XRectangle { - short x; - short y; - ushort width; - ushort height; -} -struct XExposeEvent { - int type; - uint serial; - int send_event; - void * display; - uint window; - int x; - int y; - int width; - int height; - int count; -} -struct XVisibilityEvent { - int type; - uint serial; - int send_event; - void * display; - uint window; - int state; -} - -struct XButtonEvent { - int type; - uint serial; - int send_event; - void * display; - uint window; - uint root; - uint subwindow; - uint time; - int x; - int y; - int x_root; - int y_root; - uint state; - uint button; - int same_screen; -} -struct XWindowChanges { -int x; -int y; -int width; -int height; -int border_width; -uint sibling; -int stack_mode; -} -private extern (C){ - GdkWindow * gdk_window_lookup(uint); - uint XRenderCreatePicture(void *, uint, XRenderPictFormat *, uint, XRenderPictureAttributes *); - XRenderPictFormat * XRenderFindStandardFormat (void *dpy, int format); - XRenderPictFormat * XRenderFindVisualFormat (void *dpy, void *visual); - void XRenderSetPictureTransform (void *dpy,uint picture, XTransform *transform); - void XRenderSetPictureClipRectangles(void *, uint, int, int, XRectangle *, int); - void XRenderFreePicture(void *, uint); - void XRenderComposite(void *, int, uint, uint, uint, int, int, int, int, int, int, uint, uint); - - cairo_font_options_t * pango_cairo_context_get_font_options(void *); - void pango_cairo_context_set_font_options(void *, cairo_font_options_t *); - - alias int function(void *, XEvent *, void *) _BCD_func__1812; - int XCheckIfEvent(void *, XEvent *, _BCD_func__1812, void *); - - extern uint gtk_major_version; - extern uint gtk_minor_version; - extern uint gtk_micro_version; - - void * gdk_atom_intern(char *, int); - int gdk_property_get(GdkDrawable *, void *, void *, uint, uint, int, void **, int *, int *, char ** ); - void * gdk_x11_drawable_get_xdisplay(GdkDrawable *); - int XDefaultScreen(void *); - int XReconfigureWMWindow(void *, uint, int, uint, XWindowChanges *); -} - - - - -private extern(C) PangoLayout *pango_cairo_create_layout (cairo_t *cr); -private extern(C) void pango_cairo_layout_path (cairo_t *cr, - PangoLayout *layout); - -private extern(C) void gdk_pango_context_set_colormap (PangoContext *context, - GdkColormap *colormap); - -private extern(C) void pango_cairo_show_layout(cairo_t *cr, PangoLayout *layout); - -private extern(C) GdkRegion *gdk_pango_layout_get_clip_region(PangoLayout *layout, - gint x_origin, - gint y_origin, - gint *index_ranges, - gint n_ranges); - - -private extern(C) GdkWindow* GDK_ROOT_PARENT(); -private extern(C) GdkPixbuf* gdk_pixbuf_new (GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, - int width, int height); - -private extern(C) PangoContext *gdk_pango_context_get(); -private extern(C) int XRenderQueryExtension (void *dpy, int *event_basep, int *error_basep); -alias int Status; -private extern(C) Status XRenderQueryVersion (void *dpy, - int *major_versionp, - int *minor_versionp); - -alias extern(C) int function( void* ) XSynchronizeResult; -private extern(C) XSynchronizeResult function( void*, int ) XSynchronize; - -//struct Visual{} -//private extern(C) Visual* gdk_x11_visual_get_xvisual(GdkVisual* visual); - - -private extern (C) XID GDK_PIXMAP_XID(GdkDrawable* win); -struct XErrorEvent {} - -private extern (C) bool GDK_WINDOWING_X11(); -private extern (C) int XFlush(void *); -public alias extern(C) int function(void*) XIOErrorHandler; -public alias extern(C) int function(void*, XErrorEvent *) XErrorHandler; - -private extern (C) XIOErrorHandler XSetIOErrorHandler(XIOErrorHandler); -private extern (C) XErrorHandler XSetErrorHandler(XErrorHandler); -private extern (C) int PANGO_PIXELS( int v ); -private char* gdk_x11_screen_get_window_manager_name(GdkScreen*); -private char XKeysymToKeycode(void *, uint); -private int XTestFakeKeyEvent(void *, uint, int, uint); -int XTestFakeMotionEvent(void *, int, int, int, uint); -int XTestFakeButtonEvent(void *, uint, int, uint); -uint XDefaultRootWindow(void *); -int XWarpPointer(void *, uint, uint, int, int, uint, uint, int, int); -++++/ - template NameOfFunc(alias f) { // Note: highly dependent on the .stringof formatting // the value begins with "& " which is why the first two chars are cut off @@ -885,113 +667,16 @@ public static const int GTK_VERSION;// see static ctor = buildVERSION(gtk_major_version(), gtk_minor_version(), gtk_micro_version()); -/+ -protected static byte [] ascii (String name) { - int length = name.length (); - char [] chars = new char [length]; - name.getChars (0, length, chars, 0); - byte [] buffer = new byte [length + 1]; - for (int i=0; i