# HG changeset patch
# User Frank Benoit
true
when the device is disposed and false
otherwise
*/
-public boolean isDisposed () {
+public bool isDisposed () {
return disposed;
}
@@ -707,52 +696,52 @@
*
* @since 3.3
*/
-public boolean loadFont (String path) {
+public bool loadFont (char[] path) {
checkDevice();
if (path == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
- byte [] buffer = Converter.wcsToMbcs (null, path, true);
- return OS.FcConfigAppFontAddFile (0, buffer);
+ return cast(bool) OS.FcConfigAppFontAddFile (null, toStringz(path));
}
-int /*long*/ logProc (int /*long*/ log_domain, int /*long*/ log_level, int /*long*/ message, int /*long*/ user_data) {
- if (warningLevel == 0) {
- if (DEBUG || debug) {
- new Error ().printStackTrace ();
+private static extern(C) void logFunction (char* log_domain, GLogLevelFlags log_level, char* message, void* user_data) {
+ Device dev = cast(Device)user_data;
+ if (dev.warningLevel == 0) {
+ if (DEBUG || dev.debugging) {
+ foreach( msg; new TracedException ("") ){
+ Stderr.formatln( "trc {}", msg );
+ }
}
- OS.g_log_default_handler (log_domain, (int)/*64*/log_level, message, 0);
+ OS.g_log_default_handler (log_domain, log_level, message, user_data);
}
return 0;
}
void new_Object (Object object) {
for (int i=0; iGC
is where all of the drawing capabilities that are
@@ -50,7 +70,7 @@
*
* @see dwt.events.PaintEvent
*/
-public final class GC extends Resource {
+public final class GC : Resource {
/**
* the handle to the OS device context
* (Warning: This field is platform dependent)
@@ -61,34 +81,34 @@
* platforms and should never be accessed from application code.
*
*/
- public int /*long*/ handle;
+ public GdkGC* handle;
Drawable drawable;
GCData data;
- final static int FOREGROUND = 1 << 0;
- final static int BACKGROUND = 1 << 1;
- final static int FONT = 1 << 2;
- final static int LINE_STYLE = 1 << 3;
- final static int LINE_CAP = 1 << 4;
- final static int LINE_JOIN = 1 << 5;
- final static int LINE_WIDTH = 1 << 6;
- final static int LINE_MITERLIMIT = 1 << 7;
- final static int BACKGROUND_BG = 1 << 8;
- final static int DRAW_OFFSET = 1 << 9;
- final static int DRAW = FOREGROUND | LINE_WIDTH | LINE_STYLE | LINE_CAP | LINE_JOIN | LINE_MITERLIMIT | DRAW_OFFSET;
- final static int FILL = BACKGROUND;
+ const static int FOREGROUND = 1 << 0;
+ const static int BACKGROUND = 1 << 1;
+ const static int FONT = 1 << 2;
+ const static int LINE_STYLE = 1 << 3;
+ const static int LINE_CAP = 1 << 4;
+ const static int LINE_JOIN = 1 << 5;
+ const static int LINE_WIDTH = 1 << 6;
+ const static int LINE_MITERLIMIT = 1 << 7;
+ const static int BACKGROUND_BG = 1 << 8;
+ const static int DRAW_OFFSET = 1 << 9;
+ const static int DRAW = FOREGROUND | LINE_WIDTH | LINE_STYLE | LINE_CAP | LINE_JOIN | LINE_MITERLIMIT | DRAW_OFFSET;
+ const static int FILL = BACKGROUND;
- static final float[] LINE_DOT = new float[]{1, 1};
- static final float[] LINE_DASH = new float[]{3, 1};
- static final float[] LINE_DASHDOT = new float[]{3, 1, 1, 1};
- static final float[] LINE_DASHDOTDOT = new float[]{3, 1, 1, 1, 1, 1};
- static final float[] LINE_DOT_ZERO = new float[]{3, 3};
- static final float[] LINE_DASH_ZERO = new float[]{18, 6};
- static final float[] LINE_DASHDOT_ZERO = new float[]{9, 6, 3, 6};
- static final float[] LINE_DASHDOTDOT_ZERO = new float[]{9, 3, 3, 3, 3, 3};
+ static const float[] LINE_DOT = [1, 1];
+ static const float[] LINE_DASH = [3, 1];
+ static const float[] LINE_DASHDOT = [3, 1, 1, 1];
+ static const float[] LINE_DASHDOTDOT = [3, 1, 1, 1, 1, 1];
+ static const float[] LINE_DOT_ZERO = [3, 3];
+ static const float[] LINE_DASH_ZERO = [18, 6];
+ static const float[] LINE_DASHDOT_ZERO = [9, 6, 3, 6];
+ static const float[] LINE_DASHDOTDOT_ZERO = [9, 3, 3, 3, 3, 3];
-GC() {
+this() {
}
/**
@@ -113,7 +133,7 @@
* true
when the image is disposed and false
otherwise
*/
public bool isDisposed() {
- return pixmap == 0;
+ return pixmap is null;
}
/**
@@ -1195,4 +1200,4 @@
}
}
-+/
\ No newline at end of file
+}
\ No newline at end of file
diff -r 92223a4ecca7 -r b73b14942338 dwt/internal/gtk/OS.d
--- a/dwt/internal/gtk/OS.d Mon Jan 07 03:41:50 2008 +0100
+++ b/dwt/internal/gtk/OS.d Mon Jan 07 07:47:32 2008 +0100
@@ -32,6 +32,36 @@
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 (Display *dpy, int *event_basep, int *error_basep);
+alias int Status;
+private extern(C) Status XRenderQueryVersion (Display *dpy,
+ int *major_versionp,
+ int *minor_versionp);
+struct FcConfig{};
+private extern(C) int FcConfigAppFontAddFile (FcConfig *config, char *file);
+
+alias extern(C) int function( dwt.internal.gtk.c.cairotypes.Display* ) XSynchronizeResult;
+private extern(C) XSynchronizeResult function( dwt.internal.gtk.c.cairotypes.Display*, int ) XSynchronize;
+
+//struct Visual{}
+//private extern(C) Visual* gdk_x11_visual_get_xvisual(GdkVisual* visual);
+
+GdkDisplay* GDK_DISPLAY(){
+ return gtk_display;
+}
+
+XID GDK_PIXMAP_XID(GdkDrawable* win){
+ return gdk_x11_drawable_get_xid(win);
+}
+
+struct XErrorEvent {}
+public alias extern(C) int function(dwt.internal.gtk.c.cairotypes.Display*) XIOErrorHandler;
+public alias extern(C) int function(dwt.internal.gtk.c.cairotypes.Display*, XErrorEvent *) XErrorHandler;
+
+extern (C) XIOErrorHandler XSetIOErrorHandler(XIOErrorHandler);
+extern (C) XErrorHandler XSetErrorHandler(XErrorHandler);
+
template NameOfFunc(alias f) {
// Note: highly dependent on the .stringof formatting
@@ -674,7 +704,9 @@
// mixin ForwardGtkOsCFunc!(.Call);
// mixin ForwardGtkOsCFunc!(.call );
mixin ForwardGtkOsCFunc!(GDK_WINDOWING_X11);
+++/
mixin ForwardGtkOsCFunc!(.GDK_PIXMAP_XID);
+/++
mixin ForwardGtkOsCFunc!(.XCheckMaskEvent);
mixin ForwardGtkOsCFunc!(.XCheckWindowEvent);
mixin ForwardGtkOsCFunc!(.XCheckIfEvent);
@@ -689,10 +721,12 @@
mixin ForwardGtkOsCFunc!(.XListProperties);
mixin ForwardGtkOsCFunc!(.XReconfigureWMWindow);
mixin ForwardGtkOsCFunc!(.XSendEvent);
+ +/
mixin ForwardGtkOsCFunc!(.XSetIOErrorHandler);
mixin ForwardGtkOsCFunc!(.XSetErrorHandler);
- mixin ForwardGtkOsCFunc!(.XSetInputFocus);
+ //mixin ForwardGtkOsCFunc!(.XSetInputFocus);
mixin ForwardGtkOsCFunc!(.XSynchronize);
+ /+
mixin ForwardGtkOsCFunc!(.XTestFakeButtonEvent);
mixin ForwardGtkOsCFunc!(.XTestFakeKeyEvent);
mixin ForwardGtkOsCFunc!(.XTestFakeMotionEvent);
@@ -704,7 +738,9 @@
mixin ForwardGtkOsCFunc!(.gdk_x11_drawable_get_xid);
mixin ForwardGtkOsCFunc!(.gdk_x11_screen_lookup_visual);
mixin ForwardGtkOsCFunc!(.gdk_x11_screen_get_window_manager_name);
+ +/
mixin ForwardGtkOsCFunc!(.gdk_x11_visual_get_xvisual);
+ /+
mixin ForwardGtkOsCFunc!(.gdk_pixmap_foreign_new);
mixin ForwardGtkOsCFunc!(.gdk_window_lookup);
mixin ForwardGtkOsCFunc!(.gdk_window_add_filter);
@@ -712,8 +748,10 @@
/** X render natives and constants */
// mixin ForwardGtkOsCFunc!(XRenderPictureAttributes_sizeof);
+ +/
mixin ForwardGtkOsCFunc!(.XRenderQueryExtension);
mixin ForwardGtkOsCFunc!(.XRenderQueryVersion);
+ /+
mixin ForwardGtkOsCFunc!(.XRenderCreatePicture);
mixin ForwardGtkOsCFunc!(.XRenderSetPictureClipRectangles);
mixin ForwardGtkOsCFunc!(.XRenderSetPictureTransform);
@@ -722,8 +760,8 @@
mixin ForwardGtkOsCFunc!(.XRenderFindStandardFormat);
mixin ForwardGtkOsCFunc!(.XRenderFindVisualFormat);
// mixin ForwardGtkOsCFunc!(Call );
+ +/
mixin ForwardGtkOsCFunc!(.GDK_DISPLAY);
- +/
mixin ForwardGtkOsCFunc!(.GDK_ROOT_PARENT);
/+
mixin ForwardGtkOsCFunc!(.GDK_TYPE_COLOR);
@@ -926,7 +964,7 @@
mixin ForwardGtkOsCFunc!(.gdk_keymap_translate_keyboard_state );
mixin ForwardGtkOsCFunc!(.gdk_keyval_to_lower);
mixin ForwardGtkOsCFunc!(.gdk_keyval_to_unicode);
-// mixin ForwardGtkOsCFunc!(.gdk_pango_context_get);
+ mixin ForwardGtkOsCFunc!(.gdk_pango_context_get);
// mixin ForwardGtkOsCFunc!(.gdk_pango_context_set_colormap);
// mixin ForwardGtkOsCFunc!(.gdk_pango_layout_get_clip_region);
mixin ForwardGtkOsCFunc!(.gdk_pixbuf_copy_area);
@@ -1112,7 +1150,7 @@
mixin ForwardGtkOsCFunc!(.gtk_entry_text_index_to_layout_index );
mixin ForwardGtkOsCFunc!(.gtk_entry_get_max_length);
mixin ForwardGtkOsCFunc!(.gtk_entry_get_text);
- //mixin ForwardGtkOsCFunc!(.FcConfigAppFontAddFile);
+ mixin ForwardGtkOsCFunc!(.FcConfigAppFontAddFile);
mixin ForwardGtkOsCFunc!(.gtk_entry_get_visibility);
mixin ForwardGtkOsCFunc!(.gtk_entry_new);
mixin ForwardGtkOsCFunc!(.gtk_entry_set_activates_default);
diff -r 92223a4ecca7 -r b73b14942338 dwt/internal/gtk/c/cairotypes.d
--- a/dwt/internal/gtk/c/cairotypes.d Mon Jan 07 03:41:50 2008 +0100
+++ b/dwt/internal/gtk/c/cairotypes.d Mon Jan 07 07:47:32 2008 +0100
@@ -6,7 +6,7 @@
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
-
+
gtkD is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -28,8 +28,8 @@
private alias void* HDC;
-//struct Display; // to support XLib surfaces
-//struct Visual; // to support XLib surfaces
+struct Display{}; // to support XLib surfaces
+struct Visual; // to support XLib surfaces
//struct Screen; // to support XLib surfaces
//private alias void* Drawable;
diff -r 92223a4ecca7 -r b73b14942338 dwt/internal/gtk/c/gdk.d
--- a/dwt/internal/gtk/c/gdk.d Mon Jan 07 03:41:50 2008 +0100
+++ b/dwt/internal/gtk/c/gdk.d Mon Jan 07 07:47:32 2008 +0100
@@ -6,7 +6,7 @@
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
-
+
gtkD is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -36,7 +36,7 @@
static this()
{
- gdkLinker = new Linker( getLibraryPath ~ importLibs[LIBRARY.GDK],
+ gdkLinker = new Linker( getLibraryPath ~ importLibs[LIBRARY.GDK],
getLibraryPath ~ importLibs[LIBRARY.GDKPIXBUF] );
gdkLinker.link( gdkLinks );
}
@@ -54,10 +54,10 @@
******************************************************************************/
-extern(C)
-{
+extern(C)
+{
// gdk.Gdk
-
+
void function(gint* argc, gchar*** argv)gdk_init;
gboolean function(gint* argc, gchar*** argv)gdk_init_check;
void function(gint* argc, gchar*** argv)gdk_parse_args;
@@ -86,9 +86,9 @@
void function(gboolean useXshm)gdk_set_use_xshm;
void function()gdk_error_trap_push;
gint function()gdk_error_trap_pop;
-
+
// gdk.Display
-
+
GdkDisplay* function(gchar* displayName)gdk_display_open;
GdkDisplay* function()gdk_display_get_default;
gchar* function(GdkDisplay* display)gdk_display_get_name;
@@ -125,17 +125,17 @@
gboolean function(GdkDisplay* display)gdk_display_supports_shapes;
gboolean function(GdkDisplay* display)gdk_display_supports_input_shapes;
gboolean function(GdkDisplay* display)gdk_display_supports_composite;
-
+
// gdk.DisplayManager
-
+
GdkDisplayManager* function()gdk_display_manager_get;
GdkDisplay* function(GdkDisplayManager* displayManager)gdk_display_manager_get_default_display;
void function(GdkDisplayManager* displayManager, GdkDisplay* display)gdk_display_manager_set_default_display;
GSList* function(GdkDisplayManager* displayManager)gdk_display_manager_list_displays;
GdkDevice* function(GdkDisplay* display)gdk_display_get_core_pointer;
-
+
// gdk.Screen
-
+
GdkScreen* function()gdk_screen_get_default;
GdkColormap* function(GdkScreen* screen)gdk_screen_get_default_colormap;
void function(GdkScreen* screen, GdkColormap* colormap)gdk_screen_set_default_colormap;
@@ -171,14 +171,14 @@
gboolean function(GdkScreen* screen, gchar* workingDirectory, gchar** argv, gchar** envp, GSpawnFlags flags, GSpawnChildSetupFunc childSetup, gpointer userData, gint* childPid, GError** error)gdk_spawn_on_screen;
gboolean function(GdkScreen* screen, gchar* workingDirectory, gchar** argv, gchar** envp, GSpawnFlags flags, GSpawnChildSetupFunc childSetup, gpointer userData, gint* childPid, gint* standardInput, gint* standardOutput, gint* standardError, GError** error)gdk_spawn_on_screen_with_pipes;
gboolean function(GdkScreen* screen, gchar* commandLine, GError** error)gdk_spawn_command_line_on_screen;
-
+
// gdk.Rectangle
-
+
gboolean function(GdkRectangle* src1, GdkRectangle* src2, GdkRectangle* dest)gdk_rectangle_intersect;
void function(GdkRectangle* src1, GdkRectangle* src2, GdkRectangle* dest)gdk_rectangle_union;
-
+
// gdk.Region
-
+
GdkRegion* function()gdk_region_new;
GdkRegion* function(GdkPoint* points, gint npoints, GdkFillRule fillRule)gdk_region_polygon;
GdkRegion* function(GdkRegion* region)gdk_region_copy;
@@ -198,9 +198,9 @@
void function(GdkRegion* source1, GdkRegion* source2)gdk_region_subtract;
void function(GdkRegion* source1, GdkRegion* source2)gdk_region_xor;
void function(GdkRegion* region, GdkSpan* spans, int nSpans, gboolean sorted, GdkSpanFunc funct, gpointer data)gdk_region_spans_intersect_foreach;
-
+
// gdk.GC
-
+
GdkGC* function(GdkDrawable* drawable)gdk_gc_new;
GdkGC* function(GdkDrawable* drawable, GdkGCValues* values, GdkGCValuesMask valuesMask)gdk_gc_new_with_values;
GdkScreen* function(GdkGC* gc)gdk_gc_get_screen;
@@ -230,9 +230,9 @@
void function(GdkGC* gc, GdkColormap* colormap)gdk_gc_set_colormap;
GdkColormap* function(GdkGC* gc)gdk_gc_get_colormap;
void function(GdkGC* gc, gint xOffset, gint yOffset)gdk_gc_offset;
-
+
// gdk.Drawable
-
+
GdkDrawable* function(GdkDrawable* drawable)gdk_drawable_ref;
void function(GdkDrawable* drawable)gdk_drawable_unref;
void function(GdkDrawable* drawable, gchar* key, gpointer data, GDestroyNotify destroyFunc)gdk_drawable_set_data;
@@ -269,22 +269,22 @@
void function(GdkDrawable* drawable, GdkGC* gc, GdkImage* image, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, gint height)gdk_draw_image;
GdkImage* function(GdkDrawable* drawable, gint x, gint y, gint width, gint height)gdk_drawable_get_image;
GdkImage* function(GdkDrawable* drawable, GdkImage* image, gint srcX, gint srcY, gint destX, gint destY, gint width, gint height)gdk_drawable_copy_to_image;
-
+
// gdk.Pixmap
-
+
GdkPixmap* function(GdkDrawable* drawable, gint width, gint height, gint depth)gdk_pixmap_new;
GdkPixmap* function(GdkDrawable* drawable, gchar* data, gint width, gint height, gint depth, GdkColor* fg, GdkColor* bg)gdk_pixmap_create_from_data;
GdkPixmap* function(GdkDrawable* drawable, GdkBitmap** mask, GdkColor* transparentColor, gchar* filename)gdk_pixmap_create_from_xpm;
GdkPixmap* function(GdkDrawable* drawable, GdkColormap* colormap, GdkBitmap** mask, GdkColor* transparentColor, gchar* filename)gdk_pixmap_colormap_create_from_xpm;
GdkPixmap* function(GdkDrawable* drawable, GdkBitmap** mask, GdkColor* transparentColor, gchar** data)gdk_pixmap_create_from_xpm_d;
GdkPixmap* function(GdkDrawable* drawable, GdkColormap* colormap, GdkBitmap** mask, GdkColor* transparentColor, gchar** data)gdk_pixmap_colormap_create_from_xpm_d;
-
+
// gdk.Bitmap
-
+
GdkBitmap* function(GdkDrawable* drawable, gchar* data, gint width, gint height)gdk_bitmap_create_from_data;
-
+
// gdk.RGB
-
+
void function()gdk_rgb_init;
void function(GdkDrawable* drawable, GdkGC* gc, gint x, gint y, gint width, gint height, GdkRgbDither dith, guchar* rgbBuf, gint rowstride)gdk_draw_rgb_image;
void function(GdkDrawable* drawable, GdkGC* gc, gint x, gint y, gint width, gint height, GdkRgbDither dith, guchar* rgbBuf, gint rowstride, gint xdith, gint ydith)gdk_draw_rgb_image_dithalign;
@@ -305,9 +305,9 @@
gboolean function()gdk_rgb_ditherable;
gboolean function(GdkColormap* cmap)gdk_rgb_colormap_ditherable;
void function(gboolean verbose)gdk_rgb_set_verbose;
-
+
// gdk.ImageGdk
-
+
GdkImage* function(GdkImageType type, GdkVisual* visual, gint width, gint height)gdk_image_new;
GdkImage* function(GdkVisual* visual, gpointer data, gint width, gint height)gdk_image_new_bitmap;
GdkImage* function(GdkDrawable* drawable, gint x, gint y, gint width, gint height)gdk_image_get;
@@ -317,9 +317,9 @@
void function(GdkImage* image, GdkColormap* colormap)gdk_image_set_colormap;
void function(GdkImage* image, gint x, gint y, guint32 pixel)gdk_image_put_pixel;
guint32 function(GdkImage* image, gint x, gint y)gdk_image_get_pixel;
-
+
// gdk.Pixbuf
-
+
void function(GdkPixbuf* pixbuf, GdkBitmap* bitmap, int srcX, int srcY, int destX, int destY, int width, int height, int alphaThreshold)gdk_pixbuf_render_threshold_alpha;
void function(GdkPixbuf* pixbuf, GdkDrawable* drawable, GdkGC* gc, int srcX, int srcY, int destX, int destY, int width, int height, GdkRgbDither dither, int xDither, int yDither)gdk_pixbuf_render_to_drawable;
void function(GdkPixbuf* pixbuf, GdkDrawable* drawable, int srcX, int srcY, int destX, int destY, int width, int height, GdkPixbufAlphaMode alphaMode, int alphaThreshold, GdkRgbDither dither, int xDither, int yDither)gdk_pixbuf_render_to_drawable_alpha;
@@ -363,9 +363,9 @@
void function(GdkPixbuf* src, GdkPixbuf* dest, gfloat saturation, gboolean pixelate)gdk_pixbuf_saturate_and_pixelate;
GdkPixbuf* function(GdkPixbuf* src)gdk_pixbuf_apply_embedded_orientation;
void function(GdkPixbuf* pixbuf, guint32 pixel)gdk_pixbuf_fill;
-
+
// gdk.Colormap
-
+
GdkColormap* function(GdkVisual* visual, gboolean allocate)gdk_colormap_new;
GdkColormap* function(GdkColormap* cmap)gdk_colormap_ref;
void function(GdkColormap* cmap)gdk_colormap_unref;
@@ -381,9 +381,9 @@
void function(GdkColormap* colormap, GdkColor* colors, gint ncolors)gdk_colors_store;
gint function(GdkColormap* colormap, gboolean contiguous, gulong* planes, gint nplanes, gulong* pixels, gint npixels)gdk_colors_alloc;
void function(GdkColormap* colormap, gulong* pixels, gint npixels, gulong planes)gdk_colors_free;
-
+
// gdk.Color
-
+
GdkColor* function(GdkColor* color)gdk_color_copy;
void function(GdkColor* color)gdk_color_free;
gint function(GdkColormap* colormap, GdkColor* color)gdk_color_white;
@@ -394,9 +394,9 @@
gboolean function(GdkColor* colora, GdkColor* colorb)gdk_color_equal;
guint function(GdkColor* colora)gdk_color_hash;
gchar* function(GdkColor* color)gdk_color_to_string;
-
+
// gdk.Visual
-
+
void function(gint** depths, gint* count)gdk_query_depths;
void function(GdkVisualType** visualTypes, gint* count)gdk_query_visual_types;
GList* function()gdk_list_visuals;
@@ -408,9 +408,9 @@
GdkVisual* function(GdkVisualType visualType)gdk_visual_get_best_with_type;
GdkVisual* function(gint depth, GdkVisualType visualType)gdk_visual_get_best_with_both;
GdkScreen* function(GdkVisual* visual)gdk_visual_get_screen;
-
+
// gdk.Font
-
+
GdkFont* function(gchar* fontName)gdk_font_load;
GdkFont* function(GdkDisplay* display, gchar* fontName)gdk_font_load_for_display;
GdkFont* function(gchar* fontsetName)gdk_fontset_load;
@@ -438,9 +438,9 @@
gint function(GdkFont* font, gchar character)gdk_char_height;
gchar* function(GdkWChar* src)gdk_wcstombs;
gint function(GdkWChar* dest, gchar* src, gint destMax)gdk_mbstowcs;
-
+
// gdk.Cursor
-
+
GdkCursor* function(GdkCursorType cursorType)gdk_cursor_new;
GdkCursor* function(GdkPixmap* source, GdkPixmap* mask, GdkColor* fg, GdkColor* bg, gint x, gint y)gdk_cursor_new_from_pixmap;
GdkCursor* function(GdkDisplay* display, GdkPixbuf* pixbuf, gint x, gint y)gdk_cursor_new_from_pixbuf;
@@ -450,9 +450,9 @@
GdkPixbuf* function(GdkCursor* cursor)gdk_cursor_get_image;
GdkCursor* function(GdkCursor* cursor)gdk_cursor_ref;
void function(GdkCursor* cursor)gdk_cursor_unref;
-
+
// gdk.Window
-
+
GdkWindow* function(GdkWindow* parent, GdkWindowAttr* attributes, gint attributesMask)gdk_window_new;
void function(GdkWindow* window)gdk_window_destroy;
GdkWindowType function(GdkWindow* window)gdk_window_get_window_type;
@@ -562,9 +562,9 @@
GList* function()gdk_window_get_toplevels;
GdkWindow* function()gdk_get_default_root_window;
GdkPointerHooks* function(GdkPointerHooks* newHooks)gdk_set_pointer_hooks;
-
+
// gdk.Event
-
+
gboolean function()gdk_events_pending;
GdkEvent* function()gdk_event_peek;
GdkEvent* function()gdk_event_get;
@@ -589,12 +589,12 @@
void function(GdkEvent* event, GdkScreen* screen)gdk_event_set_screen;
GdkScreen* function(GdkEvent* event)gdk_event_get_screen;
gboolean function(gchar* name, GValue* value)gdk_setting_get;
-
+
// gdk.
-
-
+
+
// gdk.Keymap
-
+
GdkKeymap* function()gdk_keymap_get_default;
GdkKeymap* function(GdkDisplay* display)gdk_keymap_get_for_display;
guint function(GdkKeymap* keymap, GdkKeymapKey* key)gdk_keymap_lookup_key;
@@ -612,9 +612,9 @@
gboolean function(guint keyval)gdk_keyval_is_lower;
guint32 function(guint keyval)gdk_keyval_to_unicode;
guint function(guint32 wc)gdk_unicode_to_keyval;
-
+
// gdk.Selection
-
+
gboolean function(GdkWindow* owner, GdkAtom selection, guint32 time, gboolean sendEvent)gdk_selection_owner_set;
gboolean function(GdkDisplay* display, GdkWindow* owner, GdkAtom selection, guint32 time, gboolean sendEvent)gdk_selection_owner_set_for_display;
GdkWindow* function(GdkAtom selection)gdk_selection_owner_get;
@@ -623,9 +623,9 @@
gboolean function(GdkWindow* requestor, guchar** data, GdkAtom* propType, gint* propFormat)gdk_selection_property_get;
void function(guint32 requestor, GdkAtom selection, GdkAtom target, GdkAtom property, guint32 time)gdk_selection_send_notify;
void function(GdkDisplay* display, guint32 requestor, GdkAtom selection, GdkAtom target, GdkAtom property, guint32 time)gdk_selection_send_notify_for_display;
-
+
// gdk.DragContext
-
+
GdkAtom function(GdkDragContext* context)gdk_drag_get_selection;
void function(GdkDragContext* context, guint32 time)gdk_drag_abort;
void function(GdkDragContext* context, gboolean ok, guint32 time)gdk_drop_reply;
@@ -642,9 +642,9 @@
void function(GdkDragContext* context)gdk_drag_context_unref;
void function(GdkDragContext* context, GdkDragAction action, guint32 time)gdk_drag_status;
gboolean function(GdkDragContext* context)gdk_drag_drop_succeeded;
-
+
// gdk.
-
+
void function()gdk_threads_init;
void function()gdk_threads_enter;
void function()gdk_threads_leave;
@@ -653,15 +653,15 @@
guint function(gint priority, GSourceFunc funct, gpointer data, GDestroyNotify notify)gdk_threads_add_idle_full;
guint function(guint interval, GSourceFunc funct, gpointer data)gdk_threads_add_timeout;
guint function(gint priority, guint interval, GSourceFunc funct, gpointer data, GDestroyNotify notify)gdk_threads_add_timeout_full;
-
+
// gdk.Input
-
+
gint function(gint source, GdkInputCondition condition, GdkInputFunction funct, gpointer data, GdkDestroyNotify destroy)gdk_input_add_full;
gint function(gint source, GdkInputCondition condition, GdkInputFunction funct, gpointer data)gdk_input_add;
void function(gint tag)gdk_input_remove;
-
+
// gdk.Device
-
+
GList* function()gdk_devices_list;
void function(GdkDevice* device, GdkInputSource source)gdk_device_set_source;
gboolean function(GdkDevice* device, GdkInputMode mode)gdk_device_set_mode;
@@ -673,7 +673,7 @@
void function(GdkTimeCoord** events, gint nEvents)gdk_device_free_history;
gboolean function(GdkDevice* device, gdouble* axes, GdkAxisUse use, gdouble* value)gdk_device_get_axis;
void function(GdkWindow* window, gint mask, GdkExtensionMode mode)gdk_input_set_extension_events;
-
+
// gdk.X11
/+ Manually disabled. Won't compile, yet.
GdkVisual* function(VisualID xvisualid)gdkx_visual_get;
@@ -728,7 +728,9 @@
int function(GdkScreen* screen)gdk_x11_screen_get_screen_number;
Screen* function(GdkScreen* screen)gdk_x11_screen_get_xscreen;
void function()gdk_x11_ungrab_server;
+ +/
Visual* function(GdkVisual* visual)gdk_x11_visual_get_xvisual;
+ /+
Atom function(GdkAtom atom)gdk_x11_atom_to_xatom;
Atom function(GdkDisplay* display, GdkAtom atom)gdk_x11_atom_to_xatom_for_display;
GdkAtom function(Atom xatom)gdk_x11_xatom_to_atom;
@@ -738,9 +740,9 @@
gchar* function(Atom xatom)gdk_x11_get_xatom_name;
gchar* function(GdkDisplay* display, Atom xatom)gdk_x11_get_xatom_name_for_display;
+/
-
+
// gdk.
-
+
cairo_t* function(GdkDrawable* drawable)gdk_cairo_create;
void function(cairo_t* cr, GdkColor* color)gdk_cairo_set_source_color;
void function(cairo_t* cr, GdkPixbuf* pixbuf, double pixbufX, double pixbufY)gdk_cairo_set_source_pixbuf;
@@ -755,7 +757,7 @@
******************************************************************************/
-Symbol[] gdkLinks =
+Symbol[] gdkLinks =
[
{ "gdk_init", cast(void**)& gdk_init},
diff -r 92223a4ecca7 -r b73b14942338 dwt/internal/gtk/c/glibtypes.d
--- a/dwt/internal/gtk/c/glibtypes.d Mon Jan 07 03:41:50 2008 +0100
+++ b/dwt/internal/gtk/c/glibtypes.d Mon Jan 07 07:47:32 2008 +0100
@@ -6,7 +6,7 @@
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
-
+
gtkD is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -3453,7 +3453,7 @@
* user data, set in g_log_set_handler().
*/
// void (*GLogFunc) (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data);
-public typedef extern(C) void function (char[], GLogLevelFlags, char[], void*) GLogFunc;
+public typedef extern(C) void function (char*, GLogLevelFlags, char*, void*) GLogFunc;
/*
* Declares a type of function which takes no arguments and has no return value.
diff -r 92223a4ecca7 -r b73b14942338 todo.txt
--- a/todo.txt Mon Jan 07 03:41:50 2008 +0100
+++ b/todo.txt Mon Jan 07 07:47:32 2008 +0100
@@ -10,7 +10,7 @@
SWTError // OK
SWTException // OK
-internal/BidiUtil // OK (stub: GC, Runnable )
+internal/BidiUtil // OK (stub: Runnable )
internal/Callback // ?? hopefully not needed
internal/CloneableCompatibility // OK (java.lang.Cloneable)
internal/C // OK not needed
@@ -26,19 +26,19 @@
graphics/Color // OK
graphics/Cursor
-graphics/Device deps: GCData, Font,
+graphics/Device // OK
graphics/DeviceData // OK (fld: debug->debugging)
-graphics/Drawable // OK (stub GCData)
+graphics/Drawable // OK
graphics/Font // OK
graphics/FontData // OK
graphics/FontMetrics // OK
graphics/GC
graphics/GCData
graphics/GlyphMetrics
-graphics/Image
+graphics/Image // OK
graphics/ImageData // OK
graphics/ImageDataLoader // OK
-graphics/ImageLoader // OK (FileFormat)
+graphics/ImageLoader // OK
graphics/ImageLoaderEvent // OK
graphics/ImageLoaderListener // OK
graphics/LineAttributes // OK
@@ -49,7 +49,7 @@
graphics/Point // OK
graphics/Rectangle // OK (meth union->makeUnion)
graphics/Region // OK
-graphics/Resource // OK (stub: Display)
+graphics/Resource // OK
graphics/RGB // OK
graphics/TextLayout
graphics/TextStyle