Mercurial > projects > dwt2
changeset 51:c01d033c633a
[swt lin]
line wrap: on
line diff
--- a/base/src/java/lang/Character.d Fri Mar 27 15:30:20 2009 +0100 +++ b/base/src/java/lang/Character.d Fri Mar 27 19:58:06 2009 +0100 @@ -135,12 +135,12 @@ } } -dchar CharacterFirstToLower( String str ){ +dchar CharacterFirstToLower( CString str ){ int consumed; return CharacterFirstToLower( str, consumed ); } -dchar CharacterFirstToLower( String str, out int consumed ){ +dchar CharacterFirstToLower( CString str, out int consumed ){ version(Tango){ dchar[1] buf; buf[0] = firstCodePoint( str, consumed );
--- a/base/src/java/lang/Integer.d Fri Mar 27 15:30:20 2009 +0100 +++ b/base/src/java/lang/Integer.d Fri Mar 27 19:58:06 2009 +0100 @@ -18,6 +18,9 @@ public static const int MAX_VALUE = 0x7fffffff; public static const int SIZE = 32; + public this ( void* value ){ + super( cast(int)value ); + } public this ( int value ){ super( value ); }
--- a/base/src/java/lang/String.d Fri Mar 27 15:30:20 2009 +0100 +++ b/base/src/java/lang/String.d Fri Mar 27 19:58:06 2009 +0100 @@ -36,7 +36,7 @@ mixin("alias invariant(wchar*) IWCharPtr;"); } -int codepointIndexToIndex( String str, int cpIndex ){ +int codepointIndexToIndex( CString str, int cpIndex ){ int cps = cpIndex; int res = 0; while( cps > 0 ){ @@ -60,7 +60,7 @@ /++ + +/ -int indexToCodepointIndex( String str, int index ){ +int indexToCodepointIndex( CString str, int index ){ if( index < 0 ) return index; int i = 0; int res = 0; @@ -88,7 +88,7 @@ /++ + Get that String, that contains the next codepoint of a String. +/ -String firstCodePointStr( String str, out int consumed ){ +String firstCodePointStr( CString str, out int consumed ){ version(Tango){ dchar[1] buf; uint ate; @@ -157,7 +157,7 @@ } } -int codepointCount( String str ){ +int codepointCount( CString str ){ version(Tango){ scope dchar[] buf = new dchar[]( str.length ); uint ate; @@ -173,7 +173,7 @@ //alias tango.text.convert.Utf.toString16 toString16; //alias tango.text.convert.Utf.toString toString; -int toAbsoluteCodePointStartOffset( String str, int index ){ +int toAbsoluteCodePointStartOffset( CString str, int index ){ //getDwtLogger().trace( __FILE__, __LINE__, "str={}, str.length={}, index={}", str, str.length, index ); //getDwtLogger().trace( __FILE__, __LINE__, Trace.memory( str ); if( str.length is index ){ @@ -206,10 +206,10 @@ return index; } } -int getRelativeCodePointOffset( String str, int startIndex, int searchRelCp ){ +int getRelativeCodePointOffset( CString str, int startIndex, int searchRelCp ){ return getAbsoluteCodePointOffset( str, startIndex, searchRelCp ) - startIndex; } -int getAbsoluteCodePointOffset( String str, int startIndex, int searchRelCp ){ +int getAbsoluteCodePointOffset( CString str, int startIndex, int searchRelCp ){ //getDwtLogger().trace( __FILE__, __LINE__, "str={}, str.length={}, startIndex={}, searchRelCp={}", str, str.length, startIndex, searchRelCp ); //getDwtLogger().trace( __FILE__, __LINE__, Trace.memory( str ); @@ -716,7 +716,7 @@ + This is like tango.stdc.stringz.toStringz, but in case of an empty input string, + this function returns a pointer to a null value instead of a null ptr. +/ -public char* toStringzValidPtr( String src ){ +public char* toStringzValidPtr( CString src ){ if( src ){ return src.toStringz(); }
--- a/base/src/java/util/Vector.d Fri Mar 27 15:30:20 2009 +0100 +++ b/base/src/java/util/Vector.d Fri Mar 27 19:58:06 2009 +0100 @@ -69,9 +69,12 @@ implMissing( __FILE__, __LINE__ ); return false; } - public void copyInto(Object[] anArray){ + public void copyInto(void*[] anArray){ implMissing( __FILE__, __LINE__ ); } + //public void copyInto(Object[] anArray){ + // implMissing( __FILE__, __LINE__ ); + //} public Object elementAt(int index){ return get(index); }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/accessibility/Accessible.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/accessibility/Accessible.d Fri Mar 27 19:58:06 2009 +0100 @@ -20,17 +20,15 @@ import org.eclipse.swt.accessibility.AccessibleControlListener; import org.eclipse.swt.accessibility.AccessibleFactory; import org.eclipse.swt.accessibility.AccessibleObject; -import java.lang.Thread; import org.eclipse.swt.SWT; //import org.eclipse.swt.events.*; import org.eclipse.swt.internal.gtk.OS; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.DisposeEvent; -version(Tango){ -import tango.core.Array; -} else { // Phobos -} + +import java.lang.Thread; +import java.util.Vector; /** * Instances of this class provide a bridge between application @@ -56,13 +54,16 @@ * @since 2.0 */ public class Accessible { - AccessibleListener[] accessibleListeners; - AccessibleControlListener[] controlListeners; - AccessibleTextListener[] textListeners; + Vector accessibleListeners; + Vector controlListeners; + Vector textListeners; AccessibleObject accessibleObject; Control control; this (Control control) { + accessibleListeners = new Vector(); + controlListeners = new Vector(); + textListeners = new Vector(); this.control = control; AccessibleFactory.registerAccessible (this); control.addDisposeListener (new class () DisposeListener { @@ -96,7 +97,7 @@ public void addAccessibleListener (AccessibleListener listener) { checkWidget (); if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - accessibleListeners ~= listener; + accessibleListeners.addElement(cast(Object)listener); } /** @@ -123,7 +124,7 @@ public void addAccessibleControlListener (AccessibleControlListener listener) { checkWidget (); if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - controlListeners ~= listener; + controlListeners.addElement(cast(Object)listener); } /** @@ -152,7 +153,7 @@ public void addAccessibleTextListener (AccessibleTextListener listener) { checkWidget (); if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - textListeners ~= listener; + textListeners.addElement(cast(Object)listener); } /** @@ -172,8 +173,10 @@ } AccessibleListener[] getAccessibleListeners () { - if (accessibleListeners.length is 0 ) return null; - return accessibleListeners.dup; + if (accessibleListeners is null ) return null; + AccessibleListener[] result = new AccessibleListener [accessibleListeners.size ()]; + accessibleListeners.copyInto ( cast(void*[])result); + return result; } GtkWidget* getControlHandle () { @@ -181,13 +184,17 @@ } AccessibleControlListener[] getControlListeners () { - if (controlListeners.length is 0) return null; - return controlListeners.dup; + if (controlListeners is null) return null; + AccessibleControlListener[] result = new AccessibleControlListener [controlListeners.size ()]; + controlListeners.copyInto ( cast(void*[])result); + return result; } AccessibleTextListener[] getTextListeners () { - if (textListeners.length is 0) return null; - return textListeners.dup; + if (textListeners is null) return null; + AccessibleTextListener[] result = new AccessibleTextListener [textListeners.size ()]; + textListeners.copyInto ( cast(void*[])result); + return result; } /** @@ -244,7 +251,7 @@ public void removeAccessibleControlListener (AccessibleControlListener listener) { checkWidget (); if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - controlListeners.length = remove( controlListeners, listener, delegate bool(AccessibleControlListener a1, AccessibleControlListener a2 ){ return a1 is a2; }); + controlListeners.removeElement( cast(Object)listener ); } /** @@ -269,7 +276,7 @@ public void removeAccessibleListener (AccessibleListener listener) { checkWidget (); if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - accessibleListeners.length = remove( accessibleListeners, listener, delegate bool( AccessibleListener a1, AccessibleListener a2 ){ return a1 is a2; }); + accessibleListeners.removeElement( cast(Object)listener); } /** @@ -296,7 +303,7 @@ public void removeAccessibleTextListener (AccessibleTextListener listener) { checkWidget (); if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - textListeners.length = remove( textListeners, listener, delegate bool(AccessibleTextListener a1, AccessibleTextListener a2 ){ return a1 is a2; }); + textListeners.removeElement( cast(Object)listener ); } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/accessibility/AccessibleFactory.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/accessibility/AccessibleFactory.d Fri Mar 27 19:58:06 2009 +0100 @@ -95,7 +95,7 @@ private this (int /*long*/ widgetType) { widgetTypeName = OS.g_type_name (widgetType); - String factoryName = FACTORY_TYPENAME ~ fromStringz( widgetTypeName ) ~ '\0'; + String factoryName = (FACTORY_TYPENAME ~ fromStringz( widgetTypeName ) ~ '\0')._idup(); if (OS.g_type_from_name (factoryName.ptr) is 0) { /* register the factory */ auto registry = ATK.atk_get_default_registry (); @@ -137,7 +137,7 @@ if (accessible.accessibleObject !is null) { return accessible.accessibleObject.handle; } - String buffer = fromStringz( widgetTypeName ).dup; + String buffer = fromStringz( widgetTypeName )._idup(); auto type = getType (buffer, accessible, objectParentType, ACC.CHILDID_SELF); AccessibleObject object = new AccessibleObject (type, cast(GtkWidget*)widget, accessible, objectParentType, false); accessible.accessibleObject = object; @@ -193,7 +193,7 @@ } else { action = hypertext = selection = text = true; } - String swtTypeName = SWT_TYPE_PREFIX.dup; + String swtTypeName = SWT_TYPE_PREFIX._idup(); swtTypeName ~= widgetTypeName; if (action) swtTypeName ~= "Action"; //$NON-NLS-1$ if (hypertext) swtTypeName ~= "Hypertext"; //$NON-NLS-1$
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/accessibility/AccessibleObject.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/accessibility/AccessibleObject.d Fri Mar 27 19:58:06 2009 +0100 @@ -14,6 +14,7 @@ import org.eclipse.swt.internal.accessibility.gtk.ATK; import org.eclipse.swt.internal.gtk.OS; +import org.eclipse.swt.internal.LONG; import org.eclipse.swt.accessibility.Accessible; import org.eclipse.swt.accessibility.AccessibleListener; import org.eclipse.swt.accessibility.AccessibleControlListener; @@ -25,6 +26,9 @@ import org.eclipse.swt.accessibility.AccessibleFactory; import org.eclipse.swt.widgets.Display; import java.lang.all; +import java.util.Vector; +import java.util.Hashtable; +import java.util.Enumeration; version(Tango){ import tango.text.Util; } else { // Phobos @@ -36,7 +40,7 @@ int index = -1, id = ACC.CHILDID_SELF; Accessible accessible; AccessibleObject parent; - AccessibleObject[AtkObject*] children; + Hashtable children; /* * a lightweight object does not correspond to a concrete gtk widget, but * to a logical child of a widget (eg.- a CTabItem, which is simply drawn) @@ -68,6 +72,7 @@ } this (int /*long*/ type, GtkWidget* widget, Accessible accessible, int /*long*/ parentType, bool isLightweight) { + children = new Hashtable(9); handle = cast(AtkObject*)ATK.g_object_new (type, null); this.parentType = parentType; ATK.atk_object_initialize (handle, widget); @@ -78,7 +83,7 @@ } void addChild (AccessibleObject child) { - children[child.handle] = child; + children.put(new LONG(cast(long)child.handle), child); child.setParent (this); } @@ -101,18 +106,18 @@ AccessibleEvent event = new AccessibleEvent (object); event.childID = object.id; if (parentResult !is null) { - String res = fromStringz( parentResult ); - event.result = res.dup; + String res = fromStringz( parentResult )._idup(); + event.result = res; } for (int i = 0; i < listeners.length; i++) { listeners [i].getKeyboardShortcut (event); } if (event.result is null) return parentResult; if (keybindingPtr !is null ) OS.g_free (keybindingPtr.ptr); - String name = event.result.dup ~ '\0'; + String name = event.result._idup() ~ '\0'; char* p = cast(char*) OS.g_malloc (name.length); - keybindingPtr = p ? p[ 0 .. name.length ] : null; - return keybindingPtr.ptr; + keybindingPtr = p ? cast(String)p[ 0 .. name.length ] : null; + return cast(char*)keybindingPtr.ptr; } package static extern(C) char* atkAction_get_name (void* obj, int index) { @@ -133,8 +138,8 @@ AccessibleControlEvent event = new AccessibleControlEvent (object); event.childID = object.id; if (parentResult !is null) { - String res = fromStringz( parentResult ); - event.result = res.dup; + auto res = fromStringz( parentResult ); + event.result = res._idup(); } for (int i = 0; i < listeners.length; i++) { listeners [i].getDefaultAction (event); @@ -142,10 +147,10 @@ if (event.result is null) return parentResult; if (actionNamePtr !is null) OS.g_free (actionNamePtr.ptr); - String name = event.result.dup ~ '\0'; + String name = event.result._idup() ~ '\0'; auto p = cast(char*)OS.g_malloc (name.length); - actionNamePtr = p ? p[ 0 .. name.length ] : null; - return actionNamePtr.ptr; + actionNamePtr = p ? cast(String)p[ 0 .. name.length ] : null; + return cast(char*)actionNamePtr.ptr; } package static extern(C) void atkComponent_get_extents (void* obj, int* x, int* y, int* width, int* height, int coord_type) { @@ -359,7 +364,7 @@ AccessibleEvent event = new AccessibleEvent (object); event.childID = object.id; if (parentResult !is null) { - event.result = fromStringz( parentResult ).dup; + event.result = fromStringz( parentResult )._idup(); } for (int i = 0; i < listeners.length; i++) { listeners [i].getDescription (event); @@ -367,10 +372,11 @@ if (event.result is null) return parentResult; if (descriptionPtr !is null) OS.g_free (descriptionPtr.ptr); - String name = event.result.dup ~ '\0'; + String name = event.result._idup() ~ '\0'; char* p = cast(char*)OS.g_malloc (name.length); - descriptionPtr = p ? p[ 0 .. name.length ] : null; - return descriptionPtr.ptr; } + descriptionPtr = p ? cast(String)p[ 0 .. name.length ] : null; + return cast(char*)descriptionPtr.ptr; + } package static extern(C) char* atkObject_get_name (AtkObject* atkObject) { if (DEBUG) getDwtLogger().info (__FILE__, __LINE__, "-->atkObject_get_name: {}", atkObject); @@ -387,17 +393,17 @@ AccessibleEvent event = new AccessibleEvent (object); event.childID = object.id; if (parentResult !is null) { - event.result = fromStringz( parentResult ).dup; + event.result = fromStringz( parentResult )._idup(); } for (int i = 0; i < listeners.length; i++) { listeners [i].getName (event); } if (event.result is null) return parentResult; if (namePtr !is null) OS.g_free (namePtr.ptr); - String name = event.result.dup ~ '\0'; + String name = event.result._idup() ~ '\0'; char* p = cast(char*)OS.g_malloc (name.length); - namePtr = p ? p[ 0 .. name.length ] : null; - return namePtr.ptr; + namePtr = p ? cast(String)p[ 0 .. name.length ] : null; + return cast(char*)namePtr.ptr; } package static extern(C) int atkObject_get_n_children (AtkObject* atkObject) { @@ -862,8 +868,7 @@ break; } case ATK.ATK_TEXT_BOUNDARY_LINE_START: { - int lineStart1 = locate( text, '\n' ); - if( lineStart1 is text.length ) lineStart1 = -1; + int lineStart1 = text.indexOf( '\n' ); if (lineStart1 is -1) { startBounds = endBounds = length; break; @@ -874,8 +879,7 @@ break; } startBounds = lineStart1; - int lineStart2 = locate( text, '\n' ); - if( lineStart2 is text.length ) lineStart2 = -1; + int lineStart2 = text.indexOf( '\n' ); if (lineStart2 is -1) { endBounds = length; break; @@ -1168,19 +1172,23 @@ } AccessibleObject getChildByHandle (AtkObject* handle) { - return children[handle]; + return cast(AccessibleObject) children.get( new LONG(handle) ); } AccessibleObject getChildByID (int childId) { if (childId is ACC.CHILDID_SELF) return this; - foreach( object; children ){ + Enumeration elements = children.elements (); + while (elements.hasMoreElements ()) { + AccessibleObject object = cast(AccessibleObject) elements.nextElement (); if (object.id is childId) return object; } return null; } AccessibleObject getChildByIndex (int childIndex) { - foreach( object; children ){ + Enumeration elements = children.elements (); + while (elements.hasMoreElements ()) { + AccessibleObject object = cast(AccessibleObject) elements.nextElement (); if (object.index is childIndex) return object; } return null; @@ -1204,7 +1212,7 @@ if (characterCount > 0 && textIface.get_text !is null) { parentResult = textIface.get_text( handle, 0, characterCount); if (parentResult !is null) { - parentText = fromStringz( parentResult ).dup; + parentText = fromStringz( parentResult )._idup(); } } } @@ -1240,8 +1248,8 @@ int result = string.length; for (int i = 0; i < searchChars.length; i++) { char current = searchChars[i]; - int index = locate( string, current, startIndex ); - if (index !is string.length ) result = Math.min (result, index); + int index = string.indexOf( current, startIndex ); + if (index !is -1 ) result = Math.min (result, index); } return result; } @@ -1251,7 +1259,7 @@ int index = startIndex; while (index < length) { char current = string[index]; - if ( !contains( searchChars, current)) break; + if ( searchChars.indexOf( current) is -1) break; index++; } return index; @@ -1263,8 +1271,8 @@ string = string[0 .. startIndex]; for (int i = 0; i < searchChars.length ; i++) { char current = searchChars[i]; - int index = locatePrior( string, current); - if (index !is string.length ) result = Math.max (result, index); + int index = string.lastIndexOf( current); + if (index !is -1 ) result = Math.max (result, index); } return result; } @@ -1274,7 +1282,7 @@ int index = startIndex - 1; while (index >= 0) { char current = string[index]; - if ( !contains(searchChars, current)) break; + if ( searchChars.indexOf( current) is -1 ) break; index--; } return index; @@ -1283,14 +1291,16 @@ void release () { if (DEBUG) getDwtLogger().info( __FILE__, __LINE__, "AccessibleObject.release: {}", handle); accessible = null; - foreach( child; children ){ + Enumeration elements = children.elements (); + while (elements.hasMoreElements ()) { + AccessibleObject child = cast(AccessibleObject) elements.nextElement (); if (child.isLightweight) OS.g_object_unref (child.handle); } if (parent !is null) parent.removeChild (this, false); } void removeChild (AccessibleObject child, bool unref) { - children.remove (child.handle); + children.remove (new LONG (child.handle)); if (unref && child.isLightweight) OS.g_object_unref (child.handle); } @@ -1336,51 +1346,96 @@ listeners [i].getChildren (event); } if (event.children !is null && event.children.length > 0) { - AtkObject*[] idsToKeep = new AtkObject*[]( children.length ); - idsToKeep.length = 0; - if ( null !is (cast(Integer)event.children[0] )) { + Vector idsToKeep = new Vector (children.size ()); + if ( null !is cast(Integer)event.children [0]) { /* an array of child id's (Integers) was answered */ - auto parentType = AccessibleFactory.getDefaultParentType (); + int /*long*/ parentType = AccessibleFactory.getDefaultParentType (); for (int i = 0; i < event.children.length; i++) { AccessibleObject object = getChildByIndex (i); if (object is null) { - auto childType = AccessibleFactory.getChildType (accessible, i); + int /*long*/ childType = AccessibleFactory.getChildType (accessible, i); object = new AccessibleObject (childType, null, accessible, parentType, true); AccessibleObjects[object.handle] = object; addChild (object); object.index = i; } - if( auto intChild = cast(Integer)event.children[i] ){ - object.id = intChild.intValue (); - } - else { + try { + object.id = (cast(Integer)event.children[i]).intValue (); + } catch (ClassCastException e) { /* a non-ID value was given so don't set the ID */ } - idsToKeep ~= object.handle; + idsToKeep.addElement (new LONG (object.handle)); } } else { /* an array of Accessible children was answered */ int childIndex = 0; for (int i = 0; i < event.children.length; i++) { AccessibleObject object = null; - if( auto accChild = cast(Accessible)event.children[i] ){ - object = accChild.accessibleObject; - } else { - /* a non-Accessible value was given so nothing to do here */ + try { + object = (cast(Accessible)event.children [i]).accessibleObject; + } catch (ClassCastException e) { + /* a non-Accessible value was given so nothing to do here */ } if (object !is null) { object.index = childIndex++; - idsToKeep ~= object.handle; + idsToKeep.addElement (new LONG (object.handle)); } } } /* remove old children that were not provided as children anymore */ - foreach( id; children.keys ){ - if ( !tango.core.Array.contains( idsToKeep, id )) { - AccessibleObject object = cast(AccessibleObject) children[id]; + Enumeration ids = children.keys (); + while (ids.hasMoreElements ()) { + LONG id = cast(LONG)ids.nextElement (); + if (!idsToKeep.contains (id)) { + AccessibleObject object = cast(AccessibleObject) children.get (id); removeChild (object, true); } } +// AtkObject*[] idsToKeep = new AtkObject*[]( children.length ); +// idsToKeep.length = 0; +// if ( null !is (cast(Integer)event.children[0] )) { +// /* an array of child id's (Integers) was answered */ +// auto parentType = AccessibleFactory.getDefaultParentType (); +// for (int i = 0; i < event.children.length; i++) { +// AccessibleObject object = getChildByIndex (i); +// if (object is null) { +// auto childType = AccessibleFactory.getChildType (accessible, i); +// object = new AccessibleObject (childType, null, accessible, parentType, true); +// AccessibleObjects[object.handle] = object; +// addChild (object); +// object.index = i; +// } +// if( auto intChild = cast(Integer)event.children[i] ){ +// object.id = intChild.intValue (); +// } +// else { +// /* a non-ID value was given so don't set the ID */ +// } +// idsToKeep ~= object.handle; +// } +// } else { +// /* an array of Accessible children was answered */ +// int childIndex = 0; +// for (int i = 0; i < event.children.length; i++) { +// AccessibleObject object = null; +// if( auto accChild = cast(Accessible)event.children[i] ){ +// object = accChild.accessibleObject; +// } else { +// /* a non-Accessible value was given so nothing to do here */ +// } +// if (object !is null) { +// object.index = childIndex++; +// idsToKeep ~= object.handle; +// } +// } +// } +// /* remove old children that were not provided as children anymore */ +// foreach( id; children.keys ){ +// if ( !tango.core.Array.contains( idsToKeep, id )) { +// AccessibleObject object = cast(AccessibleObject) children[id]; +// removeChild (object, true); +// } +// } } } }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CCombo.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CCombo.d Fri Mar 27 19:58:06 2009 +0100 @@ -581,19 +581,14 @@ * an '&' character in the given string. If there are no '&' * characters in the given string, return '\0'. */ -dchar _findMnemonic (String string) { - if (string is null) return '\0'; +dchar _findMnemonic (String str) { + if (str is null) return '\0'; int index = 0; - int length = string.length; + int length = str.length; do { - while (index < length && string[index] !is '&') index++; + while (index < length && str[index] !is '&') index++; if (++index >= length) return '\0'; - if (string[index] !is '&') { - dchar[1] d; uint ate; - auto d2 = tango.text.convert.Utf.toString32( string[ index .. Math.min( index +4, string.length )], d, &ate ); - auto d3 = tango.text.Unicode.toLower( d2, d2 ); - return d3[0]; - } + if (str[index] !is '&') return Character.toLowerCase (str.dcharAt (index)); index++; } while (index < length); return '\0'; @@ -924,7 +919,7 @@ if (text !is null) { dchar mnemonic = _findMnemonic (text); if (mnemonic !is '\0') { - shortcut = tango.text.convert.Format.Format( "Alt+{}", mnemonic ); //$NON-NLS-1$ + shortcut = Format( "Alt+{}", mnemonic ); //$NON-NLS-1$ } } }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CLabel.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CLabel.d Fri Mar 27 19:58:06 2009 +0100 @@ -223,12 +223,7 @@ do { while (index < length && string[index] !is '&') index++; if (++index >= length) return '\0'; - if (string[index] !is '&') { - dchar[1] tmp; uint ate; - dchar[] tmp2 = tango.text.convert.Utf.toString32( string[index .. Math.min( index + 4, string.length ) ], tmp, &ate ); - assert( tmp2.length == 1 ); - return tango.text.Unicode.toLower( tmp2 )[0]; - } + if (string[index] !is '&') return Character.toLowerCase (string.dcharAt (index)); index++; } while (index < length); return '\0'; @@ -317,7 +312,7 @@ if (mnemonic !is '\0') { dchar[1] d; d[0] = mnemonic; - e.result = "Alt+" ~ tango.text.convert.Utf.toString(d); //$NON-NLS-1$ + e.result = Format("Alt+{}", d); //$NON-NLS-1$ } } }); @@ -359,9 +354,7 @@ void onMnemonic(TraverseEvent event) { dchar mnemonic = _findMnemonic(text); if (mnemonic is '\0') return; - dchar[1] d; uint ate; - auto r = tango.text.convert.Utf.toString32( [event.character][], d, &ate ); - if (tango.text.Unicode.toLower(r)[0] !is mnemonic) return; + if (Character.toLowerCase(event.character) !is mnemonic) return; Composite control = this.getParent(); while (control !is null) { Control [] children = control.getChildren(); @@ -808,7 +801,7 @@ layout.setText(t); mid = validateOffset(layout, mid); while (min < mid && mid < max) { - String s1 = t[0 .. mid].dup; + String s1 = t.substring(0, mid); String s2 = t.substring(validateOffset(layout, l-mid), l); int l1 = gc.textExtent(s1, DRAW_FLAGS).x; int l2 = gc.textExtent(s2, DRAW_FLAGS).x; @@ -835,8 +828,8 @@ String[] lines = new String[1]; int start = 0, pos; do { - pos = tango.text.Util.locate( text, '\n', start); - if (pos is text.length ) { + pos = text.indexOf( '\n', start); + if (pos is -1 ) { lines[lines.length - 1] = text[start .. $ ]; } else { bool crlf = (pos > 0) && (text[ pos - 1 ] is '\r');
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolder.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolder.d Fri Mar 27 19:58:06 2009 +0100 @@ -49,9 +49,10 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; -static import tango.text.convert.Utf; + import tango.util.Convert; + static import tango.text.convert.Utf; } else { // Phobos + import std.conv; } /** @@ -1686,7 +1687,7 @@ if (text !is null) { dchar mnemonic = _findMnemonic(text); if (mnemonic !is '\0') { - shortcut = "Alt+"~tango.text.convert.Utf.toString([mnemonic]); //$NON-NLS-1$ + shortcut = Format("Alt+{}", mnemonic); //$NON-NLS-1$ } } }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolderEvent.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolderEvent.d Fri Mar 27 19:58:06 2009 +0100 @@ -20,8 +20,9 @@ import org.eclipse.swt.widgets.Widget; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabItem.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabItem.d Fri Mar 27 19:58:06 2009 +0100 @@ -215,7 +215,7 @@ x+9,y+2, x+7,y+4, x+7,y+5, x+9,y+7, x+9,y+9, x+7,y+9, x+5,y+7, x+4,y+7, x+2,y+9, x,y+9, x,y+7, x+2,y+5, x+2,y+4, x,y+2]; - Color fill = new Color(display, CTabFolder.CLOSE_FILL); + Color fill = new Color(display, cast(RGB)CTabFolder.CLOSE_FILL); gc.setBackground(fill); gc.fillPolygon(shape); fill.dispose(); @@ -228,7 +228,7 @@ x+10,y+3, x+8,y+5, x+8,y+6, x+10,y+8, x+10,y+10, x+8,y+10, x+6,y+8, x+5,y+8, x+3,y+10, x+1,y+10, x+1,y+8, x+3,y+6, x+3,y+5, x+1,y+3]; - Color fill = new Color(display, CTabFolder.CLOSE_FILL); + Color fill = new Color(display, cast(RGB)CTabFolder.CLOSE_FILL); gc.setBackground(fill); gc.fillPolygon(shape); fill.dispose(); @@ -288,7 +288,7 @@ shape = null; if (this.parent.onBottom) { int[] left = parent.simple ? CTabFolder.SIMPLE_BOTTOM_LEFT_CORNER : CTabFolder.BOTTOM_LEFT_CORNER; - int[] right = parent.simple ? CTabFolder.SIMPLE_BOTTOM_RIGHT_CORNER : parent.curve; + int[] right = parent.simple ? cast(int[])CTabFolder.SIMPLE_BOTTOM_RIGHT_CORNER : parent.curve; if (parent.borderLeft is 0 && parent.indexOf(this) is parent.firstIndex) { left = [x, y+height]; } @@ -312,7 +312,7 @@ shape[index++] = y - 1; } else { int[] left = parent.simple ? CTabFolder.SIMPLE_TOP_LEFT_CORNER : CTabFolder.TOP_LEFT_CORNER; - int[] right = parent.simple ? CTabFolder.SIMPLE_TOP_RIGHT_CORNER : parent.curve; + int[] right = parent.simple ? cast(int[])CTabFolder.SIMPLE_TOP_RIGHT_CORNER : parent.curve; if (parent.borderLeft is 0 && parent.indexOf(this) is parent.firstIndex) { left = [x, y]; }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/DefaultContent.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/DefaultContent.d Fri Mar 27 19:58:06 2009 +0100 @@ -503,7 +503,7 @@ while ((length_ - 1 >= 0) && isDelimiter(textStore[start+length_-1])) { length_--; } - return textStore[ start .. start + length_].dup; + return textStore[ start .. start + length_]._idup(); } else { // gap is in the specified range, strip out the gap StringBuffer buf = new StringBuffer(); @@ -514,7 +514,7 @@ while ((length_ - 1 >=0) && isDelimiter(buf.slice[length_ - 1])) { length_--; } - return buf.toString()[ 0 .. length_ ].dup; + return buf.toString()[ 0 .. length_ ]._idup(); } } /** @@ -541,14 +541,14 @@ int end = start + length_ - 1; if (!gapExists() || (end < gapStart) || (start >= gapEnd)) { // line is before or after the gap - return textStore[ start .. start + length_ ].dup; + return textStore[ start .. start + length_ ]._idup(); } else { // gap is in the specified range, strip out the gap StringBuffer buffer = new StringBuffer(); int gapLength = gapEnd - gapStart; buffer.append(textStore[ start .. gapStart ]); buffer.append(textStore[ gapEnd .. gapEnd + length_ - gapLength - (gapStart - start) ]); - return buffer.toString().dup; + return buffer.toString()._idup(); } } /** @@ -707,7 +707,7 @@ * @return the text */ String getPhysicalText(int start, int length_) { - return textStore[ start .. start + length_ ].dup; + return textStore[ start .. start + length_ ]._idup(); } /** * Returns a string representing the logical content of @@ -725,15 +725,15 @@ return ""; int end= start + length_; if (!gapExists() || (end < gapStart)) - return textStore[ start .. start + length_].dup; + return textStore[ start .. start + length_]._idup(); if (gapStart < start) { int gapLength= gapEnd - gapStart; - return textStore[ start + gapLength .. start + gapLength + length_ ].dup; + return textStore[ start + gapLength .. start + gapLength + length_ ]._idup(); } StringBuffer buf = new StringBuffer(); buf.append(textStore[ start .. start + gapStart - start ] ); buf.append(textStore[ gapEnd .. gapEnd + end - gapStart ] ); - return buf.toString().dup; + return buf.toString()._idup(); } /** * Removes the specified <code>TextChangeListener</code>.
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/PopupList.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/PopupList.d Fri Mar 27 19:58:06 2009 +0100 @@ -228,7 +228,7 @@ // specified string if (string !is null){ for (int i = 0; i < items.length; i++) { - if ( tango.text.Util.locatePattern( items[i], string) is 0 ){ + if ( items[i].startsWith( string) ){ int index = list.indexOf(items[i]); list.select(index); break;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/SashFormData.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/SashFormData.d Fri Mar 27 19:58:06 2009 +0100 @@ -15,9 +15,10 @@ import java.lang.all; version(Tango){ -static import tango.text.Util; -import tango.util.Convert; + static import tango.text.Util; + import tango.util.Convert; } else { // Phobos + import std.conv; } class SashFormData { @@ -25,10 +26,10 @@ long weight; String getName () { - String string = this.classinfo.name; - int index = tango.text.Util.locatePrior( string ,'.' ); - if (index is string.length ) return string; - return string[ index + 1 .. $ ]; + String str = this.classinfo.name; + int index = str.lastIndexOf( '.' ); + if (index is -1 ) return str; + return str[ index + 1 .. $ ]; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StackLayout.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StackLayout.d Fri Mar 27 19:58:06 2009 +0100 @@ -24,9 +24,9 @@ import org.eclipse.swt.widgets.Layout; version(Tango){ -import tango.util.Convert; -static import tango.text.Util; + import tango.util.Convert; } else { // Phobos + import std.conv; } /** @@ -139,8 +139,8 @@ String getName () { String string = this.classinfo.name; - int index = tango.text.Util.locatePrior( string ,'.'); - if (index is string.length ) return string; + int index = string.lastIndexOf('.'); + if (index is -1 ) return string; return string[ index + 1 .. $ ]; } @@ -155,7 +155,7 @@ if (marginWidth !is 0) string ~= "marginWidth="~to!(String)(marginWidth)~" "; if (marginHeight !is 0) string ~= "marginHeight="~to!(String)(marginHeight)~" "; if (topControl !is null) string ~= "topControl="~to!(String)(topControl)~" "; - string = tango.text.Util.trim(string); + string = string.trim(); string ~= "}"; return string; }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyleRange.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyleRange.d Fri Mar 27 19:58:06 2009 +0100 @@ -218,8 +218,7 @@ buffer.append("normal"); } String str = super.toString(); - int index = tango.text.Util.locate( str, '{'); - if( index is str.length ) index = -1; + int index = str.indexOf( '{'); str = str[ index + 1 .. $ ]; if (str.length > 1) buffer.append(", "); buffer.append(str);
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledText.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledText.d Fri Mar 27 19:58:06 2009 +0100 @@ -86,6 +86,7 @@ static import tango.io.model.IFile; import tango.util.Convert; } else { // Phobos + import std.conv; static import std.string; } import java.lang.all; @@ -658,7 +659,7 @@ StringBuffer buffer = new StringBuffer(segment.substring (0, pageIndex)); buffer.append (page); buffer.append (segment.substring(pageIndex + pageTagLength)); - segment = buffer.toString().dup; + segment = buffer.toString()._idup(); } if (segment.length > 0) { layout.setText(segment); @@ -4003,8 +4004,8 @@ String line = content.getLine(lineIndex); int level; int offset = offsetInLine; - while (offset > 0 && tango.text.Unicode.isDigit(line[offset])) offset--; - if (offset is 0 && tango.text.Unicode.isDigit(line[offset])) { + while (offset > 0 && Character.isDigit(line.dcharAt(offset))) offset--; + if (offset is 0 && Character.isDigit(line.dcharAt(offset))) { level = isMirrored() ? 1 : 0; } else { level = layout.getLevel(offset) & 0x1; @@ -4809,8 +4810,8 @@ if (lineLength is 0) return isMirrored() ? SWT.RIGHT : SWT.LEFT; if (caretAlignment is PREVIOUS_OFFSET_TRAILING && offset > 0) offset--; if (offset is lineLength && offset > 0) offset--; - while (offset > 0 && tango.text.Unicode.isDigit(line[offset])) offset--; - if (offset is 0 && tango.text.Unicode.isDigit(line[offset])) { + while (offset > 0 && Character.isDigit(line.dcharAt(offset))) offset--; + if (offset is 0 && Character.isDigit(line.dcharAt(offset))) { return isMirrored() ? SWT.RIGHT : SWT.LEFT; } TextLayout layout = renderer.getTextLayout(caretLine); @@ -5328,8 +5329,7 @@ //paste clipboard selection if (event.button is 2) { - auto o = cast(ArrayWrapperString)getClipboardContent(DND.SELECTION_CLIPBOARD); - String text = o.array; + String text = stringcast(getClipboardContent(DND.SELECTION_CLIPBOARD)); if (text !is null && text.length > 0) { // position cursor doMouseLocationChange(event.x, event.y, false); @@ -5666,7 +5666,7 @@ if (text !is null) { dchar mnemonic = _findMnemonic (text); if (mnemonic !is '\0') { - shortcut = "Alt+"~String_valueOf( [mnemonic] ); //$NON-NLS-1$ + shortcut = Format("Alt+{}", mnemonic ); //$NON-NLS-1$ } } } @@ -6040,10 +6040,7 @@ */ public void paste(){ checkWidget(); - String text = null; - if( auto o = cast(ArrayWrapperString) getClipboardContent(DND.CLIPBOARD)){ - text = o.array; - } + String text = stringcast( getClipboardContent(DND.CLIPBOARD)); if (text !is null && text.length > 0) { Event event = new Event(); event.start = selection.x;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextListener.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextListener.d Fri Mar 27 19:58:06 2009 +0100 @@ -53,69 +53,69 @@ */ public override void handleEvent(Event e) { -// switch (e.type) { -// case StyledText.ExtendedModify: -// ExtendedModifyEvent extendedModifyEvent = new ExtendedModifyEvent(cast(StyledTextEvent) e); -// (cast(ExtendedModifyListener) eventListener).modifyText(extendedModifyEvent); -// break; -// case StyledText.LineGetBackground: -// LineBackgroundEvent lineBgEvent = new LineBackgroundEvent(cast(StyledTextEvent) e); -// (cast(LineBackgroundListener) eventListener).lineGetBackground(lineBgEvent); -// (cast(StyledTextEvent) e).lineBackground = lineBgEvent.lineBackground; -// break; -// case StyledText.LineGetSegments: -// BidiSegmentEvent segmentEvent = new BidiSegmentEvent(cast(StyledTextEvent) e); -// (cast(BidiSegmentListener) eventListener).lineGetSegments(segmentEvent); -// (cast(StyledTextEvent) e).segments = segmentEvent.segments; -// break; -// case StyledText.LineGetStyle: -// LineStyleEvent lineStyleEvent = new LineStyleEvent(cast(StyledTextEvent) e); -// (cast(LineStyleListener) eventListener).lineGetStyle(lineStyleEvent); -// (cast(StyledTextEvent) e).ranges = lineStyleEvent.ranges; -// (cast(StyledTextEvent) e).styles = lineStyleEvent.styles; -// (cast(StyledTextEvent) e).alignment = lineStyleEvent.alignment; -// (cast(StyledTextEvent) e).indent = lineStyleEvent.indent; -// (cast(StyledTextEvent) e).justify = lineStyleEvent.justify; -// (cast(StyledTextEvent) e).bullet = lineStyleEvent.bullet; -// (cast(StyledTextEvent) e).bulletIndex = lineStyleEvent.bulletIndex; -// break; -// case StyledText.PaintObject: -// PaintObjectEvent paintObjectEvent = new PaintObjectEvent(cast(StyledTextEvent) e); -// (cast(PaintObjectListener) eventListener).paintObject(paintObjectEvent); -// break; -// case StyledText.VerifyKey: -// VerifyEvent verifyEvent = new VerifyEvent(e); -// (cast(VerifyKeyListener) eventListener).verifyKey(verifyEvent); -// e.doit = verifyEvent.doit; -// break; -// case StyledText.TextChanged: { -// TextChangedEvent textChangedEvent = new TextChangedEvent(cast(StyledTextContent) e.data); -// (cast(TextChangeListener) eventListener).textChanged(textChangedEvent); -// break; -// } -// case StyledText.TextChanging: -// TextChangingEvent textChangingEvent = new TextChangingEvent(cast(StyledTextContent) e.data, cast(StyledTextEvent) e); -// (cast(TextChangeListener) eventListener).textChanging(textChangingEvent); -// break; -// case StyledText.TextSet: { -// TextChangedEvent textChangedEvent = new TextChangedEvent(cast(StyledTextContent) e.data); -// (cast(TextChangeListener) eventListener).textSet(textChangedEvent); -// break; -// } -// case StyledText.WordNext: { -// MovementEvent wordBoundaryEvent = new MovementEvent(cast(StyledTextEvent) e); -// (cast(MovementListener) eventListener).getNextOffset(wordBoundaryEvent); -// (cast(StyledTextEvent) e).end = wordBoundaryEvent.newOffset; -// break; -// } -// case StyledText.WordPrevious: { -// MovementEvent wordBoundaryEvent = new MovementEvent(cast(StyledTextEvent) e); -// (cast(MovementListener) eventListener).getPreviousOffset(wordBoundaryEvent); -// (cast(StyledTextEvent) e).end = wordBoundaryEvent.newOffset; -// break; -// } -// default: -// } + switch (e.type) { + case StyledText.ExtendedModify: + ExtendedModifyEvent extendedModifyEvent = new ExtendedModifyEvent(cast(StyledTextEvent) e); + (cast(ExtendedModifyListener) eventListener).modifyText(extendedModifyEvent); + break; + case StyledText.LineGetBackground: + LineBackgroundEvent lineBgEvent = new LineBackgroundEvent(cast(StyledTextEvent) e); + (cast(LineBackgroundListener) eventListener).lineGetBackground(lineBgEvent); + (cast(StyledTextEvent) e).lineBackground = lineBgEvent.lineBackground; + break; + case StyledText.LineGetSegments: + BidiSegmentEvent segmentEvent = new BidiSegmentEvent(cast(StyledTextEvent) e); + (cast(BidiSegmentListener) eventListener).lineGetSegments(segmentEvent); + (cast(StyledTextEvent) e).segments = segmentEvent.segments; + break; + case StyledText.LineGetStyle: + LineStyleEvent lineStyleEvent = new LineStyleEvent(cast(StyledTextEvent) e); + (cast(LineStyleListener) eventListener).lineGetStyle(lineStyleEvent); + (cast(StyledTextEvent) e).ranges = lineStyleEvent.ranges; + (cast(StyledTextEvent) e).styles = lineStyleEvent.styles; + (cast(StyledTextEvent) e).alignment = lineStyleEvent.alignment; + (cast(StyledTextEvent) e).indent = lineStyleEvent.indent; + (cast(StyledTextEvent) e).justify = lineStyleEvent.justify; + (cast(StyledTextEvent) e).bullet = lineStyleEvent.bullet; + (cast(StyledTextEvent) e).bulletIndex = lineStyleEvent.bulletIndex; + break; + case StyledText.PaintObject: + PaintObjectEvent paintObjectEvent = new PaintObjectEvent(cast(StyledTextEvent) e); + (cast(PaintObjectListener) eventListener).paintObject(paintObjectEvent); + break; + case StyledText.VerifyKey: + VerifyEvent verifyEvent = new VerifyEvent(e); + (cast(VerifyKeyListener) eventListener).verifyKey(verifyEvent); + e.doit = verifyEvent.doit; + break; + case StyledText.TextChanged: { + TextChangedEvent textChangedEvent = new TextChangedEvent(cast(StyledTextContent) e.data); + (cast(TextChangeListener) eventListener).textChanged(textChangedEvent); + break; + } + case StyledText.TextChanging: + TextChangingEvent textChangingEvent = new TextChangingEvent(cast(StyledTextContent) e.data, cast(StyledTextEvent) e); + (cast(TextChangeListener) eventListener).textChanging(textChangingEvent); + break; + case StyledText.TextSet: { + TextChangedEvent textChangedEvent = new TextChangedEvent(cast(StyledTextContent) e.data); + (cast(TextChangeListener) eventListener).textSet(textChangedEvent); + break; + } + case StyledText.WordNext: { + MovementEvent wordBoundaryEvent = new MovementEvent(cast(StyledTextEvent) e); + (cast(MovementListener) eventListener).getNextOffset(wordBoundaryEvent); + (cast(StyledTextEvent) e).end = wordBoundaryEvent.newOffset; + break; + } + case StyledText.WordPrevious: { + MovementEvent wordBoundaryEvent = new MovementEvent(cast(StyledTextEvent) e); + (cast(MovementListener) eventListener).getPreviousOffset(wordBoundaryEvent); + (cast(StyledTextEvent) e).end = wordBoundaryEvent.newOffset; + break; + } + default: + } } }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextRenderer.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextRenderer.d Fri Mar 27 19:58:06 2009 +0100 @@ -41,10 +41,11 @@ import java.lang.all; version(Tango){ -static import tango.text.Util; -static import tango.text.convert.Utf; -import tango.util.Convert; + static import tango.text.Util; + static import tango.text.convert.Utf; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/TableTree.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/TableTree.d Fri Mar 27 19:58:06 2009 +0100 @@ -83,10 +83,10 @@ */ bool inDispose = false; - static const TableTreeItem[] EMPTY_ITEMS; - static const String[] EMPTY_TEXTS; - static const Image[] EMPTY_IMAGES; - static const String ITEMID = "TableTreeItemID"; //$NON-NLS-1$ + static /+const+/ TableTreeItem[] EMPTY_ITEMS; + static /+const+/ String[] EMPTY_TEXTS; + static /+const+/ Image[] EMPTY_IMAGES; + static /+const+/ String ITEMID = "TableTreeItemID"; //$NON-NLS-1$ /** * Constructs a new instance of this class given its parent
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/DND.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/DND.d Fri Mar 27 19:58:06 2009 +0100 @@ -20,8 +20,9 @@ import org.eclipse.swt.SWTException; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/ImageTransfer.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/ImageTransfer.d Fri Mar 27 19:58:06 2009 +0100 @@ -131,7 +131,7 @@ if (transferData.type is cast(void*)XBM_ID) typeStr = "xbm"; if (transferData.type is cast(void*)XPM_ID) typeStr = "xpm"; if (transferData.type is cast(void*)XV_ID) typeStr = "xv"; - char* type = typeStr.ptr; + CCharPtr type = typeStr.ptr; char* buffer; uint len; if (type is null) return;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/events/TypedEvent.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/events/TypedEvent.d Fri Mar 27 19:58:06 2009 +0100 @@ -19,10 +19,6 @@ import org.eclipse.swt.internal.SWTEventObject; import java.lang.all; -version(Tango){ -import tango.text.Util : split; -} else { // Phobos -} /** * This is the super class for all typed event classes provided @@ -92,8 +88,10 @@ * @return the name of the event */ String getName () { - String str = this.classinfo.name; - return split( str, "." )[$-1]; + String string = this.classinfo.name; + int index = string.lastIndexOf ('.'); + if (index is -1) return string; + return string.substring (index + 1, string.length ()); } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/TextStyle.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/TextStyle.d Fri Mar 27 19:58:06 2009 +0100 @@ -20,8 +20,9 @@ import org.eclipse.swt.graphics.GlyphMetrics; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /** * <code>TextStyle</code> defines a set of styles that can be applied
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Compatibility.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Compatibility.d Fri Mar 27 19:58:06 2009 +0100 @@ -377,7 +377,7 @@ } if (msgs !is null) { try { - char[] frmt = msgs.getString(key); + String frmt = msgs.getString(key); switch( args.length ){ case 0: answer = Format(frmt); break; case 1: answer = Format(frmt, args[0]); break;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Converter.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Converter.d Fri Mar 27 19:58:06 2009 +0100 @@ -39,8 +39,8 @@ */ public final class Converter { public static const char [] NullByteArray = "\0"; - public static const char [] EmptyByteArray = ""; - public static const wchar [] EmptyCharArray = ""; + public static const char [] EmptyByteArray; + public static const wchar [] EmptyCharArray; /** * Returns the default code page for the platform where the @@ -56,7 +56,7 @@ int items_written; wchar* ptr = g_utf8_to_utf16 (toStringz(buffer), buffer.length, null, &items_written, null); if (!ptr){ - return EmptyCharArray; + return cast(wchar[])EmptyCharArray; } wchar[] chars = ptr[ 0 .. items_written].dup; g_free (ptr); @@ -80,7 +80,7 @@ */ char* ptr = g_utf16_to_utf8 (toString16z(buffer), buffer.length, & items_read, & items_written, null); if (!ptr) { - return terminate ? NullByteArray : EmptyByteArray; + return terminate ?cast(char[]) NullByteArray : cast(char[])EmptyByteArray; } char [] bytes = new char [items_written + (terminate ? 1 : 0)]; bytes[ 0 .. items_written ] = ptr[ 0 .. items_written ];
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Library.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Library.d Fri Mar 27 19:58:06 2009 +0100 @@ -14,12 +14,6 @@ import java.lang.all; -version(Tango){ - import tango.util.Convert; -} else { // Phobos - import std.conv; -} - // do it here, so it can be evaluated at compile time // this saves a static ctor. private int buildSWT_VERSION (int major, int minor) { @@ -69,18 +63,18 @@ } while (index < length && isDigit(aVersion[index])) index++; try { - if (start < length) major = to!(int)( aVersion[start .. index] ); - } catch (ConversionException e) {} + if (start < length) major = Integer.parseInt( aVersion[start .. index] ); + } catch (NumberFormatException e) {} start = ++index; while (index < length && isDigit(aVersion[index])) index++; try { - if (start < length) minor = to!(int)(aVersion[start .. index]); - } catch (ConversionException e) {} + if (start < length) minor = Integer.parseInt(aVersion[start .. index]); + } catch (NumberFormatException e) {} start = ++index; while (index < length && isDigit(aVersion[index])) index++; try { - if (start < length) micro = to!(int)(aVersion[start .. index]); - } catch (ConversionException e) {} + if (start < length) micro = Integer.parseInt(aVersion[start .. index]); + } catch (NumberFormatException e) {} return buildJAVA_VERSION(major, minor, micro); }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Lock.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Lock.d Fri Mar 27 19:58:06 2009 +0100 @@ -34,8 +34,12 @@ } public this() { - mutex = new Mutex; - cond = new Condition(mutex); + version(Tango){ + mutex = new Mutex; + cond = new Condition(mutex); + } else { // Phobos + implMissing( __FILE__, __LINE__ ); + } } /** * Locks the monitor and returns the lock count. If @@ -64,6 +68,7 @@ } } else { // Phobos implMissing( __FILE__, __LINE__ ); + return 0; } }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Platform.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/Platform.d Fri Mar 27 19:58:06 2009 +0100 @@ -22,7 +22,7 @@ public class Platform { public static const String PLATFORM = "gtk"; //$NON-NLS-1$ - public static const Lock lock; + public static Lock lock; static this() { lock = new Lock(); }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/c/gdk.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/c/gdk.d Fri Mar 27 19:58:06 2009 +0100 @@ -1588,8 +1588,8 @@ extern (C) void function(_GdkDrawable *, void *, void *, int, int, char *, int)gdk_property_change; extern (C) int function(_GdkDrawable *, void *, void *, uint, uint, int, void * *, int *, int *, char * *)gdk_property_get; extern (C) char * function(void *)gdk_atom_name; -extern (C) void * function(char *)gdk_atom_intern_static_string; -extern (C) void * function(char *, int)gdk_atom_intern; +extern (C) void * function(in char *)gdk_atom_intern_static_string; +extern (C) void * function(in char *, int)gdk_atom_intern; extern (C) _GdkDrawable * function(_GdkScreen *, uint, int, int, int)gdk_pixmap_foreign_new_for_screen; extern (C) _GdkDrawable * function(_GdkDisplay *, uint)gdk_pixmap_lookup_for_display; extern (C) _GdkDrawable * function(_GdkDisplay *, uint)gdk_pixmap_foreign_new_for_display; @@ -1959,7 +1959,7 @@ extern (C) void function(void *, int, int, int, int, void *, int, int)gdk_pixbuf_copy_area; extern (C) void * function(void *, int, char, char, char)gdk_pixbuf_add_alpha; extern (C) int function(void *, char * *, uint *, char *, char * *, char * *, _GError * *)gdk_pixbuf_save_to_bufferv; -extern (C) int function(void *, char * *, uint *, char *, _GError * *, ...)gdk_pixbuf_save_to_buffer; +extern (C) int function(void *, char * *, uint *, in char *, _GError * *, ...)gdk_pixbuf_save_to_buffer; extern (C) int function(void *, _BCD_func__4618, void *, char *, char * *, char * *, _GError * *)gdk_pixbuf_save_to_callbackv; extern (C) int function(void *, _BCD_func__4618, void *, char *, _GError * *, ...)gdk_pixbuf_save_to_callback; extern (C) int function(void *, char *, char *, char * *, char * *, _GError * *)gdk_pixbuf_savev; @@ -3014,8 +3014,8 @@ extern (C) void gdk_property_change(_GdkDrawable *, void *, void *, int, int, char *, int); extern (C) int gdk_property_get(_GdkDrawable *, void *, void *, uint, uint, int, void * *, int *, int *, char * *); extern (C) char * gdk_atom_name(void *); -extern (C) void * gdk_atom_intern_static_string(char *); -extern (C) void * gdk_atom_intern(char *, int); +extern (C) void * gdk_atom_intern_static_string(in char *); +extern (C) void * gdk_atom_intern(in char *, int); extern (C) _GdkDrawable * gdk_pixmap_foreign_new_for_screen(_GdkScreen *, uint, int, int, int); extern (C) _GdkDrawable * gdk_pixmap_lookup_for_display(_GdkDisplay *, uint); extern (C) _GdkDrawable * gdk_pixmap_foreign_new_for_display(_GdkDisplay *, uint); @@ -3385,7 +3385,7 @@ extern (C) void gdk_pixbuf_copy_area(void *, int, int, int, int, void *, int, int); extern (C) void * gdk_pixbuf_add_alpha(void *, int, char, char, char); extern (C) int gdk_pixbuf_save_to_bufferv(void *, char * *, uint *, char *, char * *, char * *, _GError * *); -extern (C) int gdk_pixbuf_save_to_buffer(void *, char * *, uint *, char *, _GError * *, ...); +extern (C) int gdk_pixbuf_save_to_buffer(void *, char * *, uint *, in char *, _GError * *, ...); extern (C) int gdk_pixbuf_save_to_callbackv(void *, _BCD_func__4618, void *, char *, char * *, char * *, _GError * *); extern (C) int gdk_pixbuf_save_to_callback(void *, _BCD_func__4618, void *, char *, _GError * *, ...); extern (C) int gdk_pixbuf_savev(void *, char *, char *, char * *, char * *, _GError * *);
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/c/glib_object.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/c/glib_object.d Fri Mar 27 19:58:06 2009 +0100 @@ -1677,7 +1677,7 @@ extern (C) void function(_GValue *, void *)g_value_take_object; extern (C) void function(_GObject *)g_object_run_dispose; extern (C) void function(_GObject *)g_object_force_floating; -extern (C) uint function(void *, char *, _BCD_func__2331, void *, int)g_signal_connect_object; +extern (C) uint function(void *, in char *, _BCD_func__2331, void *, int)g_signal_connect_object; extern (C) void * function(_GValue *)g_value_dup_object; extern (C) void * function(_GValue *)g_value_get_object; extern (C) void function(_GValue *, void *)g_value_set_object; @@ -1687,8 +1687,8 @@ extern (C) void function(_GObject *, _GClosure *)g_object_watch_closure; extern (C) void * function(_GObject *, char *)g_object_steal_data; extern (C) void function(_GObject *, char *, void *, _BCD_func__2417)g_object_set_data_full; -extern (C) void function(_GObject *, char *, void *)g_object_set_data; -extern (C) void * function(_GObject *, char *)g_object_get_data; +extern (C) void function(_GObject *, in char *, void *)g_object_set_data; +extern (C) void * function(_GObject *, in char *)g_object_get_data; extern (C) void * function(_GObject *, uint)g_object_steal_qdata; extern (C) void function(_GObject *, uint, void *, _BCD_func__2417)g_object_set_qdata_full; extern (C) void function(_GObject *, uint, void *)g_object_set_qdata; @@ -1712,8 +1712,8 @@ extern (C) void function(_GObject *, char *, char *)g_object_set_valist; extern (C) void function(void *, char *, ...)g_object_disconnect; extern (C) void * function(void *, char *, ...)g_object_connect; -extern (C) void function(void *, char *, ...)g_object_get; -extern (C) void function(void *, char *, ...)g_object_set; +extern (C) void function(void *, in char *, ...)g_object_get; +extern (C) void function(void *, in char *, ...)g_object_set; extern (C) _GObject * function(uint, char *, char *)g_object_new_valist; extern (C) void * function(uint, uint, _GParameter *)g_object_newv; extern (C) void * function(uint, char *, ...)g_object_new; @@ -1738,27 +1738,27 @@ extern (C) void function(void *, uint)g_signal_handler_disconnect; extern (C) void function(void *, uint)g_signal_handler_unblock; extern (C) void function(void *, uint)g_signal_handler_block; -extern (C) uint function(void *, char *, _BCD_func__2331, void *, _BCD_func__2330, int)g_signal_connect_data; -extern (C) uint function(void *, char *, _GClosure *, int)g_signal_connect_closure; +extern (C) uint function(void *, in char *, _BCD_func__2331, void *, _BCD_func__2330, int)g_signal_connect_data; +extern (C) uint function(void *, in char *, _GClosure *, int)g_signal_connect_closure; extern (C) uint function(void *, uint, uint, _GClosure *, int)g_signal_connect_closure_by_id; extern (C) int function(void *, uint, uint, int)g_signal_has_handler_pending; extern (C) void function(uint, uint)g_signal_remove_emission_hook; extern (C) uint function(uint, uint, _BCD_func__2310, void *, _BCD_func__2417)g_signal_add_emission_hook; -extern (C) void function(void *, char *)g_signal_stop_emission_by_name; +extern (C) void function(void *, in char *)g_signal_stop_emission_by_name; extern (C) void function(void *, uint, uint)g_signal_stop_emission; extern (C) _GSignalInvocationHint * function(void *)g_signal_get_invocation_hint; -extern (C) int function(char *, uint, uint *, uint *, int)g_signal_parse_name; +extern (C) int function(in char *, uint, uint *, uint *, int)g_signal_parse_name; extern (C) uint * function(uint, uint *)g_signal_list_ids; extern (C) void function(uint, _GSignalQuery *)g_signal_query; extern (C) char * function(uint)g_signal_name; -extern (C) uint function(char *, uint)g_signal_lookup; -extern (C) void function(void *, char *, ...)g_signal_emit_by_name; +extern (C) uint function(in char *, uint)g_signal_lookup; +extern (C) void function(void *, in char *, ...)g_signal_emit_by_name; extern (C) void function(void *, uint, uint, ...)g_signal_emit; -extern (C) void function(void *, uint, uint, char *)g_signal_emit_valist; +extern (C) void function(void *, uint, uint, in char *)g_signal_emit_valist; extern (C) void function(_GValue *, uint, uint, _GValue *)g_signal_emitv; -extern (C) uint function(char *, uint, int, uint, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, ...)g_signal_new; -extern (C) uint function(char *, uint, int, _GClosure *, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, char *)g_signal_new_valist; -extern (C) uint function(char *, uint, int, _GClosure *, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, uint *)g_signal_newv; +extern (C) uint function(in char *, uint, int, uint, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, ...)g_signal_new; +extern (C) uint function(in char *, uint, int, _GClosure *, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, char *)g_signal_new_valist; +extern (C) uint function(in char *, uint, int, _GClosure *, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, uint *)g_signal_newv; extern (C) void function(_GClosure *, _GValue *, uint, _GValue *, void *, void *)g_cclosure_marshal_STRING__OBJECT_POINTER; extern (C) void function(_GClosure *, _GValue *, uint, _GValue *, void *, void *)g_cclosure_marshal_BOOLEAN__FLAGS; extern (C) void function(_GClosure *, _GValue *, uint, _GValue *, void *, void *)g_cclosure_marshal_VOID__UINT_POINTER; @@ -1910,7 +1910,7 @@ extern (C) uint function(uint, char *, _GTypeInfo *, _GTypeFundamentalInfo *, int)g_type_register_fundamental; extern (C) uint function(uint, char *, void *, int)g_type_register_dynamic; extern (C) uint function(uint, char *, uint, _BCD_func__2422, uint, _BCD_func__2424, int)g_type_register_static_simple; -extern (C) uint function(uint, char *, _GTypeInfo *, int)g_type_register_static; +extern (C) uint function(uint, in char *, _GTypeInfo *, int)g_type_register_static; extern (C) void function(uint, _GTypeQuery *)g_type_query; extern (C) void * function(uint, uint)g_type_get_qdata; extern (C) void function(uint, uint, void *)g_type_set_qdata; @@ -1930,7 +1930,7 @@ extern (C) uint function(uint, uint)g_type_next_base; extern (C) uint function(uint)g_type_depth; extern (C) uint function(uint)g_type_parent; -extern (C) uint function(char *)g_type_from_name; +extern (C) uint function(in char *)g_type_from_name; extern (C) uint function(uint)g_type_qname; extern (C) char * function(uint)g_type_name; extern (C) void function(int)g_type_init_with_debug_flags; @@ -2959,9 +2959,9 @@ extern (C) char * function(char *)g_intern_static_string; extern (C) char * function(char *)g_intern_string; extern (C) char * function(uint)g_quark_to_string; -extern (C) uint function(char *)g_quark_from_string; -extern (C) uint function(char *)g_quark_from_static_string; -extern (C) uint function(char *)g_quark_try_string; +extern (C) uint function(in char *)g_quark_from_string; +extern (C) uint function(in char *)g_quark_from_static_string; +extern (C) uint function(in char *)g_quark_try_string; extern (C) void function(_GByteArray *, _BCD_func__2968, void *)g_byte_array_sort_with_data; extern (C) void function(_GByteArray *, _BCD_func__2969)g_byte_array_sort; extern (C) _GByteArray * function(_GByteArray *, uint, uint)g_byte_array_remove_range; @@ -4513,8 +4513,8 @@ extern (C) void g_object_watch_closure(_GObject *, _GClosure *); extern (C) void * g_object_steal_data(_GObject *, char *); extern (C) void g_object_set_data_full(_GObject *, char *, void *, _BCD_func__2417); -extern (C) void g_object_set_data(_GObject *, char *, void *); -extern (C) void * g_object_get_data(_GObject *, char *); +extern (C) void g_object_set_data(_GObject *, in char *, void *); +extern (C) void * g_object_get_data(_GObject *, in char *); extern (C) void * g_object_steal_qdata(_GObject *, uint); extern (C) void g_object_set_qdata_full(_GObject *, uint, void *, _BCD_func__2417); extern (C) void g_object_set_qdata(_GObject *, uint, void *); @@ -4538,8 +4538,8 @@ extern (C) void g_object_set_valist(_GObject *, char *, char *); extern (C) void g_object_disconnect(void *, char *, ...); extern (C) void * g_object_connect(void *, char *, ...); -extern (C) void g_object_get(void *, char *, ...); -extern (C) void g_object_set(void *, char *, ...); +extern (C) void g_object_get(void *, in char *, ...); +extern (C) void g_object_set(void *, in char *, ...); extern (C) _GObject * g_object_new_valist(uint, char *, char *); extern (C) void * g_object_newv(uint, uint, _GParameter *); extern (C) void * g_object_new(uint, char *, ...); @@ -4564,26 +4564,26 @@ extern (C) void g_signal_handler_disconnect(void *, uint); extern (C) void g_signal_handler_unblock(void *, uint); extern (C) void g_signal_handler_block(void *, uint); -extern (C) uint g_signal_connect_data(void *, char *, _BCD_func__2331, void *, _BCD_func__2330, int); -extern (C) uint g_signal_connect_closure(void *, char *, _GClosure *, int); +extern (C) uint g_signal_connect_data(void *, in char *, _BCD_func__2331, void *, _BCD_func__2330, int); +extern (C) uint g_signal_connect_closure(void *, in char *, _GClosure *, int); extern (C) uint g_signal_connect_closure_by_id(void *, uint, uint, _GClosure *, int); extern (C) int g_signal_has_handler_pending(void *, uint, uint, int); extern (C) void g_signal_remove_emission_hook(uint, uint); extern (C) uint g_signal_add_emission_hook(uint, uint, _BCD_func__2310, void *, _BCD_func__2417); -extern (C) void g_signal_stop_emission_by_name(void *, char *); +extern (C) void g_signal_stop_emission_by_name(void *, in char *); extern (C) void g_signal_stop_emission(void *, uint, uint); extern (C) _GSignalInvocationHint * g_signal_get_invocation_hint(void *); -extern (C) int g_signal_parse_name(char *, uint, uint *, uint *, int); +extern (C) int g_signal_parse_name(in char *, uint, uint *, uint *, int); extern (C) uint * g_signal_list_ids(uint, uint *); extern (C) void g_signal_query(uint, _GSignalQuery *); extern (C) char * g_signal_name(uint); -extern (C) uint g_signal_lookup(char *, uint); -extern (C) void g_signal_emit_by_name(void *, char *, ...); +extern (C) uint g_signal_lookup(in char *, uint); +extern (C) void g_signal_emit_by_name(void *, in char *, ...); extern (C) void g_signal_emit(void *, uint, uint, ...); extern (C) void g_signal_emit_valist(void *, uint, uint, char *); extern (C) void g_signal_emitv(_GValue *, uint, uint, _GValue *); -extern (C) uint g_signal_new(char *, uint, int, uint, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, ...); -extern (C) uint g_signal_new_valist(char *, uint, int, _GClosure *, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, char *); +extern (C) uint g_signal_new(in char *, uint, int, uint, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, ...); +extern (C) uint g_signal_new_valist(in char *, uint, int, _GClosure *, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, char *); extern (C) uint g_signal_newv(char *, uint, int, _GClosure *, _BCD_func__2309, void *, _BCD_func__2311, uint, uint, uint *); extern (C) void g_cclosure_marshal_STRING__OBJECT_POINTER(_GClosure *, _GValue *, uint, _GValue *, void *, void *); extern (C) void g_cclosure_marshal_BOOLEAN__FLAGS(_GClosure *, _GValue *, uint, _GValue *, void *, void *); @@ -4736,7 +4736,7 @@ extern (C) uint g_type_register_fundamental(uint, char *, _GTypeInfo *, _GTypeFundamentalInfo *, int); extern (C) uint g_type_register_dynamic(uint, char *, void *, int); extern (C) uint g_type_register_static_simple(uint, char *, uint, _BCD_func__2422, uint, _BCD_func__2424, int); -extern (C) uint g_type_register_static(uint, char *, _GTypeInfo *, int); +extern (C) uint g_type_register_static(uint, in char *, _GTypeInfo *, int); extern (C) void g_type_query(uint, _GTypeQuery *); extern (C) void * g_type_get_qdata(uint, uint); extern (C) void g_type_set_qdata(uint, uint, void *); @@ -4756,7 +4756,7 @@ extern (C) uint g_type_next_base(uint, uint); extern (C) uint g_type_depth(uint); extern (C) uint g_type_parent(uint); -extern (C) uint g_type_from_name(char *); +extern (C) uint g_type_from_name(in char *); extern (C) uint g_type_qname(uint); extern (C) char * g_type_name(uint); extern (C) void g_type_init_with_debug_flags(int); @@ -5599,7 +5599,7 @@ extern (C) void * g_try_realloc(void *, uint); extern (C) void * g_try_malloc0(uint); extern (C) void * g_try_malloc(uint); -extern (C) void g_free(void *); +extern (C) void g_free(in void *); extern (C) void * g_realloc(void *, uint); extern (C) void * g_malloc0(uint); extern (C) void * g_malloc(uint); @@ -5785,9 +5785,9 @@ extern (C) char * g_intern_static_string(char *); extern (C) char * g_intern_string(char *); extern (C) char * g_quark_to_string(uint); -extern (C) uint g_quark_from_string(char *); -extern (C) uint g_quark_from_static_string(char *); -extern (C) uint g_quark_try_string(char *); +extern (C) uint g_quark_from_string(in char *); +extern (C) uint g_quark_from_static_string(in char *); +extern (C) uint g_quark_try_string(in char *); extern (C) void g_byte_array_sort_with_data(_GByteArray *, _BCD_func__2968, void *); extern (C) void g_byte_array_sort(_GByteArray *, _BCD_func__2969); extern (C) _GByteArray * g_byte_array_remove_range(_GByteArray *, uint, uint);
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/c/gtk.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/c/gtk.d Fri Mar 27 19:58:06 2009 +0100 @@ -17,7 +17,7 @@ version(DYNLINK){ - extern (C) int gtk_init_check(int *, char * * *); + extern (C) int gtk_init_check(int *, in char * * *); extern (C) char * gtk_set_locale(); extern (C) extern uint gtk_interface_age; extern (C) extern uint gtk_binary_age; @@ -6576,8 +6576,8 @@ alias extern (C) int function(aGtkTextBuffer *, char *, int, int)TGTKgtk_text_buffer_insert_interactive_at_cursor; extern(D) TGTKgtk_text_buffer_insert_interactive_at_cursor gtk_text_buffer_insert_interactive_at_cursor; alias extern (C) int function(aGtkTextBuffer *, aGtkTextIter *, char *, int, int)TGTKgtk_text_buffer_insert_interactive; extern(D) TGTKgtk_text_buffer_insert_interactive gtk_text_buffer_insert_interactive; alias extern (C) void function(aGtkTextBuffer *, char *, int)TGTKgtk_text_buffer_insert_at_cursor; extern(D) TGTKgtk_text_buffer_insert_at_cursor gtk_text_buffer_insert_at_cursor; -alias extern (C) void function(aGtkTextBuffer *, aGtkTextIter *, char *, int)TGTKgtk_text_buffer_insert; extern(D) TGTKgtk_text_buffer_insert gtk_text_buffer_insert; -alias extern (C) void function(aGtkTextBuffer *, char *, int)TGTKgtk_text_buffer_set_text; extern(D) TGTKgtk_text_buffer_set_text gtk_text_buffer_set_text; +alias extern (C) void function(aGtkTextBuffer *, aGtkTextIter *, in char *, int)TGTKgtk_text_buffer_insert; extern(D) TGTKgtk_text_buffer_insert gtk_text_buffer_insert; +alias extern (C) void function(aGtkTextBuffer *, in char *, int)TGTKgtk_text_buffer_set_text; extern(D) TGTKgtk_text_buffer_set_text gtk_text_buffer_set_text; alias extern (C) _GtkTextTagTable * function(aGtkTextBuffer *)TGTKgtk_text_buffer_get_tag_table; extern(D) TGTKgtk_text_buffer_get_tag_table gtk_text_buffer_get_tag_table; alias extern (C) int function(aGtkTextBuffer *)TGTKgtk_text_buffer_get_char_count; extern(D) TGTKgtk_text_buffer_get_char_count gtk_text_buffer_get_char_count; alias extern (C) int function(aGtkTextBuffer *)TGTKgtk_text_buffer_get_line_count; extern(D) TGTKgtk_text_buffer_get_line_count gtk_text_buffer_get_line_count; @@ -6854,8 +6854,8 @@ alias extern (C) _GtkWidget * function(aGtkRadioMenuItem *, char *)TGTKgtk_radio_menu_item_new_with_label_from_widget; extern(D) TGTKgtk_radio_menu_item_new_with_label_from_widget gtk_radio_menu_item_new_with_label_from_widget; alias extern (C) _GtkWidget * function(aGtkRadioMenuItem *, char *)TGTKgtk_radio_menu_item_new_with_mnemonic_from_widget; extern(D) TGTKgtk_radio_menu_item_new_with_mnemonic_from_widget gtk_radio_menu_item_new_with_mnemonic_from_widget; alias extern (C) _GtkWidget * function(aGtkRadioMenuItem *)TGTKgtk_radio_menu_item_new_from_widget; extern(D) TGTKgtk_radio_menu_item_new_from_widget gtk_radio_menu_item_new_from_widget; -alias extern (C) _GtkWidget * function(_GSList *, char *)TGTKgtk_radio_menu_item_new_with_mnemonic; extern(D) TGTKgtk_radio_menu_item_new_with_mnemonic gtk_radio_menu_item_new_with_mnemonic; -alias extern (C) _GtkWidget * function(_GSList *, char *)TGTKgtk_radio_menu_item_new_with_label; extern(D) TGTKgtk_radio_menu_item_new_with_label gtk_radio_menu_item_new_with_label; +alias extern (C) _GtkWidget * function(_GSList *, in char *)TGTKgtk_radio_menu_item_new_with_mnemonic; extern(D) TGTKgtk_radio_menu_item_new_with_mnemonic gtk_radio_menu_item_new_with_mnemonic; +alias extern (C) _GtkWidget * function(_GSList *, in char *)TGTKgtk_radio_menu_item_new_with_label; extern(D) TGTKgtk_radio_menu_item_new_with_label gtk_radio_menu_item_new_with_label; alias extern (C) _GtkWidget * function(_GSList *)TGTKgtk_radio_menu_item_new; extern(D) TGTKgtk_radio_menu_item_new gtk_radio_menu_item_new; alias extern (C) uint function()TGTKgtk_radio_menu_item_get_type; extern(D) TGTKgtk_radio_menu_item_get_type gtk_radio_menu_item_get_type; alias extern (C) void function(aGtkRadioButton *, _GSList *)TGTKgtk_radio_button_set_group; extern(D) TGTKgtk_radio_button_set_group gtk_radio_button_set_group; @@ -7009,8 +7009,8 @@ alias extern (C) int function(void *, char *)TGTKgtk_print_settings_get_bool; extern(D) TGTKgtk_print_settings_get_bool gtk_print_settings_get_bool; alias extern (C) void function(void *, _BCD_func__9823, void *)TGTKgtk_print_settings_foreach; extern(D) TGTKgtk_print_settings_foreach gtk_print_settings_foreach; alias extern (C) void function(void *, char *)TGTKgtk_print_settings_unset; extern(D) TGTKgtk_print_settings_unset gtk_print_settings_unset; -alias extern (C) void function(void *, char *, char *)TGTKgtk_print_settings_set; extern(D) TGTKgtk_print_settings_set gtk_print_settings_set; -alias extern (C) char * function(void *, char *)TGTKgtk_print_settings_get; extern(D) TGTKgtk_print_settings_get gtk_print_settings_get; +alias extern (C) void function(void *, in char *, in char *)TGTKgtk_print_settings_set; extern(D) TGTKgtk_print_settings_set gtk_print_settings_set; +alias extern (C) char * function(void *, in char *)TGTKgtk_print_settings_get; extern(D) TGTKgtk_print_settings_get gtk_print_settings_get; alias extern (C) int function(void *, char *)TGTKgtk_print_settings_has_key; extern(D) TGTKgtk_print_settings_has_key gtk_print_settings_has_key; alias extern (C) void function(void *, void *, char *)TGTKgtk_print_settings_to_key_file; extern(D) TGTKgtk_print_settings_to_key_file gtk_print_settings_to_key_file; alias extern (C) void * function(void *, char *, _GError * *)TGTKgtk_print_settings_new_from_key_file; extern(D) TGTKgtk_print_settings_new_from_key_file gtk_print_settings_new_from_key_file; @@ -7061,9 +7061,9 @@ alias extern (C) int function(void *, void *)TGTKgtk_paper_size_is_equal; extern(D) TGTKgtk_paper_size_is_equal gtk_paper_size_is_equal; alias extern (C) void function(void *)TGTKgtk_paper_size_free; extern(D) TGTKgtk_paper_size_free gtk_paper_size_free; alias extern (C) void * function(void *)TGTKgtk_paper_size_copy; extern(D) TGTKgtk_paper_size_copy gtk_paper_size_copy; -alias extern (C) void * function(char *, char *, double, double, int)TGTKgtk_paper_size_new_custom; extern(D) TGTKgtk_paper_size_new_custom gtk_paper_size_new_custom; -alias extern (C) void * function(char *, char *, double, double)TGTKgtk_paper_size_new_from_ppd; extern(D) TGTKgtk_paper_size_new_from_ppd gtk_paper_size_new_from_ppd; -alias extern (C) void * function(char *)TGTKgtk_paper_size_new; extern(D) TGTKgtk_paper_size_new gtk_paper_size_new; +alias extern (C) void * function(in char *, in char *, double, double, int)TGTKgtk_paper_size_new_custom; extern(D) TGTKgtk_paper_size_new_custom gtk_paper_size_new_custom; +alias extern (C) void * function(in char *, in char *, double, double)TGTKgtk_paper_size_new_from_ppd; extern(D) TGTKgtk_paper_size_new_from_ppd gtk_paper_size_new_from_ppd; +alias extern (C) void * function(in char *)TGTKgtk_paper_size_new; extern(D) TGTKgtk_paper_size_new gtk_paper_size_new; alias extern (C) uint function()TGTKgtk_paper_size_get_type; extern(D) TGTKgtk_paper_size_get_type gtk_paper_size_get_type; alias extern (C) void function()TGTKgtk_preview_reset; extern(D) TGTKgtk_preview_reset gtk_preview_reset; alias extern (C) _GtkPreviewInfo * function()TGTKgtk_preview_get_info; extern(D) TGTKgtk_preview_get_info gtk_preview_get_info; @@ -7322,8 +7322,8 @@ alias extern (C) _BCD_func__10158 function(_BCD_func__10158, void *, _BCD_func__13158)TGTKgtk_link_button_set_uri_hook; extern(D) TGTKgtk_link_button_set_uri_hook gtk_link_button_set_uri_hook; alias extern (C) void function(aGtkLinkButton *, char *)TGTKgtk_link_button_set_uri; extern(D) TGTKgtk_link_button_set_uri gtk_link_button_set_uri; alias extern (C) char * function(aGtkLinkButton *)TGTKgtk_link_button_get_uri; extern(D) TGTKgtk_link_button_get_uri gtk_link_button_get_uri; -alias extern (C) _GtkWidget * function(char *, char *)TGTKgtk_link_button_new_with_label; extern(D) TGTKgtk_link_button_new_with_label gtk_link_button_new_with_label; -alias extern (C) _GtkWidget * function(char *)TGTKgtk_link_button_new; extern(D) TGTKgtk_link_button_new gtk_link_button_new; +alias extern (C) _GtkWidget * function(in char *, in char *)TGTKgtk_link_button_new_with_label; extern(D) TGTKgtk_link_button_new_with_label gtk_link_button_new_with_label; +alias extern (C) _GtkWidget * function(in char *)TGTKgtk_link_button_new; extern(D) TGTKgtk_link_button_new gtk_link_button_new; alias extern (C) uint function()TGTKgtk_link_button_get_type; extern(D) TGTKgtk_link_button_get_type gtk_link_button_get_type; alias extern (C) void function(aGtkLayout *)TGTKgtk_layout_thaw; extern(D) TGTKgtk_layout_thaw gtk_layout_thaw; alias extern (C) void function(aGtkLayout *)TGTKgtk_layout_freeze; extern(D) TGTKgtk_layout_freeze gtk_layout_freeze; @@ -7352,9 +7352,9 @@ alias extern (C) uint function()TGTKgtk_im_context_simple_get_type; extern(D) TGTKgtk_im_context_simple_get_type gtk_im_context_simple_get_type; alias extern (C) _GtkWidget * function(aGtkImageMenuItem *)TGTKgtk_image_menu_item_get_image; extern(D) TGTKgtk_image_menu_item_get_image gtk_image_menu_item_get_image; alias extern (C) void function(aGtkImageMenuItem *, aGtkWidget *)TGTKgtk_image_menu_item_set_image; extern(D) TGTKgtk_image_menu_item_set_image gtk_image_menu_item_set_image; -alias extern (C) _GtkWidget * function(char *, aGtkAccelGroup *)TGTKgtk_image_menu_item_new_from_stock; extern(D) TGTKgtk_image_menu_item_new_from_stock gtk_image_menu_item_new_from_stock; -alias extern (C) _GtkWidget * function(char *)TGTKgtk_image_menu_item_new_with_mnemonic; extern(D) TGTKgtk_image_menu_item_new_with_mnemonic gtk_image_menu_item_new_with_mnemonic; -alias extern (C) _GtkWidget * function(char *)TGTKgtk_image_menu_item_new_with_label; extern(D) TGTKgtk_image_menu_item_new_with_label gtk_image_menu_item_new_with_label; +alias extern (C) _GtkWidget * function(in char *, aGtkAccelGroup *)TGTKgtk_image_menu_item_new_from_stock; extern(D) TGTKgtk_image_menu_item_new_from_stock gtk_image_menu_item_new_from_stock; +alias extern (C) _GtkWidget * function(in char *)TGTKgtk_image_menu_item_new_with_mnemonic; extern(D) TGTKgtk_image_menu_item_new_with_mnemonic gtk_image_menu_item_new_with_mnemonic; +alias extern (C) _GtkWidget * function(in char *)TGTKgtk_image_menu_item_new_with_label; extern(D) TGTKgtk_image_menu_item_new_with_label gtk_image_menu_item_new_with_label; alias extern (C) _GtkWidget * function()TGTKgtk_image_menu_item_new; extern(D) TGTKgtk_image_menu_item_new gtk_image_menu_item_new; alias extern (C) uint function()TGTKgtk_image_menu_item_get_type; extern(D) TGTKgtk_image_menu_item_get_type gtk_image_menu_item_get_type; alias extern (C) int function(aGtkIconView *)TGTKgtk_icon_view_get_tooltip_column; extern(D) TGTKgtk_icon_view_get_tooltip_column gtk_icon_view_get_tooltip_column; @@ -7422,10 +7422,10 @@ alias extern (C) void function(_GdkDisplay *)TGTKgtk_tooltip_trigger_tooltip_query; extern(D) TGTKgtk_tooltip_trigger_tooltip_query gtk_tooltip_trigger_tooltip_query; alias extern (C) void function(void *, _GdkRectangle *)TGTKgtk_tooltip_set_tip_area; extern(D) TGTKgtk_tooltip_set_tip_area gtk_tooltip_set_tip_area; alias extern (C) void function(void *, aGtkWidget *)TGTKgtk_tooltip_set_custom; extern(D) TGTKgtk_tooltip_set_custom gtk_tooltip_set_custom; -alias extern (C) void function(void *, char *, int)TGTKgtk_tooltip_set_icon_from_stock; extern(D) TGTKgtk_tooltip_set_icon_from_stock gtk_tooltip_set_icon_from_stock; +alias extern (C) void function(void *, in char *, int)TGTKgtk_tooltip_set_icon_from_stock; extern(D) TGTKgtk_tooltip_set_icon_from_stock gtk_tooltip_set_icon_from_stock; alias extern (C) void function(void *, void *)TGTKgtk_tooltip_set_icon; extern(D) TGTKgtk_tooltip_set_icon gtk_tooltip_set_icon; -alias extern (C) void function(void *, char *)TGTKgtk_tooltip_set_text; extern(D) TGTKgtk_tooltip_set_text gtk_tooltip_set_text; -alias extern (C) void function(void *, char *)TGTKgtk_tooltip_set_markup; extern(D) TGTKgtk_tooltip_set_markup gtk_tooltip_set_markup; +alias extern (C) void function(void *, in char *)TGTKgtk_tooltip_set_text; extern(D) TGTKgtk_tooltip_set_text gtk_tooltip_set_text; +alias extern (C) void function(void *, in char *)TGTKgtk_tooltip_set_markup; extern(D) TGTKgtk_tooltip_set_markup gtk_tooltip_set_markup; alias extern (C) uint function()TGTKgtk_tooltip_get_type; extern(D) TGTKgtk_tooltip_get_type gtk_tooltip_get_type; //alias extern (C) void function()TGTK_gtk_icon_theme_ensure_builtin_cache; extern(D) TGTK_gtk_icon_theme_ensure_builtin_cache _gtk_icon_theme_ensure_builtin_cache; //alias extern (C) void function(_GdkDisplay *)TGTK_gtk_icon_theme_check_reload; extern(D) TGTK_gtk_icon_theme_check_reload _gtk_icon_theme_check_reload; @@ -7501,10 +7501,10 @@ alias extern (C) int function(char *, int, int)TGTKgtk_icon_size_register; extern(D) TGTKgtk_icon_size_register gtk_icon_size_register; alias extern (C) int function(aGtkSettings *, int, int *, int *)TGTKgtk_icon_size_lookup_for_settings; extern(D) TGTKgtk_icon_size_lookup_for_settings gtk_icon_size_lookup_for_settings; alias extern (C) int function(int, int *, int *)TGTKgtk_icon_size_lookup; extern(D) TGTKgtk_icon_size_lookup gtk_icon_size_lookup; -alias extern (C) void * function(char *)TGTKgtk_icon_factory_lookup_default; extern(D) TGTKgtk_icon_factory_lookup_default gtk_icon_factory_lookup_default; +alias extern (C) void * function(in char *)TGTKgtk_icon_factory_lookup_default; extern(D) TGTKgtk_icon_factory_lookup_default gtk_icon_factory_lookup_default; alias extern (C) void function(aGtkIconFactory *)TGTKgtk_icon_factory_remove_default; extern(D) TGTKgtk_icon_factory_remove_default gtk_icon_factory_remove_default; alias extern (C) void function(aGtkIconFactory *)TGTKgtk_icon_factory_add_default; extern(D) TGTKgtk_icon_factory_add_default gtk_icon_factory_add_default; -alias extern (C) void * function(aGtkIconFactory *, char *)TGTKgtk_icon_factory_lookup; extern(D) TGTKgtk_icon_factory_lookup gtk_icon_factory_lookup; +alias extern (C) void * function(aGtkIconFactory *, in char *)TGTKgtk_icon_factory_lookup; extern(D) TGTKgtk_icon_factory_lookup gtk_icon_factory_lookup; alias extern (C) void function(aGtkIconFactory *, char *, void *)TGTKgtk_icon_factory_add; extern(D) TGTKgtk_icon_factory_add gtk_icon_factory_add; alias extern (C) _GtkIconFactory * function()TGTKgtk_icon_factory_new; extern(D) TGTKgtk_icon_factory_new gtk_icon_factory_new; alias extern (C) uint function()TGTKgtk_icon_factory_get_type; extern(D) TGTKgtk_icon_factory_get_type gtk_icon_factory_get_type; @@ -7598,7 +7598,7 @@ alias extern (C) _GtkWidget * function(int)TGTKgtk_file_chooser_widget_new; extern(D) TGTKgtk_file_chooser_widget_new gtk_file_chooser_widget_new; alias extern (C) uint function()TGTKgtk_file_chooser_widget_get_type; extern(D) TGTKgtk_file_chooser_widget_get_type gtk_file_chooser_widget_get_type; alias extern (C) _GtkWidget * function(char *, aGtkWindow *, int, char *, char *, ...)TGTKgtk_file_chooser_dialog_new_with_backend; extern(D) TGTKgtk_file_chooser_dialog_new_with_backend gtk_file_chooser_dialog_new_with_backend; -alias extern (C) _GtkWidget * function(char *, aGtkWindow *, int, char *, ...)TGTKgtk_file_chooser_dialog_new; extern(D) TGTKgtk_file_chooser_dialog_new gtk_file_chooser_dialog_new; +alias extern (C) _GtkWidget * function(in char *, aGtkWindow *, int, in char *, ...)TGTKgtk_file_chooser_dialog_new; extern(D) TGTKgtk_file_chooser_dialog_new gtk_file_chooser_dialog_new; alias extern (C) uint function()TGTKgtk_file_chooser_dialog_get_type; extern(D) TGTKgtk_file_chooser_dialog_get_type gtk_file_chooser_dialog_get_type; alias extern (C) void function(aGtkFileChooserButton *, int)TGTKgtk_file_chooser_button_set_focus_on_click; extern(D) TGTKgtk_file_chooser_button_set_focus_on_click gtk_file_chooser_button_set_focus_on_click; alias extern (C) int function(aGtkFileChooserButton *)TGTKgtk_file_chooser_button_get_focus_on_click; extern(D) TGTKgtk_file_chooser_button_get_focus_on_click gtk_file_chooser_button_get_focus_on_click; @@ -7942,7 +7942,7 @@ alias extern (C) void function(aGtkEntry *, int *, int *)TGTKgtk_entry_get_layout_offsets; extern(D) TGTKgtk_entry_get_layout_offsets gtk_entry_get_layout_offsets; alias extern (C) void * function(aGtkEntry *)TGTKgtk_entry_get_layout; extern(D) TGTKgtk_entry_get_layout gtk_entry_get_layout; alias extern (C) char * function(aGtkEntry *)TGTKgtk_entry_get_text; extern(D) TGTKgtk_entry_get_text gtk_entry_get_text; -alias extern (C) void function(aGtkEntry *, char *)TGTKgtk_entry_set_text; extern(D) TGTKgtk_entry_set_text gtk_entry_set_text; +alias extern (C) void function(aGtkEntry *, in char *)TGTKgtk_entry_set_text; extern(D) TGTKgtk_entry_set_text gtk_entry_set_text; alias extern (C) int function(aGtkEntry *)TGTKgtk_entry_get_width_chars; extern(D) TGTKgtk_entry_get_width_chars gtk_entry_get_width_chars; alias extern (C) void function(aGtkEntry *, int)TGTKgtk_entry_set_width_chars; extern(D) TGTKgtk_entry_set_width_chars gtk_entry_set_width_chars; alias extern (C) int function(aGtkEntry *)TGTKgtk_entry_get_activates_default; extern(D) TGTKgtk_entry_get_activates_default gtk_entry_get_activates_default; @@ -8041,7 +8041,7 @@ alias extern (C) void function(void *)TGTKgtk_editable_cut_clipboard; extern(D) TGTKgtk_editable_cut_clipboard gtk_editable_cut_clipboard; alias extern (C) char * function(void *, int, int)TGTKgtk_editable_get_chars; extern(D) TGTKgtk_editable_get_chars gtk_editable_get_chars; alias extern (C) void function(void *, int, int)TGTKgtk_editable_delete_text; extern(D) TGTKgtk_editable_delete_text gtk_editable_delete_text; -alias extern (C) void function(void *, char *, int, int *)TGTKgtk_editable_insert_text; extern(D) TGTKgtk_editable_insert_text gtk_editable_insert_text; +alias extern (C) void function(void *, in char *, int, int *)TGTKgtk_editable_insert_text; extern(D) TGTKgtk_editable_insert_text gtk_editable_insert_text; alias extern (C) int function(void *, int *, int *)TGTKgtk_editable_get_selection_bounds; extern(D) TGTKgtk_editable_get_selection_bounds gtk_editable_get_selection_bounds; alias extern (C) void function(void *, int, int)TGTKgtk_editable_select_region; extern(D) TGTKgtk_editable_select_region gtk_editable_select_region; alias extern (C) uint function()TGTKgtk_editable_get_type; extern(D) TGTKgtk_editable_get_type gtk_editable_get_type; @@ -8421,7 +8421,7 @@ alias extern (C) int function(aGtkCheckMenuItem *)TGTKgtk_check_menu_item_get_active; extern(D) TGTKgtk_check_menu_item_get_active gtk_check_menu_item_get_active; alias extern (C) void function(aGtkCheckMenuItem *, int)TGTKgtk_check_menu_item_set_active; extern(D) TGTKgtk_check_menu_item_set_active gtk_check_menu_item_set_active; alias extern (C) _GtkWidget * function(char *)TGTKgtk_check_menu_item_new_with_mnemonic; extern(D) TGTKgtk_check_menu_item_new_with_mnemonic gtk_check_menu_item_new_with_mnemonic; -alias extern (C) _GtkWidget * function(char *)TGTKgtk_check_menu_item_new_with_label; extern(D) TGTKgtk_check_menu_item_new_with_label gtk_check_menu_item_new_with_label; +alias extern (C) _GtkWidget * function(in char *)TGTKgtk_check_menu_item_new_with_label; extern(D) TGTKgtk_check_menu_item_new_with_label gtk_check_menu_item_new_with_label; alias extern (C) _GtkWidget * function()TGTKgtk_check_menu_item_new; extern(D) TGTKgtk_check_menu_item_new gtk_check_menu_item_new; alias extern (C) uint function()TGTKgtk_check_menu_item_get_type; extern(D) TGTKgtk_check_menu_item_get_type gtk_check_menu_item_get_type; alias extern (C) void function(aGtkMenuItem *)TGTKgtk_menu_item_remove_submenu; extern(D) TGTKgtk_menu_item_remove_submenu gtk_menu_item_remove_submenu; @@ -8550,7 +8550,7 @@ alias extern (C) void function(aGtkTreeViewColumn *, aGtkCellRenderer *)TGTKgtk_tree_view_column_clear_attributes; extern(D) TGTKgtk_tree_view_column_clear_attributes gtk_tree_view_column_clear_attributes; alias extern (C) void function(aGtkTreeViewColumn *, aGtkCellRenderer *, _BCD_func__11636, void *, _BCD_func__13158)TGTKgtk_tree_view_column_set_cell_data_func; extern(D) TGTKgtk_tree_view_column_set_cell_data_func gtk_tree_view_column_set_cell_data_func; alias extern (C) void function(aGtkTreeViewColumn *, aGtkCellRenderer *, ...)TGTKgtk_tree_view_column_set_attributes; extern(D) TGTKgtk_tree_view_column_set_attributes gtk_tree_view_column_set_attributes; -alias extern (C) void function(aGtkTreeViewColumn *, aGtkCellRenderer *, char *, int)TGTKgtk_tree_view_column_add_attribute; extern(D) TGTKgtk_tree_view_column_add_attribute gtk_tree_view_column_add_attribute; +alias extern (C) void function(aGtkTreeViewColumn *, aGtkCellRenderer *, in char *, int)TGTKgtk_tree_view_column_add_attribute; extern(D) TGTKgtk_tree_view_column_add_attribute gtk_tree_view_column_add_attribute; alias extern (C) _GList * function(aGtkTreeViewColumn *)TGTKgtk_tree_view_column_get_cell_renderers; extern(D) TGTKgtk_tree_view_column_get_cell_renderers gtk_tree_view_column_get_cell_renderers; alias extern (C) void function(aGtkTreeViewColumn *)TGTKgtk_tree_view_column_clear; extern(D) TGTKgtk_tree_view_column_clear gtk_tree_view_column_clear; alias extern (C) void function(aGtkTreeViewColumn *, aGtkCellRenderer *, int)TGTKgtk_tree_view_column_pack_end; extern(D) TGTKgtk_tree_view_column_pack_end gtk_tree_view_column_pack_end; @@ -8978,7 +8978,7 @@ alias extern (C) void function(aGtkLabel *, int)TGTKgtk_label_set_line_wrap_mode; extern(D) TGTKgtk_label_set_line_wrap_mode gtk_label_set_line_wrap_mode; alias extern (C) int function(aGtkLabel *)TGTKgtk_label_get_line_wrap; extern(D) TGTKgtk_label_get_line_wrap gtk_label_get_line_wrap; alias extern (C) void function(aGtkLabel *, int)TGTKgtk_label_set_line_wrap; extern(D) TGTKgtk_label_set_line_wrap gtk_label_set_line_wrap; -alias extern (C) void function(aGtkLabel *, char *)TGTKgtk_label_set_pattern; extern(D) TGTKgtk_label_set_pattern gtk_label_set_pattern; +alias extern (C) void function(aGtkLabel *, in char *)TGTKgtk_label_set_pattern; extern(D) TGTKgtk_label_set_pattern gtk_label_set_pattern; alias extern (C) int function(aGtkLabel *)TGTKgtk_label_get_max_width_chars; extern(D) TGTKgtk_label_get_max_width_chars gtk_label_get_max_width_chars; alias extern (C) void function(aGtkLabel *, int)TGTKgtk_label_set_max_width_chars; extern(D) TGTKgtk_label_set_max_width_chars gtk_label_set_max_width_chars; alias extern (C) int function(aGtkLabel *)TGTKgtk_label_get_width_chars; extern(D) TGTKgtk_label_get_width_chars gtk_label_get_width_chars; @@ -8987,24 +8987,24 @@ alias extern (C) void function(aGtkLabel *, int)TGTKgtk_label_set_ellipsize; extern(D) TGTKgtk_label_set_ellipsize gtk_label_set_ellipsize; alias extern (C) int function(aGtkLabel *)TGTKgtk_label_get_justify; extern(D) TGTKgtk_label_get_justify gtk_label_get_justify; alias extern (C) void function(aGtkLabel *, int)TGTKgtk_label_set_justify; extern(D) TGTKgtk_label_set_justify gtk_label_set_justify; -alias extern (C) void function(aGtkLabel *, char *)TGTKgtk_label_set_text_with_mnemonic; extern(D) TGTKgtk_label_set_text_with_mnemonic gtk_label_set_text_with_mnemonic; +alias extern (C) void function(aGtkLabel *, in char *)TGTKgtk_label_set_text_with_mnemonic; extern(D) TGTKgtk_label_set_text_with_mnemonic gtk_label_set_text_with_mnemonic; alias extern (C) _GtkWidget * function(aGtkLabel *)TGTKgtk_label_get_mnemonic_widget; extern(D) TGTKgtk_label_get_mnemonic_widget gtk_label_get_mnemonic_widget; alias extern (C) void function(aGtkLabel *, aGtkWidget *)TGTKgtk_label_set_mnemonic_widget; extern(D) TGTKgtk_label_set_mnemonic_widget gtk_label_set_mnemonic_widget; alias extern (C) uint function(aGtkLabel *)TGTKgtk_label_get_mnemonic_keyval; extern(D) TGTKgtk_label_get_mnemonic_keyval gtk_label_get_mnemonic_keyval; -alias extern (C) void function(aGtkLabel *, char *)TGTKgtk_label_set_markup_with_mnemonic; extern(D) TGTKgtk_label_set_markup_with_mnemonic gtk_label_set_markup_with_mnemonic; +alias extern (C) void function(aGtkLabel *, in char *)TGTKgtk_label_set_markup_with_mnemonic; extern(D) TGTKgtk_label_set_markup_with_mnemonic gtk_label_set_markup_with_mnemonic; alias extern (C) int function(aGtkLabel *)TGTKgtk_label_get_use_underline; extern(D) TGTKgtk_label_get_use_underline gtk_label_get_use_underline; alias extern (C) void function(aGtkLabel *, int)TGTKgtk_label_set_use_underline; extern(D) TGTKgtk_label_set_use_underline gtk_label_set_use_underline; alias extern (C) int function(aGtkLabel *)TGTKgtk_label_get_use_markup; extern(D) TGTKgtk_label_get_use_markup gtk_label_get_use_markup; alias extern (C) void function(aGtkLabel *, int)TGTKgtk_label_set_use_markup; extern(D) TGTKgtk_label_set_use_markup gtk_label_set_use_markup; -alias extern (C) void function(aGtkLabel *, char *)TGTKgtk_label_set_markup; extern(D) TGTKgtk_label_set_markup gtk_label_set_markup; +alias extern (C) void function(aGtkLabel *, in char *)TGTKgtk_label_set_markup; extern(D) TGTKgtk_label_set_markup gtk_label_set_markup; alias extern (C) char * function(aGtkLabel *)TGTKgtk_label_get_label; extern(D) TGTKgtk_label_get_label gtk_label_get_label; -alias extern (C) void function(aGtkLabel *, char *)TGTKgtk_label_set_label; extern(D) TGTKgtk_label_set_label gtk_label_set_label; +alias extern (C) void function(aGtkLabel *, in char *)TGTKgtk_label_set_label; extern(D) TGTKgtk_label_set_label gtk_label_set_label; alias extern (C) void * function(aGtkLabel *)TGTKgtk_label_get_attributes; extern(D) TGTKgtk_label_get_attributes gtk_label_get_attributes; alias extern (C) void function(aGtkLabel *, void *)TGTKgtk_label_set_attributes; extern(D) TGTKgtk_label_set_attributes gtk_label_set_attributes; alias extern (C) char * function(aGtkLabel *)TGTKgtk_label_get_text; extern(D) TGTKgtk_label_get_text gtk_label_get_text; -alias extern (C) void function(aGtkLabel *, char *)TGTKgtk_label_set_text; extern(D) TGTKgtk_label_set_text gtk_label_set_text; -alias extern (C) _GtkWidget * function(char *)TGTKgtk_label_new_with_mnemonic; extern(D) TGTKgtk_label_new_with_mnemonic gtk_label_new_with_mnemonic; -alias extern (C) _GtkWidget * function(char *)TGTKgtk_label_new; extern(D) TGTKgtk_label_new gtk_label_new; +alias extern (C) void function(aGtkLabel *, in char *)TGTKgtk_label_set_text; extern(D) TGTKgtk_label_set_text gtk_label_set_text; +alias extern (C) _GtkWidget * function(in char *)TGTKgtk_label_new_with_mnemonic; extern(D) TGTKgtk_label_new_with_mnemonic gtk_label_new_with_mnemonic; +alias extern (C) _GtkWidget * function(in char *)TGTKgtk_label_new; extern(D) TGTKgtk_label_new gtk_label_new; alias extern (C) uint function()TGTKgtk_label_get_type; extern(D) TGTKgtk_label_get_type gtk_label_get_type; alias extern (C) _GList * function(aGtkWidget *)TGTKgtk_menu_get_for_attach_widget; extern(D) TGTKgtk_menu_get_for_attach_widget gtk_menu_get_for_attach_widget; alias extern (C) void function(aGtkMenu *, int)TGTKgtk_menu_set_monitor; extern(D) TGTKgtk_menu_set_monitor gtk_menu_set_monitor; @@ -9012,13 +9012,13 @@ alias extern (C) void function(aGtkMenu *, _GdkScreen *)TGTKgtk_menu_set_screen; extern(D) TGTKgtk_menu_set_screen gtk_menu_set_screen; alias extern (C) void function(aGtkMenu *, aGtkWidget *, int)TGTKgtk_menu_reorder_child; extern(D) TGTKgtk_menu_reorder_child gtk_menu_reorder_child; alias extern (C) char * function(aGtkMenu *)TGTKgtk_menu_get_title; extern(D) TGTKgtk_menu_get_title gtk_menu_get_title; -alias extern (C) void function(aGtkMenu *, char *)TGTKgtk_menu_set_title; extern(D) TGTKgtk_menu_set_title gtk_menu_set_title; +alias extern (C) void function(aGtkMenu *, in char *)TGTKgtk_menu_set_title; extern(D) TGTKgtk_menu_set_title gtk_menu_set_title; alias extern (C) int function(aGtkMenu *)TGTKgtk_menu_get_tearoff_state; extern(D) TGTKgtk_menu_get_tearoff_state gtk_menu_get_tearoff_state; alias extern (C) void function(aGtkMenu *, int)TGTKgtk_menu_set_tearoff_state; extern(D) TGTKgtk_menu_set_tearoff_state gtk_menu_set_tearoff_state; alias extern (C) _GtkWidget * function(aGtkMenu *)TGTKgtk_menu_get_attach_widget; extern(D) TGTKgtk_menu_get_attach_widget gtk_menu_get_attach_widget; alias extern (C) void function(aGtkMenu *)TGTKgtk_menu_detach; extern(D) TGTKgtk_menu_detach gtk_menu_detach; alias extern (C) void function(aGtkMenu *, aGtkWidget *, _BCD_func__12552)TGTKgtk_menu_attach_to_widget; extern(D) TGTKgtk_menu_attach_to_widget gtk_menu_attach_to_widget; -alias extern (C) void function(aGtkMenu *, char *)TGTKgtk_menu_set_accel_path; extern(D) TGTKgtk_menu_set_accel_path gtk_menu_set_accel_path; +alias extern (C) void function(aGtkMenu *, in char *)TGTKgtk_menu_set_accel_path; extern(D) TGTKgtk_menu_set_accel_path gtk_menu_set_accel_path; alias extern (C) _GtkAccelGroup * function(aGtkMenu *)TGTKgtk_menu_get_accel_group; extern(D) TGTKgtk_menu_get_accel_group gtk_menu_get_accel_group; alias extern (C) void function(aGtkMenu *, aGtkAccelGroup *)TGTKgtk_menu_set_accel_group; extern(D) TGTKgtk_menu_set_accel_group gtk_menu_set_accel_group; alias extern (C) void function(aGtkMenu *, uint)TGTKgtk_menu_set_active; extern(D) TGTKgtk_menu_set_active gtk_menu_set_active; @@ -9052,37 +9052,37 @@ alias extern (C) uint function()TGTKgtk_misc_get_type; extern(D) TGTKgtk_misc_get_type gtk_misc_get_type; alias extern (C) _BCD_func__12632 function(_BCD_func__12632, void *, _BCD_func__13158)TGTKgtk_about_dialog_set_url_hook; extern(D) TGTKgtk_about_dialog_set_url_hook gtk_about_dialog_set_url_hook; alias extern (C) _BCD_func__12632 function(_BCD_func__12632, void *, _BCD_func__13158)TGTKgtk_about_dialog_set_email_hook; extern(D) TGTKgtk_about_dialog_set_email_hook gtk_about_dialog_set_email_hook; -alias extern (C) void function(aGtkAboutDialog *, char *)TGTKgtk_about_dialog_set_logo_icon_name; extern(D) TGTKgtk_about_dialog_set_logo_icon_name gtk_about_dialog_set_logo_icon_name; +alias extern (C) void function(aGtkAboutDialog *, in char *)TGTKgtk_about_dialog_set_logo_icon_name; extern(D) TGTKgtk_about_dialog_set_logo_icon_name gtk_about_dialog_set_logo_icon_name; alias extern (C) char * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_logo_icon_name; extern(D) TGTKgtk_about_dialog_get_logo_icon_name gtk_about_dialog_get_logo_icon_name; alias extern (C) void function(aGtkAboutDialog *, void *)TGTKgtk_about_dialog_set_logo; extern(D) TGTKgtk_about_dialog_set_logo gtk_about_dialog_set_logo; alias extern (C) void * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_logo; extern(D) TGTKgtk_about_dialog_get_logo gtk_about_dialog_get_logo; -alias extern (C) void function(aGtkAboutDialog *, char *)TGTKgtk_about_dialog_set_translator_credits; extern(D) TGTKgtk_about_dialog_set_translator_credits gtk_about_dialog_set_translator_credits; +alias extern (C) void function(aGtkAboutDialog *, in char *)TGTKgtk_about_dialog_set_translator_credits; extern(D) TGTKgtk_about_dialog_set_translator_credits gtk_about_dialog_set_translator_credits; alias extern (C) char * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_translator_credits; extern(D) TGTKgtk_about_dialog_get_translator_credits gtk_about_dialog_get_translator_credits; -alias extern (C) void function(aGtkAboutDialog *, char * *)TGTKgtk_about_dialog_set_artists; extern(D) TGTKgtk_about_dialog_set_artists gtk_about_dialog_set_artists; +alias extern (C) void function(aGtkAboutDialog *, in char * *)TGTKgtk_about_dialog_set_artists; extern(D) TGTKgtk_about_dialog_set_artists gtk_about_dialog_set_artists; alias extern (C) char * * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_artists; extern(D) TGTKgtk_about_dialog_get_artists gtk_about_dialog_get_artists; -alias extern (C) void function(aGtkAboutDialog *, char * *)TGTKgtk_about_dialog_set_documenters; extern(D) TGTKgtk_about_dialog_set_documenters gtk_about_dialog_set_documenters; +alias extern (C) void function(aGtkAboutDialog *, in char * *)TGTKgtk_about_dialog_set_documenters; extern(D) TGTKgtk_about_dialog_set_documenters gtk_about_dialog_set_documenters; alias extern (C) char * * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_documenters; extern(D) TGTKgtk_about_dialog_get_documenters gtk_about_dialog_get_documenters; -alias extern (C) void function(aGtkAboutDialog *, char * *)TGTKgtk_about_dialog_set_authors; extern(D) TGTKgtk_about_dialog_set_authors gtk_about_dialog_set_authors; +alias extern (C) void function(aGtkAboutDialog *, in char * *)TGTKgtk_about_dialog_set_authors; extern(D) TGTKgtk_about_dialog_set_authors gtk_about_dialog_set_authors; alias extern (C) char * * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_authors; extern(D) TGTKgtk_about_dialog_get_authors gtk_about_dialog_get_authors; -alias extern (C) void function(aGtkAboutDialog *, char *)TGTKgtk_about_dialog_set_website_label; extern(D) TGTKgtk_about_dialog_set_website_label gtk_about_dialog_set_website_label; +alias extern (C) void function(aGtkAboutDialog *, in char *)TGTKgtk_about_dialog_set_website_label; extern(D) TGTKgtk_about_dialog_set_website_label gtk_about_dialog_set_website_label; alias extern (C) char * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_website_label; extern(D) TGTKgtk_about_dialog_get_website_label gtk_about_dialog_get_website_label; -alias extern (C) void function(aGtkAboutDialog *, char *)TGTKgtk_about_dialog_set_website; extern(D) TGTKgtk_about_dialog_set_website gtk_about_dialog_set_website; +alias extern (C) void function(aGtkAboutDialog *, in char *)TGTKgtk_about_dialog_set_website; extern(D) TGTKgtk_about_dialog_set_website gtk_about_dialog_set_website; alias extern (C) char * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_website; extern(D) TGTKgtk_about_dialog_get_website gtk_about_dialog_get_website; alias extern (C) void function(aGtkAboutDialog *, int)TGTKgtk_about_dialog_set_wrap_license; extern(D) TGTKgtk_about_dialog_set_wrap_license gtk_about_dialog_set_wrap_license; alias extern (C) int function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_wrap_license; extern(D) TGTKgtk_about_dialog_get_wrap_license gtk_about_dialog_get_wrap_license; -alias extern (C) void function(aGtkAboutDialog *, char *)TGTKgtk_about_dialog_set_license; extern(D) TGTKgtk_about_dialog_set_license gtk_about_dialog_set_license; +alias extern (C) void function(aGtkAboutDialog *, in char *)TGTKgtk_about_dialog_set_license; extern(D) TGTKgtk_about_dialog_set_license gtk_about_dialog_set_license; alias extern (C) char * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_license; extern(D) TGTKgtk_about_dialog_get_license gtk_about_dialog_get_license; -alias extern (C) void function(aGtkAboutDialog *, char *)TGTKgtk_about_dialog_set_comments; extern(D) TGTKgtk_about_dialog_set_comments gtk_about_dialog_set_comments; +alias extern (C) void function(aGtkAboutDialog *, in char *)TGTKgtk_about_dialog_set_comments; extern(D) TGTKgtk_about_dialog_set_comments gtk_about_dialog_set_comments; alias extern (C) char * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_comments; extern(D) TGTKgtk_about_dialog_get_comments gtk_about_dialog_get_comments; -alias extern (C) void function(aGtkAboutDialog *, char *)TGTKgtk_about_dialog_set_copyright; extern(D) TGTKgtk_about_dialog_set_copyright gtk_about_dialog_set_copyright; +alias extern (C) void function(aGtkAboutDialog *, in char *)TGTKgtk_about_dialog_set_copyright; extern(D) TGTKgtk_about_dialog_set_copyright gtk_about_dialog_set_copyright; alias extern (C) char * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_copyright; extern(D) TGTKgtk_about_dialog_get_copyright gtk_about_dialog_get_copyright; -alias extern (C) void function(aGtkAboutDialog *, char *)TGTKgtk_about_dialog_set_version; extern(D) TGTKgtk_about_dialog_set_version gtk_about_dialog_set_version; +alias extern (C) void function(aGtkAboutDialog *, in char *)TGTKgtk_about_dialog_set_version; extern(D) TGTKgtk_about_dialog_set_version gtk_about_dialog_set_version; alias extern (C) char * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_version; extern(D) TGTKgtk_about_dialog_get_version gtk_about_dialog_get_version; -alias extern (C) void function(aGtkAboutDialog *, char *)TGTKgtk_about_dialog_set_program_name; extern(D) TGTKgtk_about_dialog_set_program_name gtk_about_dialog_set_program_name; +alias extern (C) void function(aGtkAboutDialog *, in char *)TGTKgtk_about_dialog_set_program_name; extern(D) TGTKgtk_about_dialog_set_program_name gtk_about_dialog_set_program_name; alias extern (C) char * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_program_name; extern(D) TGTKgtk_about_dialog_get_program_name gtk_about_dialog_get_program_name; -alias extern (C) void function(aGtkAboutDialog *, char *)TGTKgtk_about_dialog_set_name; extern(D) TGTKgtk_about_dialog_set_name gtk_about_dialog_set_name; +alias extern (C) void function(aGtkAboutDialog *, in char *)TGTKgtk_about_dialog_set_name; extern(D) TGTKgtk_about_dialog_set_name gtk_about_dialog_set_name; alias extern (C) char * function(aGtkAboutDialog *)TGTKgtk_about_dialog_get_name; extern(D) TGTKgtk_about_dialog_get_name gtk_about_dialog_get_name; -alias extern (C) void function(aGtkWindow *, char *, ...)TGTKgtk_show_about_dialog; extern(D) TGTKgtk_show_about_dialog gtk_show_about_dialog; +alias extern (C) void function(aGtkWindow *, in char *, ...)TGTKgtk_show_about_dialog; extern(D) TGTKgtk_show_about_dialog gtk_show_about_dialog; alias extern (C) _GtkWidget * function()TGTKgtk_about_dialog_new; extern(D) TGTKgtk_about_dialog_new gtk_about_dialog_new; alias extern (C) uint function()TGTKgtk_about_dialog_get_type; extern(D) TGTKgtk_about_dialog_get_type gtk_about_dialog_get_type; //alias extern (C) void function(aGtkDialog *, int)TGTK_gtk_dialog_set_ignore_separator; extern(D) TGTK_gtk_dialog_set_ignore_separator _gtk_dialog_set_ignore_separator; @@ -9096,10 +9096,10 @@ alias extern (C) int function(aGtkDialog *, aGtkWidget *)TGTKgtk_dialog_get_response_for_widget; extern(D) TGTKgtk_dialog_get_response_for_widget gtk_dialog_get_response_for_widget; alias extern (C) void function(aGtkDialog *, int)TGTKgtk_dialog_set_default_response; extern(D) TGTKgtk_dialog_set_default_response gtk_dialog_set_default_response; alias extern (C) void function(aGtkDialog *, int, int)TGTKgtk_dialog_set_response_sensitive; extern(D) TGTKgtk_dialog_set_response_sensitive gtk_dialog_set_response_sensitive; -alias extern (C) void function(aGtkDialog *, char *, ...)TGTKgtk_dialog_add_buttons; extern(D) TGTKgtk_dialog_add_buttons gtk_dialog_add_buttons; -alias extern (C) _GtkWidget * function(aGtkDialog *, char *, int)TGTKgtk_dialog_add_button; extern(D) TGTKgtk_dialog_add_button gtk_dialog_add_button; +alias extern (C) void function(aGtkDialog *, in char *, ...)TGTKgtk_dialog_add_buttons; extern(D) TGTKgtk_dialog_add_buttons gtk_dialog_add_buttons; +alias extern (C) _GtkWidget * function(aGtkDialog *, in char *, int)TGTKgtk_dialog_add_button; extern(D) TGTKgtk_dialog_add_button gtk_dialog_add_button; alias extern (C) void function(aGtkDialog *, aGtkWidget *, int)TGTKgtk_dialog_add_action_widget; extern(D) TGTKgtk_dialog_add_action_widget gtk_dialog_add_action_widget; -alias extern (C) _GtkWidget * function(char *, aGtkWindow *, int, char *, ...)TGTKgtk_dialog_new_with_buttons; extern(D) TGTKgtk_dialog_new_with_buttons gtk_dialog_new_with_buttons; +alias extern (C) _GtkWidget * function(in char *, aGtkWindow *, int, in char *, ...)TGTKgtk_dialog_new_with_buttons; extern(D) TGTKgtk_dialog_new_with_buttons gtk_dialog_new_with_buttons; alias extern (C) _GtkWidget * function()TGTKgtk_dialog_new; extern(D) TGTKgtk_dialog_new gtk_dialog_new; alias extern (C) uint function()TGTKgtk_dialog_get_type; extern(D) TGTKgtk_dialog_get_type gtk_dialog_get_type; //alias extern (C) int function(aGtkWindow *, uint, int)TGTK_gtk_window_query_nonaccels; extern(D) TGTK_gtk_window_query_nonaccels _gtk_window_query_nonaccels; @@ -9152,15 +9152,15 @@ alias extern (C) int function(aGtkWindow *)TGTKgtk_window_get_modal; extern(D) TGTKgtk_window_get_modal gtk_window_get_modal; alias extern (C) void function(aGtkWindow *, int)TGTKgtk_window_set_modal; extern(D) TGTKgtk_window_set_modal gtk_window_set_modal; alias extern (C) void function(int)TGTKgtk_window_set_auto_startup_notification; extern(D) TGTKgtk_window_set_auto_startup_notification gtk_window_set_auto_startup_notification; -alias extern (C) int function(char *, _GError * *)TGTKgtk_window_set_default_icon_from_file; extern(D) TGTKgtk_window_set_default_icon_from_file gtk_window_set_default_icon_from_file; -alias extern (C) void function(char *)TGTKgtk_window_set_default_icon_name; extern(D) TGTKgtk_window_set_default_icon_name gtk_window_set_default_icon_name; +alias extern (C) int function(in char *, _GError * *)TGTKgtk_window_set_default_icon_from_file; extern(D) TGTKgtk_window_set_default_icon_from_file gtk_window_set_default_icon_from_file; +alias extern (C) void function(in char *)TGTKgtk_window_set_default_icon_name; extern(D) TGTKgtk_window_set_default_icon_name gtk_window_set_default_icon_name; alias extern (C) void function(void *)TGTKgtk_window_set_default_icon; extern(D) TGTKgtk_window_set_default_icon gtk_window_set_default_icon; alias extern (C) _GList * function()TGTKgtk_window_get_default_icon_list; extern(D) TGTKgtk_window_get_default_icon_list gtk_window_get_default_icon_list; alias extern (C) void function(_GList *)TGTKgtk_window_set_default_icon_list; extern(D) TGTKgtk_window_set_default_icon_list gtk_window_set_default_icon_list; alias extern (C) char * function(aGtkWindow *)TGTKgtk_window_get_icon_name; extern(D) TGTKgtk_window_get_icon_name gtk_window_get_icon_name; alias extern (C) void * function(aGtkWindow *)TGTKgtk_window_get_icon; extern(D) TGTKgtk_window_get_icon gtk_window_get_icon; -alias extern (C) int function(aGtkWindow *, char *, _GError * *)TGTKgtk_window_set_icon_from_file; extern(D) TGTKgtk_window_set_icon_from_file gtk_window_set_icon_from_file; -alias extern (C) void function(aGtkWindow *, char *)TGTKgtk_window_set_icon_name; extern(D) TGTKgtk_window_set_icon_name gtk_window_set_icon_name; +alias extern (C) int function(aGtkWindow *, in char *, _GError * *)TGTKgtk_window_set_icon_from_file; extern(D) TGTKgtk_window_set_icon_from_file gtk_window_set_icon_from_file; +alias extern (C) void function(aGtkWindow *, in char *)TGTKgtk_window_set_icon_name; extern(D) TGTKgtk_window_set_icon_name gtk_window_set_icon_name; alias extern (C) void function(aGtkWindow *, void *)TGTKgtk_window_set_icon; extern(D) TGTKgtk_window_set_icon gtk_window_set_icon; alias extern (C) _GList * function(aGtkWindow *)TGTKgtk_window_get_icon_list; extern(D) TGTKgtk_window_get_icon_list gtk_window_get_icon_list; alias extern (C) void function(aGtkWindow *, _GList *)TGTKgtk_window_set_icon_list; extern(D) TGTKgtk_window_set_icon_list gtk_window_set_icon_list; @@ -9208,11 +9208,11 @@ alias extern (C) void function(aGtkWindow *, aGtkAccelGroup *)TGTKgtk_window_remove_accel_group; extern(D) TGTKgtk_window_remove_accel_group gtk_window_remove_accel_group; alias extern (C) void function(aGtkWindow *, aGtkAccelGroup *)TGTKgtk_window_add_accel_group; extern(D) TGTKgtk_window_add_accel_group gtk_window_add_accel_group; alias extern (C) char * function(aGtkWindow *)TGTKgtk_window_get_role; extern(D) TGTKgtk_window_get_role gtk_window_get_role; -alias extern (C) void function(aGtkWindow *, char *)TGTKgtk_window_set_startup_id; extern(D) TGTKgtk_window_set_startup_id gtk_window_set_startup_id; -alias extern (C) void function(aGtkWindow *, char *)TGTKgtk_window_set_role; extern(D) TGTKgtk_window_set_role gtk_window_set_role; -alias extern (C) void function(aGtkWindow *, char *, char *)TGTKgtk_window_set_wmclass; extern(D) TGTKgtk_window_set_wmclass gtk_window_set_wmclass; +alias extern (C) void function(aGtkWindow *, in char *)TGTKgtk_window_set_startup_id; extern(D) TGTKgtk_window_set_startup_id gtk_window_set_startup_id; +alias extern (C) void function(aGtkWindow *, in char *)TGTKgtk_window_set_role; extern(D) TGTKgtk_window_set_role gtk_window_set_role; +alias extern (C) void function(aGtkWindow *, in char *, in char *)TGTKgtk_window_set_wmclass; extern(D) TGTKgtk_window_set_wmclass gtk_window_set_wmclass; alias extern (C) char * function(aGtkWindow *)TGTKgtk_window_get_title; extern(D) TGTKgtk_window_get_title gtk_window_get_title; -alias extern (C) void function(aGtkWindow *, char *)TGTKgtk_window_set_title; extern(D) TGTKgtk_window_set_title gtk_window_set_title; +alias extern (C) void function(aGtkWindow *, in char *)TGTKgtk_window_set_title; extern(D) TGTKgtk_window_set_title gtk_window_set_title; alias extern (C) _GtkWidget * function(int)TGTKgtk_window_new; extern(D) TGTKgtk_window_new gtk_window_new; alias extern (C) uint function()TGTKgtk_window_get_type; extern(D) TGTKgtk_window_get_type gtk_window_get_type; alias extern (C) _GtkWidget * function(aGtkBin *)TGTKgtk_bin_get_child; extern(D) TGTKgtk_bin_get_child gtk_bin_get_child; @@ -9223,15 +9223,15 @@ //alias extern (C) void function(aGtkContainer *)TGTK_gtk_container_clear_resize_widgets; extern(D) TGTK_gtk_container_clear_resize_widgets _gtk_container_clear_resize_widgets; //alias extern (C) void function(aGtkContainer *)TGTK_gtk_container_queue_resize; extern(D) TGTK_gtk_container_queue_resize _gtk_container_queue_resize; alias extern (C) void function(aGtkContainer *, _BCD_func__12090, void *)TGTKgtk_container_forall; extern(D) TGTKgtk_container_forall gtk_container_forall; -alias extern (C) void function(aGtkContainer *, aGtkWidget *, char *, _GValue *)TGTKgtk_container_child_get_property; extern(D) TGTKgtk_container_child_get_property gtk_container_child_get_property; -alias extern (C) void function(aGtkContainer *, aGtkWidget *, char *, _GValue *)TGTKgtk_container_child_set_property; extern(D) TGTKgtk_container_child_set_property gtk_container_child_set_property; -alias extern (C) void function(aGtkContainer *, aGtkWidget *, char *, char *)TGTKgtk_container_child_get_valist; extern(D) TGTKgtk_container_child_get_valist gtk_container_child_get_valist; -alias extern (C) void function(aGtkContainer *, aGtkWidget *, char *, char *)TGTKgtk_container_child_set_valist; extern(D) TGTKgtk_container_child_set_valist gtk_container_child_set_valist; -alias extern (C) void function(aGtkContainer *, aGtkWidget *, char *, ...)TGTKgtk_container_child_get; extern(D) TGTKgtk_container_child_get gtk_container_child_get; -alias extern (C) void function(aGtkContainer *, aGtkWidget *, char *, ...)TGTKgtk_container_child_set; extern(D) TGTKgtk_container_child_set gtk_container_child_set; -alias extern (C) void function(aGtkContainer *, aGtkWidget *, char *, ...)TGTKgtk_container_add_with_properties; extern(D) TGTKgtk_container_add_with_properties gtk_container_add_with_properties; +alias extern (C) void function(aGtkContainer *, aGtkWidget *, in char *, _GValue *)TGTKgtk_container_child_get_property; extern(D) TGTKgtk_container_child_get_property gtk_container_child_get_property; +alias extern (C) void function(aGtkContainer *, aGtkWidget *, in char *, _GValue *)TGTKgtk_container_child_set_property; extern(D) TGTKgtk_container_child_set_property gtk_container_child_set_property; +alias extern (C) void function(aGtkContainer *, aGtkWidget *, in char *, char *)TGTKgtk_container_child_get_valist; extern(D) TGTKgtk_container_child_get_valist gtk_container_child_get_valist; +alias extern (C) void function(aGtkContainer *, aGtkWidget *, in char *, char *)TGTKgtk_container_child_set_valist; extern(D) TGTKgtk_container_child_set_valist gtk_container_child_set_valist; +alias extern (C) void function(aGtkContainer *, aGtkWidget *, in char *, ...)TGTKgtk_container_child_get; extern(D) TGTKgtk_container_child_get gtk_container_child_get; +alias extern (C) void function(aGtkContainer *, aGtkWidget *, in char *, ...)TGTKgtk_container_child_set; extern(D) TGTKgtk_container_child_set gtk_container_child_set; +alias extern (C) void function(aGtkContainer *, aGtkWidget *, in char *, ...)TGTKgtk_container_add_with_properties; extern(D) TGTKgtk_container_add_with_properties gtk_container_add_with_properties; alias extern (C) _GParamSpec * * function(_GObjectClass *, uint *)TGTKgtk_container_class_list_child_properties; extern(D) TGTKgtk_container_class_list_child_properties gtk_container_class_list_child_properties; -alias extern (C) _GParamSpec * function(_GObjectClass *, char *)TGTKgtk_container_class_find_child_property; extern(D) TGTKgtk_container_class_find_child_property gtk_container_class_find_child_property; +alias extern (C) _GParamSpec * function(_GObjectClass *, in char *)TGTKgtk_container_class_find_child_property; extern(D) TGTKgtk_container_class_find_child_property gtk_container_class_find_child_property; alias extern (C) void function(aGtkContainerClass *, uint, _GParamSpec *)TGTKgtk_container_class_install_child_property; extern(D) TGTKgtk_container_class_install_child_property gtk_container_class_install_child_property; alias extern (C) uint function(aGtkContainer *)TGTKgtk_container_child_type; extern(D) TGTKgtk_container_child_type gtk_container_child_type; alias extern (C) void function(aGtkContainer *)TGTKgtk_container_resize_children; extern(D) TGTKgtk_container_resize_children gtk_container_resize_children; @@ -9268,9 +9268,9 @@ alias extern (C) int function(aGtkWidget *)TGTKgtk_widget_get_has_tooltip; extern(D) TGTKgtk_widget_get_has_tooltip gtk_widget_get_has_tooltip; alias extern (C) void function(aGtkWidget *, int)TGTKgtk_widget_set_has_tooltip; extern(D) TGTKgtk_widget_set_has_tooltip gtk_widget_set_has_tooltip; alias extern (C) char * function(aGtkWidget *)TGTKgtk_widget_get_tooltip_markup; extern(D) TGTKgtk_widget_get_tooltip_markup gtk_widget_get_tooltip_markup; -alias extern (C) void function(aGtkWidget *, char *)TGTKgtk_widget_set_tooltip_markup; extern(D) TGTKgtk_widget_set_tooltip_markup gtk_widget_set_tooltip_markup; +alias extern (C) void function(aGtkWidget *, in char *)TGTKgtk_widget_set_tooltip_markup; extern(D) TGTKgtk_widget_set_tooltip_markup gtk_widget_set_tooltip_markup; alias extern (C) char * function(aGtkWidget *)TGTKgtk_widget_get_tooltip_text; extern(D) TGTKgtk_widget_get_tooltip_text gtk_widget_get_tooltip_text; -alias extern (C) void function(aGtkWidget *, char *)TGTKgtk_widget_set_tooltip_text; extern(D) TGTKgtk_widget_set_tooltip_text gtk_widget_set_tooltip_text; +alias extern (C) void function(aGtkWidget *, in char *)TGTKgtk_widget_set_tooltip_text; extern(D) TGTKgtk_widget_set_tooltip_text gtk_widget_set_tooltip_text; alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_trigger_tooltip_query; extern(D) TGTKgtk_widget_trigger_tooltip_query gtk_widget_trigger_tooltip_query; alias extern (C) _GtkWindow * function(aGtkWidget *)TGTKgtk_widget_get_tooltip_window; extern(D) TGTKgtk_widget_get_tooltip_window gtk_widget_get_tooltip_window; alias extern (C) void function(aGtkWidget *, aGtkWindow *)TGTKgtk_widget_set_tooltip_window; extern(D) TGTKgtk_widget_set_tooltip_window gtk_widget_set_tooltip_window; @@ -9291,11 +9291,11 @@ alias extern (C) _GdkColormap * function()TGTKgtk_widget_get_default_colormap; extern(D) TGTKgtk_widget_get_default_colormap gtk_widget_get_default_colormap; alias extern (C) _GtkStyle * function()TGTKgtk_widget_get_default_style; extern(D) TGTKgtk_widget_get_default_style gtk_widget_get_default_style; alias extern (C) void function(_GdkColormap *)TGTKgtk_widget_set_default_colormap; extern(D) TGTKgtk_widget_set_default_colormap gtk_widget_set_default_colormap; -alias extern (C) void function(aGtkWidget *, char *, ...)TGTKgtk_widget_style_get; extern(D) TGTKgtk_widget_style_get gtk_widget_style_get; -alias extern (C) void function(aGtkWidget *, char *, char *)TGTKgtk_widget_style_get_valist; extern(D) TGTKgtk_widget_style_get_valist gtk_widget_style_get_valist; -alias extern (C) void function(aGtkWidget *, char *, _GValue *)TGTKgtk_widget_style_get_property; extern(D) TGTKgtk_widget_style_get_property gtk_widget_style_get_property; +alias extern (C) void function(aGtkWidget *, in char *, ...)TGTKgtk_widget_style_get; extern(D) TGTKgtk_widget_style_get gtk_widget_style_get; +alias extern (C) void function(aGtkWidget *, in char *, char *)TGTKgtk_widget_style_get_valist; extern(D) TGTKgtk_widget_style_get_valist gtk_widget_style_get_valist; +alias extern (C) void function(aGtkWidget *, in char *, _GValue *)TGTKgtk_widget_style_get_property; extern(D) TGTKgtk_widget_style_get_property gtk_widget_style_get_property; alias extern (C) _GParamSpec * * function(aGtkWidgetClass *, uint *)TGTKgtk_widget_class_list_style_properties; extern(D) TGTKgtk_widget_class_list_style_properties gtk_widget_class_list_style_properties; -alias extern (C) _GParamSpec * function(aGtkWidgetClass *, char *)TGTKgtk_widget_class_find_style_property; extern(D) TGTKgtk_widget_class_find_style_property gtk_widget_class_find_style_property; +alias extern (C) _GParamSpec * function(aGtkWidgetClass *, in char *)TGTKgtk_widget_class_find_style_property; extern(D) TGTKgtk_widget_class_find_style_property gtk_widget_class_find_style_property; alias extern (C) void function(aGtkWidgetClass *, _GParamSpec *, _BCD_func__12993)TGTKgtk_widget_class_install_style_property_parser; extern(D) TGTKgtk_widget_class_install_style_property_parser gtk_widget_class_install_style_property_parser; alias extern (C) void function(aGtkWidgetClass *, _GParamSpec *)TGTKgtk_widget_class_install_style_property; extern(D) TGTKgtk_widget_class_install_style_property gtk_widget_class_install_style_property; alias extern (C) void function()TGTKgtk_widget_pop_colormap; extern(D) TGTKgtk_widget_pop_colormap gtk_widget_pop_colormap; @@ -9304,9 +9304,9 @@ alias extern (C) void function(_GdkColormap *)TGTKgtk_widget_push_colormap; extern(D) TGTKgtk_widget_push_colormap gtk_widget_push_colormap; alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_reset_rc_styles; extern(D) TGTKgtk_widget_reset_rc_styles gtk_widget_reset_rc_styles; alias extern (C) char * function(aGtkWidget *)TGTKgtk_widget_get_composite_name; extern(D) TGTKgtk_widget_get_composite_name gtk_widget_get_composite_name; -alias extern (C) void function(aGtkWidget *, char *)TGTKgtk_widget_set_composite_name; extern(D) TGTKgtk_widget_set_composite_name gtk_widget_set_composite_name; -alias extern (C) void * function(aGtkWidget *, char *, int, char *)TGTKgtk_widget_render_icon; extern(D) TGTKgtk_widget_render_icon gtk_widget_render_icon; -alias extern (C) void * function(aGtkWidget *, char *)TGTKgtk_widget_create_pango_layout; extern(D) TGTKgtk_widget_create_pango_layout gtk_widget_create_pango_layout; +alias extern (C) void function(aGtkWidget *, in char *)TGTKgtk_widget_set_composite_name; extern(D) TGTKgtk_widget_set_composite_name gtk_widget_set_composite_name; +alias extern (C) void * function(aGtkWidget *, in char *, int, in char *)TGTKgtk_widget_render_icon; extern(D) TGTKgtk_widget_render_icon gtk_widget_render_icon; +alias extern (C) void * function(aGtkWidget *, in char *)TGTKgtk_widget_create_pango_layout; extern(D) TGTKgtk_widget_create_pango_layout gtk_widget_create_pango_layout; alias extern (C) void * function(aGtkWidget *)TGTKgtk_widget_get_pango_context; extern(D) TGTKgtk_widget_get_pango_context gtk_widget_get_pango_context; alias extern (C) void * function(aGtkWidget *)TGTKgtk_widget_create_pango_context; extern(D) TGTKgtk_widget_create_pango_context gtk_widget_create_pango_context; alias extern (C) void function(aGtkWidget *, void *)TGTKgtk_widget_modify_font; extern(D) TGTKgtk_widget_modify_font gtk_widget_modify_font; @@ -9360,12 +9360,12 @@ alias extern (C) void function(aGtkWidget *, int)TGTKgtk_widget_set_sensitive; extern(D) TGTKgtk_widget_set_sensitive gtk_widget_set_sensitive; alias extern (C) void function(aGtkWidget *, int)TGTKgtk_widget_set_state; extern(D) TGTKgtk_widget_set_state gtk_widget_set_state; alias extern (C) char * function(aGtkWidget *)TGTKgtk_widget_get_name; extern(D) TGTKgtk_widget_get_name gtk_widget_get_name; -alias extern (C) void function(aGtkWidget *, char *)TGTKgtk_widget_set_name; extern(D) TGTKgtk_widget_set_name gtk_widget_set_name; +alias extern (C) void function(aGtkWidget *, in char *)TGTKgtk_widget_set_name; extern(D) TGTKgtk_widget_set_name gtk_widget_set_name; alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_grab_default; extern(D) TGTKgtk_widget_grab_default gtk_widget_grab_default; alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_grab_focus; extern(D) TGTKgtk_widget_grab_focus gtk_widget_grab_focus; alias extern (C) int function(aGtkWidget *)TGTKgtk_widget_is_focus; extern(D) TGTKgtk_widget_is_focus gtk_widget_is_focus; alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_thaw_child_notify; extern(D) TGTKgtk_widget_thaw_child_notify gtk_widget_thaw_child_notify; -alias extern (C) void function(aGtkWidget *, char *)TGTKgtk_widget_child_notify; extern(D) TGTKgtk_widget_child_notify gtk_widget_child_notify; +alias extern (C) void function(aGtkWidget *, in char *)TGTKgtk_widget_child_notify; extern(D) TGTKgtk_widget_child_notify gtk_widget_child_notify; alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_freeze_child_notify; extern(D) TGTKgtk_widget_freeze_child_notify gtk_widget_freeze_child_notify; alias extern (C) void * function(aGtkWidget *, void *)TGTKgtk_widget_region_intersect; extern(D) TGTKgtk_widget_region_intersect gtk_widget_region_intersect; alias extern (C) int function(aGtkWidget *, _GdkRectangle *, _GdkRectangle *)TGTKgtk_widget_intersect; extern(D) TGTKgtk_widget_intersect gtk_widget_intersect; @@ -9378,9 +9378,9 @@ alias extern (C) int function(aGtkWidget *, uint)TGTKgtk_widget_can_activate_accel; extern(D) TGTKgtk_widget_can_activate_accel gtk_widget_can_activate_accel; alias extern (C) _GList * function(aGtkWidget *)TGTKgtk_widget_list_accel_closures; extern(D) TGTKgtk_widget_list_accel_closures gtk_widget_list_accel_closures; //alias extern (C) char * function(aGtkWidget *, int *)TGTK_gtk_widget_get_accel_path; extern(D) TGTK_gtk_widget_get_accel_path _gtk_widget_get_accel_path; -alias extern (C) void function(aGtkWidget *, char *, aGtkAccelGroup *)TGTKgtk_widget_set_accel_path; extern(D) TGTKgtk_widget_set_accel_path gtk_widget_set_accel_path; +alias extern (C) void function(aGtkWidget *, in char *, aGtkAccelGroup *)TGTKgtk_widget_set_accel_path; extern(D) TGTKgtk_widget_set_accel_path gtk_widget_set_accel_path; alias extern (C) int function(aGtkWidget *, aGtkAccelGroup *, uint, int)TGTKgtk_widget_remove_accelerator; extern(D) TGTKgtk_widget_remove_accelerator gtk_widget_remove_accelerator; -alias extern (C) void function(aGtkWidget *, char *, aGtkAccelGroup *, uint, int, int)TGTKgtk_widget_add_accelerator; extern(D) TGTKgtk_widget_add_accelerator gtk_widget_add_accelerator; +alias extern (C) void function(aGtkWidget *, in char *, aGtkAccelGroup *, uint, int, int)TGTKgtk_widget_add_accelerator; extern(D) TGTKgtk_widget_add_accelerator gtk_widget_add_accelerator; alias extern (C) void function(aGtkWidget *, aGtkRequisition *)TGTKgtk_widget_get_child_requisition; extern(D) TGTKgtk_widget_get_child_requisition gtk_widget_get_child_requisition; alias extern (C) void function(aGtkWidget *, _GdkRectangle *)TGTKgtk_widget_size_allocate; extern(D) TGTKgtk_widget_size_allocate gtk_widget_size_allocate; alias extern (C) void function(aGtkWidget *, aGtkRequisition *)TGTKgtk_widget_size_request; extern(D) TGTKgtk_widget_size_request gtk_widget_size_request; @@ -9403,22 +9403,22 @@ alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_show_now; extern(D) TGTKgtk_widget_show_now gtk_widget_show_now; alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_show; extern(D) TGTKgtk_widget_show gtk_widget_show; alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_unparent; extern(D) TGTKgtk_widget_unparent gtk_widget_unparent; -alias extern (C) void function(aGtkWidget *, char *, ...)TGTKgtk_widget_set; extern(D) TGTKgtk_widget_set gtk_widget_set; +alias extern (C) void function(aGtkWidget *, in char *, ...)TGTKgtk_widget_set; extern(D) TGTKgtk_widget_set gtk_widget_set; alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_unref; extern(D) TGTKgtk_widget_unref gtk_widget_unref; alias extern (C) _GtkWidget * function(aGtkWidget *)TGTKgtk_widget_ref; extern(D) TGTKgtk_widget_ref gtk_widget_ref; alias extern (C) void function(aGtkWidget *, _GtkWidget * *)TGTKgtk_widget_destroyed; extern(D) TGTKgtk_widget_destroyed gtk_widget_destroyed; alias extern (C) void function(aGtkWidget *)TGTKgtk_widget_destroy; extern(D) TGTKgtk_widget_destroy gtk_widget_destroy; -alias extern (C) _GtkWidget * function(uint, char *, ...)TGTKgtk_widget_new; extern(D) TGTKgtk_widget_new gtk_widget_new; +alias extern (C) _GtkWidget * function(uint, in char *, ...)TGTKgtk_widget_new; extern(D) TGTKgtk_widget_new gtk_widget_new; alias extern (C) uint function()TGTKgtk_widget_get_type; extern(D) TGTKgtk_widget_get_type gtk_widget_get_type; //alias extern (C) int function(_BCD_func__12993, _GValue *, _GParamSpec *, _GValue *)TGTK_gtk_settings_parse_convert; extern(D) TGTK_gtk_settings_parse_convert _gtk_settings_parse_convert; //alias extern (C) _BCD_func__12993 function(uint)TGTK_gtk_rc_property_parser_from_type; extern(D) TGTK_gtk_rc_property_parser_from_type _gtk_rc_property_parser_from_type; //alias extern (C) void function(_GdkEventSetting *)TGTK_gtk_settings_handle_event; extern(D) TGTK_gtk_settings_handle_event _gtk_settings_handle_event; //alias extern (C) void function(aGtkSettings *)TGTK_gtk_settings_reset_rc_values; extern(D) TGTK_gtk_settings_reset_rc_values _gtk_settings_reset_rc_values; //alias extern (C) void function(aGtkSettings *, char *, aGtkSettingsValue *)TGTK_gtk_settings_set_property_value_from_rc; extern(D) TGTK_gtk_settings_set_property_value_from_rc _gtk_settings_set_property_value_from_rc; -alias extern (C) void function(aGtkSettings *, char *, double, char *)TGTKgtk_settings_set_double_property; extern(D) TGTKgtk_settings_set_double_property gtk_settings_set_double_property; -alias extern (C) void function(aGtkSettings *, char *, int, char *)TGTKgtk_settings_set_long_property; extern(D) TGTKgtk_settings_set_long_property gtk_settings_set_long_property; -alias extern (C) void function(aGtkSettings *, char *, char *, char *)TGTKgtk_settings_set_string_property; extern(D) TGTKgtk_settings_set_string_property gtk_settings_set_string_property; -alias extern (C) void function(aGtkSettings *, char *, aGtkSettingsValue *)TGTKgtk_settings_set_property_value; extern(D) TGTKgtk_settings_set_property_value gtk_settings_set_property_value; +alias extern (C) void function(aGtkSettings *, in char *, double, char *)TGTKgtk_settings_set_double_property; extern(D) TGTKgtk_settings_set_double_property gtk_settings_set_double_property; +alias extern (C) void function(aGtkSettings *, in char *, int, char *)TGTKgtk_settings_set_long_property; extern(D) TGTKgtk_settings_set_long_property gtk_settings_set_long_property; +alias extern (C) void function(aGtkSettings *, in char *, in char *, char *)TGTKgtk_settings_set_string_property; extern(D) TGTKgtk_settings_set_string_property gtk_settings_set_string_property; +alias extern (C) void function(aGtkSettings *, in char *, aGtkSettingsValue *)TGTKgtk_settings_set_property_value; extern(D) TGTKgtk_settings_set_property_value gtk_settings_set_property_value; alias extern (C) int function(_GParamSpec *, _GString *, _GValue *)TGTKgtk_rc_property_parse_border; extern(D) TGTKgtk_rc_property_parse_border gtk_rc_property_parse_border; alias extern (C) int function(_GParamSpec *, _GString *, _GValue *)TGTKgtk_rc_property_parse_requisition; extern(D) TGTKgtk_rc_property_parse_requisition gtk_rc_property_parse_requisition; alias extern (C) int function(_GParamSpec *, _GString *, _GValue *)TGTKgtk_rc_property_parse_flags; extern(D) TGTKgtk_rc_property_parse_flags gtk_rc_property_parse_flags; @@ -9444,26 +9444,26 @@ alias extern (C) char * function()TGTKgtk_rc_get_im_module_path; extern(D) TGTKgtk_rc_get_im_module_path gtk_rc_get_im_module_path; alias extern (C) char * function()TGTKgtk_rc_get_module_dir; extern(D) TGTKgtk_rc_get_module_dir gtk_rc_get_module_dir; alias extern (C) char * function()TGTKgtk_rc_get_theme_dir; extern(D) TGTKgtk_rc_get_theme_dir gtk_rc_get_theme_dir; -alias extern (C) char * function(char *)TGTKgtk_rc_find_module_in_path; extern(D) TGTKgtk_rc_find_module_in_path gtk_rc_find_module_in_path; +alias extern (C) char * function(in char *)TGTKgtk_rc_find_module_in_path; extern(D) TGTKgtk_rc_find_module_in_path gtk_rc_find_module_in_path; alias extern (C) void function(aGtkRcStyle *)TGTKgtk_rc_style_unref; extern(D) TGTKgtk_rc_style_unref gtk_rc_style_unref; alias extern (C) void function(aGtkRcStyle *)TGTKgtk_rc_style_ref; extern(D) TGTKgtk_rc_style_ref gtk_rc_style_ref; alias extern (C) _GtkRcStyle * function(aGtkRcStyle *)TGTKgtk_rc_style_copy; extern(D) TGTKgtk_rc_style_copy gtk_rc_style_copy; alias extern (C) _GtkRcStyle * function()TGTKgtk_rc_style_new; extern(D) TGTKgtk_rc_style_new gtk_rc_style_new; alias extern (C) uint function()TGTKgtk_rc_style_get_type; extern(D) TGTKgtk_rc_style_get_type gtk_rc_style_get_type; -alias extern (C) void function(aGtkRcStyle *, char *)TGTKgtk_rc_add_class_style; extern(D) TGTKgtk_rc_add_class_style gtk_rc_add_class_style; -alias extern (C) void function(aGtkRcStyle *, char *)TGTKgtk_rc_add_widget_class_style; extern(D) TGTKgtk_rc_add_widget_class_style gtk_rc_add_widget_class_style; -alias extern (C) void function(aGtkRcStyle *, char *)TGTKgtk_rc_add_widget_name_style; extern(D) TGTKgtk_rc_add_widget_name_style gtk_rc_add_widget_name_style; +alias extern (C) void function(aGtkRcStyle *, in char *)TGTKgtk_rc_add_class_style; extern(D) TGTKgtk_rc_add_class_style gtk_rc_add_class_style; +alias extern (C) void function(aGtkRcStyle *, in char *)TGTKgtk_rc_add_widget_class_style; extern(D) TGTKgtk_rc_add_widget_class_style gtk_rc_add_widget_class_style; +alias extern (C) void function(aGtkRcStyle *, in char *)TGTKgtk_rc_add_widget_name_style; extern(D) TGTKgtk_rc_add_widget_name_style gtk_rc_add_widget_name_style; alias extern (C) int function()TGTKgtk_rc_reparse_all; extern(D) TGTKgtk_rc_reparse_all gtk_rc_reparse_all; -alias extern (C) void function(char *)TGTKgtk_rc_parse_string; extern(D) TGTKgtk_rc_parse_string gtk_rc_parse_string; -alias extern (C) void function(char *)TGTKgtk_rc_parse; extern(D) TGTKgtk_rc_parse gtk_rc_parse; -alias extern (C) char * function(aGtkSettings *, _GScanner *, char *)TGTKgtk_rc_find_pixmap_in_path; extern(D) TGTKgtk_rc_find_pixmap_in_path gtk_rc_find_pixmap_in_path; +alias extern (C) void function(in char *)TGTKgtk_rc_parse_string; extern(D) TGTKgtk_rc_parse_string gtk_rc_parse_string; +alias extern (C) void function(in char *)TGTKgtk_rc_parse; extern(D) TGTKgtk_rc_parse gtk_rc_parse; +alias extern (C) char * function(aGtkSettings *, _GScanner *, in char *)TGTKgtk_rc_find_pixmap_in_path; extern(D) TGTKgtk_rc_find_pixmap_in_path gtk_rc_find_pixmap_in_path; alias extern (C) void function(aGtkSettings *)TGTKgtk_rc_reset_styles; extern(D) TGTKgtk_rc_reset_styles gtk_rc_reset_styles; alias extern (C) int function(aGtkSettings *, int)TGTKgtk_rc_reparse_all_for_settings; extern(D) TGTKgtk_rc_reparse_all_for_settings gtk_rc_reparse_all_for_settings; -alias extern (C) _GtkStyle * function(aGtkSettings *, char *, char *, uint)TGTKgtk_rc_get_style_by_paths; extern(D) TGTKgtk_rc_get_style_by_paths gtk_rc_get_style_by_paths; +alias extern (C) _GtkStyle * function(aGtkSettings *, in char *, in char *, uint)TGTKgtk_rc_get_style_by_paths; extern(D) TGTKgtk_rc_get_style_by_paths gtk_rc_get_style_by_paths; alias extern (C) _GtkStyle * function(aGtkWidget *)TGTKgtk_rc_get_style; extern(D) TGTKgtk_rc_get_style gtk_rc_get_style; alias extern (C) char * * function()TGTKgtk_rc_get_default_files; extern(D) TGTKgtk_rc_get_default_files gtk_rc_get_default_files; alias extern (C) void function(char * *)TGTKgtk_rc_set_default_files; extern(D) TGTKgtk_rc_set_default_files gtk_rc_set_default_files; -alias extern (C) void function(char *)TGTKgtk_rc_add_default_file; extern(D) TGTKgtk_rc_add_default_file gtk_rc_add_default_file; +alias extern (C) void function(in char *)TGTKgtk_rc_add_default_file; extern(D) TGTKgtk_rc_add_default_file gtk_rc_add_default_file; //alias extern (C) int function(_GSList *, int, char *, char *)TGTK_gtk_rc_match_widget_class; extern(D) TGTK_gtk_rc_match_widget_class _gtk_rc_match_widget_class; //alias extern (C) void function(_GSList *)TGTK_gtk_rc_free_widget_class_path; extern(D) TGTK_gtk_rc_free_widget_class_path _gtk_rc_free_widget_class_path; //alias extern (C) _GSList * function(char *)TGTK_gtk_rc_parse_widget_class_path; extern(D) TGTK_gtk_rc_parse_widget_class_path _gtk_rc_parse_widget_class_path; @@ -9471,34 +9471,34 @@ //alias extern (C) void function(aGtkWidget *, _GdkColor *)TGTK_gtk_widget_get_cursor_color; extern(D) TGTK_gtk_widget_get_cursor_color _gtk_widget_get_cursor_color; //alias extern (C) _GdkGC * function(aGtkWidget *)TGTK_gtk_widget_get_cursor_gc; extern(D) TGTK_gtk_widget_get_cursor_gc _gtk_widget_get_cursor_gc; alias extern (C) void function(aGtkWidget *, _GdkDrawable *, _GdkRectangle *, _GdkRectangle *, int, int, int)TGTKgtk_draw_insertion_cursor; extern(D) TGTKgtk_draw_insertion_cursor gtk_draw_insertion_cursor; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, char *, int, int, char *)TGTKgtk_paint_string; extern(D) TGTKgtk_paint_string gtk_paint_string; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, int, char *)TGTKgtk_draw_string; extern(D) TGTKgtk_draw_string gtk_draw_string; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, in char *)TGTKgtk_paint_string; extern(D) TGTKgtk_paint_string gtk_paint_string; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, int, in char *)TGTKgtk_draw_string; extern(D) TGTKgtk_draw_string gtk_draw_string; //alias extern (C) void function(_GdkColor *, _GdkColor *, double)TGTK_gtk_style_shade; extern(D) TGTK_gtk_style_shade _gtk_style_shade; //alias extern (C) void function(aGtkStyle *, aGtkSettings *)TGTK_gtk_style_init_for_settings; extern(D) TGTK_gtk_style_init_for_settings _gtk_style_init_for_settings; //alias extern (C) _GValue * function(aGtkStyle *, uint, _GParamSpec *, _BCD_func__12993)TGTK_gtk_style_peek_property_value; extern(D) TGTK_gtk_style_peek_property_value _gtk_style_peek_property_value; alias extern (C) void function(aGtkBorder *)TGTKgtk_border_free; extern(D) TGTKgtk_border_free gtk_border_free; alias extern (C) _GtkBorder * function(aGtkBorder *)TGTKgtk_border_copy; extern(D) TGTKgtk_border_copy gtk_border_copy; alias extern (C) uint function()TGTKgtk_border_get_type; extern(D) TGTKgtk_border_get_type gtk_border_get_type; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int, int)TGTKgtk_paint_resize_grip; extern(D) TGTKgtk_paint_resize_grip gtk_paint_resize_grip; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, void *)TGTKgtk_paint_layout; extern(D) TGTKgtk_paint_layout gtk_paint_layout; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int)TGTKgtk_paint_expander; extern(D) TGTKgtk_paint_expander gtk_paint_expander; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int, int)TGTKgtk_paint_handle; extern(D) TGTKgtk_paint_handle gtk_paint_handle; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int, int)TGTKgtk_paint_slider; extern(D) TGTKgtk_paint_slider gtk_paint_slider; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int)TGTKgtk_paint_focus; extern(D) TGTKgtk_paint_focus gtk_paint_focus; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int, int)TGTKgtk_paint_extension; extern(D) TGTKgtk_paint_extension gtk_paint_extension; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int, int, int, int)TGTKgtk_paint_box_gap; extern(D) TGTKgtk_paint_box_gap gtk_paint_box_gap; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int, int, int, int)TGTKgtk_paint_shadow_gap; extern(D) TGTKgtk_paint_shadow_gap gtk_paint_shadow_gap; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int)TGTKgtk_paint_tab; extern(D) TGTKgtk_paint_tab gtk_paint_tab; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int)TGTKgtk_paint_option; extern(D) TGTKgtk_paint_option gtk_paint_option; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int)TGTKgtk_paint_check; extern(D) TGTKgtk_paint_check gtk_paint_check; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int)TGTKgtk_paint_flat_box; extern(D) TGTKgtk_paint_flat_box gtk_paint_flat_box; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int)TGTKgtk_paint_box; extern(D) TGTKgtk_paint_box gtk_paint_box; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int)TGTKgtk_paint_diamond; extern(D) TGTKgtk_paint_diamond gtk_paint_diamond; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int, int, int)TGTKgtk_paint_arrow; extern(D) TGTKgtk_paint_arrow gtk_paint_arrow; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, _GdkPoint *, int, int)TGTKgtk_paint_polygon; extern(D) TGTKgtk_paint_polygon gtk_paint_polygon; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int, int)TGTKgtk_paint_shadow; extern(D) TGTKgtk_paint_shadow gtk_paint_shadow; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int)TGTKgtk_paint_vline; extern(D) TGTKgtk_paint_vline gtk_paint_vline; -alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, char *, int, int, int)TGTKgtk_paint_hline; extern(D) TGTKgtk_paint_hline gtk_paint_hline; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int, int)TGTKgtk_paint_resize_grip; extern(D) TGTKgtk_paint_resize_grip gtk_paint_resize_grip; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, void *)TGTKgtk_paint_layout; extern(D) TGTKgtk_paint_layout gtk_paint_layout; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int)TGTKgtk_paint_expander; extern(D) TGTKgtk_paint_expander gtk_paint_expander; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int, int)TGTKgtk_paint_handle; extern(D) TGTKgtk_paint_handle gtk_paint_handle; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int, int)TGTKgtk_paint_slider; extern(D) TGTKgtk_paint_slider gtk_paint_slider; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int)TGTKgtk_paint_focus; extern(D) TGTKgtk_paint_focus gtk_paint_focus; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int, int)TGTKgtk_paint_extension; extern(D) TGTKgtk_paint_extension gtk_paint_extension; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int, int, int, int)TGTKgtk_paint_box_gap; extern(D) TGTKgtk_paint_box_gap gtk_paint_box_gap; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int, int, int, int)TGTKgtk_paint_shadow_gap; extern(D) TGTKgtk_paint_shadow_gap gtk_paint_shadow_gap; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int)TGTKgtk_paint_tab; extern(D) TGTKgtk_paint_tab gtk_paint_tab; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int)TGTKgtk_paint_option; extern(D) TGTKgtk_paint_option gtk_paint_option; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int)TGTKgtk_paint_check; extern(D) TGTKgtk_paint_check gtk_paint_check; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int)TGTKgtk_paint_flat_box; extern(D) TGTKgtk_paint_flat_box gtk_paint_flat_box; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int)TGTKgtk_paint_box; extern(D) TGTKgtk_paint_box gtk_paint_box; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int)TGTKgtk_paint_diamond; extern(D) TGTKgtk_paint_diamond gtk_paint_diamond; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int, int, int)TGTKgtk_paint_arrow; extern(D) TGTKgtk_paint_arrow gtk_paint_arrow; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, _GdkPoint *, int, int)TGTKgtk_paint_polygon; extern(D) TGTKgtk_paint_polygon gtk_paint_polygon; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int, int)TGTKgtk_paint_shadow; extern(D) TGTKgtk_paint_shadow gtk_paint_shadow; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int)TGTKgtk_paint_vline; extern(D) TGTKgtk_paint_vline gtk_paint_vline; +alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, _GdkRectangle *, aGtkWidget *, in char *, int, int, int)TGTKgtk_paint_hline; extern(D) TGTKgtk_paint_hline gtk_paint_hline; alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, int, int, int, int)TGTKgtk_draw_resize_grip; extern(D) TGTKgtk_draw_resize_grip gtk_draw_resize_grip; alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, int, int, void *)TGTKgtk_draw_layout; extern(D) TGTKgtk_draw_layout gtk_draw_layout; alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, int, int)TGTKgtk_draw_expander; extern(D) TGTKgtk_draw_expander gtk_draw_expander; @@ -9519,9 +9519,9 @@ alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, int, int, int, int)TGTKgtk_draw_shadow; extern(D) TGTKgtk_draw_shadow gtk_draw_shadow; alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, int, int)TGTKgtk_draw_vline; extern(D) TGTKgtk_draw_vline gtk_draw_vline; alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, int, int)TGTKgtk_draw_hline; extern(D) TGTKgtk_draw_hline gtk_draw_hline; -alias extern (C) void * function(aGtkStyle *, void *, int, int, int, aGtkWidget *, char *)TGTKgtk_style_render_icon; extern(D) TGTKgtk_style_render_icon gtk_style_render_icon; -alias extern (C) int function(aGtkStyle *, char *, _GdkColor *)TGTKgtk_style_lookup_color; extern(D) TGTKgtk_style_lookup_color gtk_style_lookup_color; -alias extern (C) void * function(aGtkStyle *, char *)TGTKgtk_style_lookup_icon_set; extern(D) TGTKgtk_style_lookup_icon_set gtk_style_lookup_icon_set; +alias extern (C) void * function(aGtkStyle *, void *, int, int, int, aGtkWidget *, in char *)TGTKgtk_style_render_icon; extern(D) TGTKgtk_style_render_icon gtk_style_render_icon; +alias extern (C) int function(aGtkStyle *, in char *, _GdkColor *)TGTKgtk_style_lookup_color; extern(D) TGTKgtk_style_lookup_color gtk_style_lookup_color; +alias extern (C) void * function(aGtkStyle *, in char *)TGTKgtk_style_lookup_icon_set; extern(D) TGTKgtk_style_lookup_icon_set gtk_style_lookup_icon_set; alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int, int, _GdkRectangle *, int, int, int, int)TGTKgtk_style_apply_default_background; extern(D) TGTKgtk_style_apply_default_background gtk_style_apply_default_background; alias extern (C) void function(aGtkStyle *, _GdkDrawable *, int)TGTKgtk_style_set_background; extern(D) TGTKgtk_style_set_background gtk_style_set_background; alias extern (C) void function(aGtkStyle *, _GdkFont *)TGTKgtk_style_set_font; extern(D) TGTKgtk_style_set_font gtk_style_set_font; @@ -9540,9 +9540,9 @@ alias extern (C) void function(aGtkAdjustment *)TGTKgtk_adjustment_changed; extern(D) TGTKgtk_adjustment_changed gtk_adjustment_changed; alias extern (C) _GtkObject * function(double, double, double, double, double, double)TGTKgtk_adjustment_new; extern(D) TGTKgtk_adjustment_new gtk_adjustment_new; alias extern (C) uint function()TGTKgtk_adjustment_get_type; extern(D) TGTKgtk_adjustment_get_type gtk_adjustment_get_type; -alias extern (C) void function(char *, uint, uint, uint)TGTKgtk_object_add_arg_type; extern(D) TGTKgtk_object_add_arg_type gtk_object_add_arg_type; -alias extern (C) void function(aGtkObject *, char *, ...)TGTKgtk_object_set; extern(D) TGTKgtk_object_set gtk_object_set; -alias extern (C) void function(aGtkObject *, char *, ...)TGTKgtk_object_get; extern(D) TGTKgtk_object_get gtk_object_get; +alias extern (C) void function(in char *, uint, uint, uint)TGTKgtk_object_add_arg_type; extern(D) TGTKgtk_object_add_arg_type gtk_object_add_arg_type; +alias extern (C) void function(aGtkObject *, in char *, ...)TGTKgtk_object_set; extern(D) TGTKgtk_object_set gtk_object_set; +alias extern (C) void function(aGtkObject *, in char *, ...)TGTKgtk_object_get; extern(D) TGTKgtk_object_get gtk_object_get; alias extern (C) void function(aGtkObject *, uint)TGTKgtk_object_remove_no_notify_by_id; extern(D) TGTKgtk_object_remove_no_notify_by_id gtk_object_remove_no_notify_by_id; alias extern (C) void function(aGtkObject *, uint)TGTKgtk_object_remove_data_by_id; extern(D) TGTKgtk_object_remove_data_by_id gtk_object_remove_data_by_id; alias extern (C) void * function(aGtkObject *, uint)TGTKgtk_object_get_data_by_id; extern(D) TGTKgtk_object_get_data_by_id gtk_object_get_data_by_id; @@ -9550,23 +9550,23 @@ alias extern (C) void function(aGtkObject *, uint, void *)TGTKgtk_object_set_data_by_id; extern(D) TGTKgtk_object_set_data_by_id gtk_object_set_data_by_id; alias extern (C) void * function(aGtkObject *)TGTKgtk_object_get_user_data; extern(D) TGTKgtk_object_get_user_data gtk_object_get_user_data; alias extern (C) void function(aGtkObject *, void *)TGTKgtk_object_set_user_data; extern(D) TGTKgtk_object_set_user_data gtk_object_set_user_data; -alias extern (C) void function(aGtkObject *, char *)TGTKgtk_object_remove_no_notify; extern(D) TGTKgtk_object_remove_no_notify gtk_object_remove_no_notify; -alias extern (C) void * function(aGtkObject *, char *)TGTKgtk_object_get_data; extern(D) TGTKgtk_object_get_data gtk_object_get_data; -alias extern (C) void function(aGtkObject *, char *)TGTKgtk_object_remove_data; extern(D) TGTKgtk_object_remove_data gtk_object_remove_data; -alias extern (C) void function(aGtkObject *, char *, void *, _BCD_func__13158)TGTKgtk_object_set_data_full; extern(D) TGTKgtk_object_set_data_full gtk_object_set_data_full; -alias extern (C) void function(aGtkObject *, char *, void *)TGTKgtk_object_set_data; extern(D) TGTKgtk_object_set_data gtk_object_set_data; +alias extern (C) void function(aGtkObject *, in char *)TGTKgtk_object_remove_no_notify; extern(D) TGTKgtk_object_remove_no_notify gtk_object_remove_no_notify; +alias extern (C) void * function(aGtkObject *, in char *)TGTKgtk_object_get_data; extern(D) TGTKgtk_object_get_data gtk_object_get_data; +alias extern (C) void function(aGtkObject *, in char *)TGTKgtk_object_remove_data; extern(D) TGTKgtk_object_remove_data gtk_object_remove_data; +alias extern (C) void function(aGtkObject *, in char *, void *, _BCD_func__13158)TGTKgtk_object_set_data_full; extern(D) TGTKgtk_object_set_data_full gtk_object_set_data_full; +alias extern (C) void function(aGtkObject *, in char *, void *)TGTKgtk_object_set_data; extern(D) TGTKgtk_object_set_data gtk_object_set_data; alias extern (C) void function(aGtkObject *, _BCD_func__13158, void *)TGTKgtk_object_weakunref; extern(D) TGTKgtk_object_weakunref gtk_object_weakunref; alias extern (C) void function(aGtkObject *, _BCD_func__13158, void *)TGTKgtk_object_weakref; extern(D) TGTKgtk_object_weakref gtk_object_weakref; alias extern (C) void function(aGtkObject *)TGTKgtk_object_unref; extern(D) TGTKgtk_object_unref gtk_object_unref; alias extern (C) _GtkObject * function(aGtkObject *)TGTKgtk_object_ref; extern(D) TGTKgtk_object_ref gtk_object_ref; -alias extern (C) _GtkObject * function(uint, char *, ...)TGTKgtk_object_new; extern(D) TGTKgtk_object_new gtk_object_new; +alias extern (C) _GtkObject * function(uint, in char *, ...)TGTKgtk_object_new; extern(D) TGTKgtk_object_new gtk_object_new; alias extern (C) void function(aGtkObject *)TGTKgtk_object_destroy; extern(D) TGTKgtk_object_destroy gtk_object_destroy; alias extern (C) void function(aGtkObject *)TGTKgtk_object_sink; extern(D) TGTKgtk_object_sink gtk_object_sink; alias extern (C) uint function()TGTKgtk_object_get_type; extern(D) TGTKgtk_object_get_type gtk_object_get_type; alias extern (C) extern uint* TGTKgtk_debug_flags; extern(D) TGTKgtk_debug_flags gtk_debug_flags; alias extern (C) void function(int)TGTKgtk_type_init; extern(D) TGTKgtk_type_init gtk_type_init; -alias extern (C) _GFlagsValue * function(uint, char *)TGTKgtk_type_flags_find_value; extern(D) TGTKgtk_type_flags_find_value gtk_type_flags_find_value; -alias extern (C) _GEnumValue * function(uint, char *)TGTKgtk_type_enum_find_value; extern(D) TGTKgtk_type_enum_find_value gtk_type_enum_find_value; +alias extern (C) _GFlagsValue * function(uint, in char *)TGTKgtk_type_flags_find_value; extern(D) TGTKgtk_type_flags_find_value gtk_type_flags_find_value; +alias extern (C) _GEnumValue * function(uint, in char *)TGTKgtk_type_enum_find_value; extern(D) TGTKgtk_type_enum_find_value gtk_type_enum_find_value; alias extern (C) _GFlagsValue * function(uint)TGTKgtk_type_flags_get_values; extern(D) TGTKgtk_type_flags_get_values gtk_type_flags_get_values; alias extern (C) _GEnumValue * function(uint)TGTKgtk_type_enum_get_values; extern(D) TGTKgtk_type_enum_get_values gtk_type_enum_get_values; alias extern (C) void * function(uint)TGTKgtk_type_new; extern(D) TGTKgtk_type_new gtk_type_new; @@ -9692,7 +9692,7 @@ alias extern (C) void function(int)TGTKgtk_accelerator_set_default_mod_mask; extern(D) TGTKgtk_accelerator_set_default_mod_mask gtk_accelerator_set_default_mod_mask; alias extern (C) char * function(uint, int)TGTKgtk_accelerator_get_label; extern(D) TGTKgtk_accelerator_get_label gtk_accelerator_get_label; alias extern (C) char * function(uint, int)TGTKgtk_accelerator_name; extern(D) TGTKgtk_accelerator_name gtk_accelerator_name; -alias extern (C) void function(char *, uint *, int *)TGTKgtk_accelerator_parse; extern(D) TGTKgtk_accelerator_parse gtk_accelerator_parse; +alias extern (C) void function(in char *, uint *, int *)TGTKgtk_accelerator_parse; extern(D) TGTKgtk_accelerator_parse gtk_accelerator_parse; alias extern (C) int function(uint, int)TGTKgtk_accelerator_valid; extern(D) TGTKgtk_accelerator_valid gtk_accelerator_valid; alias extern (C) _GtkAccelGroup * function(_GClosure *)TGTKgtk_accel_group_from_accel_closure; extern(D) TGTKgtk_accel_group_from_accel_closure gtk_accel_group_from_accel_closure; alias extern (C) _GtkAccelKey * function(aGtkAccelGroup *, _BCD_func__13177, void *)TGTKgtk_accel_group_find; extern(D) TGTKgtk_accel_group_find gtk_accel_group_find; @@ -9703,7 +9703,7 @@ alias extern (C) int function(aGtkAccelGroup *, uint, _GObject *, uint, int)TGTKgtk_accel_group_activate; extern(D) TGTKgtk_accel_group_activate gtk_accel_group_activate; alias extern (C) int function(aGtkAccelGroup *, uint, int)TGTKgtk_accel_group_disconnect_key; extern(D) TGTKgtk_accel_group_disconnect_key gtk_accel_group_disconnect_key; alias extern (C) int function(aGtkAccelGroup *, _GClosure *)TGTKgtk_accel_group_disconnect; extern(D) TGTKgtk_accel_group_disconnect gtk_accel_group_disconnect; -alias extern (C) void function(aGtkAccelGroup *, char *, _GClosure *)TGTKgtk_accel_group_connect_by_path; extern(D) TGTKgtk_accel_group_connect_by_path gtk_accel_group_connect_by_path; +alias extern (C) void function(aGtkAccelGroup *, in char *, _GClosure *)TGTKgtk_accel_group_connect_by_path; extern(D) TGTKgtk_accel_group_connect_by_path gtk_accel_group_connect_by_path; alias extern (C) void function(aGtkAccelGroup *, uint, int, int, _GClosure *)TGTKgtk_accel_group_connect; extern(D) TGTKgtk_accel_group_connect gtk_accel_group_connect; alias extern (C) void function(aGtkAccelGroup *)TGTKgtk_accel_group_unlock; extern(D) TGTKgtk_accel_group_unlock gtk_accel_group_unlock; alias extern (C) void function(aGtkAccelGroup *)TGTKgtk_accel_group_lock; extern(D) TGTKgtk_accel_group_lock gtk_accel_group_lock; @@ -13393,7 +13393,7 @@ extern (C) int gtk_text_buffer_insert_interactive(aGtkTextBuffer *, aGtkTextIter *, char *, int, int); extern (C) void gtk_text_buffer_insert_at_cursor(aGtkTextBuffer *, char *, int); extern (C) void gtk_text_buffer_insert(aGtkTextBuffer *, aGtkTextIter *, char *, int); -extern (C) void gtk_text_buffer_set_text(aGtkTextBuffer *, char *, int); +extern (C) void gtk_text_buffer_set_text(aGtkTextBuffer *, in char *, int); extern (C) _GtkTextTagTable * gtk_text_buffer_get_tag_table(aGtkTextBuffer *); extern (C) int gtk_text_buffer_get_char_count(aGtkTextBuffer *); extern (C) int gtk_text_buffer_get_line_count(aGtkTextBuffer *); @@ -13825,8 +13825,8 @@ extern (C) int gtk_print_settings_get_bool(void *, char *); extern (C) void gtk_print_settings_foreach(void *, _BCD_func__9823, void *); extern (C) void gtk_print_settings_unset(void *, char *); -extern (C) void gtk_print_settings_set(void *, char *, char *); -extern (C) char * gtk_print_settings_get(void *, char *); +extern (C) void gtk_print_settings_set(void *, in char *, in char *); +extern (C) char * gtk_print_settings_get(void *, in char *); extern (C) int gtk_print_settings_has_key(void *, char *); extern (C) void gtk_print_settings_to_key_file(void *, void *, char *); extern (C) void * gtk_print_settings_new_from_key_file(void *, char *, _GError * *); @@ -13877,9 +13877,9 @@ extern (C) int gtk_paper_size_is_equal(void *, void *); extern (C) void gtk_paper_size_free(void *); extern (C) void * gtk_paper_size_copy(void *); -extern (C) void * gtk_paper_size_new_custom(char *, char *, double, double, int); -extern (C) void * gtk_paper_size_new_from_ppd(char *, char *, double, double); -extern (C) void * gtk_paper_size_new(char *); +extern (C) void * gtk_paper_size_new_custom(in char *, in char *, double, double, int); +extern (C) void * gtk_paper_size_new_from_ppd(in char *, in char *, double, double); +extern (C) void * gtk_paper_size_new(in char *); extern (C) uint gtk_paper_size_get_type(); extern (C) void gtk_preview_reset(); extern (C) _GtkPreviewInfo * gtk_preview_get_info(); @@ -14095,7 +14095,7 @@ extern (C) void gtk_exit(int); extern (C) void * gtk_get_option_group(int); extern (C) int gtk_init_with_args(int *, char * * *, char *, _GOptionEntry *, char *, _GError * *); -extern (C) int gtk_init_check(int *, char * * *); +extern (C) int gtk_init_check(int *, in char * * *); extern (C) void gtk_init(int *, char * * *); extern (C) int gtk_parse_args(int *, char * * *); extern (C) char * gtk_check_version(uint, uint, uint); @@ -14317,10 +14317,10 @@ extern (C) int gtk_icon_size_register(char *, int, int); extern (C) int gtk_icon_size_lookup_for_settings(aGtkSettings *, int, int *, int *); extern (C) int gtk_icon_size_lookup(int, int *, int *); -extern (C) void * gtk_icon_factory_lookup_default(char *); +extern (C) void * gtk_icon_factory_lookup_default(in char *); extern (C) void gtk_icon_factory_remove_default(aGtkIconFactory *); extern (C) void gtk_icon_factory_add_default(aGtkIconFactory *); -extern (C) void * gtk_icon_factory_lookup(aGtkIconFactory *, char *); +extern (C) void * gtk_icon_factory_lookup(aGtkIconFactory *, in char *); extern (C) void gtk_icon_factory_add(aGtkIconFactory *, char *, void *); extern (C) _GtkIconFactory * gtk_icon_factory_new(); extern (C) uint gtk_icon_factory_get_type(); @@ -14414,7 +14414,7 @@ extern (C) _GtkWidget * gtk_file_chooser_widget_new(int); extern (C) uint gtk_file_chooser_widget_get_type(); extern (C) _GtkWidget * gtk_file_chooser_dialog_new_with_backend(char *, aGtkWindow *, int, char *, char *, ...); -extern (C) _GtkWidget * gtk_file_chooser_dialog_new(char *, aGtkWindow *, int, char *, ...); +extern (C) _GtkWidget * gtk_file_chooser_dialog_new(in char *, aGtkWindow *, int, in char *, ...); extern (C) uint gtk_file_chooser_dialog_get_type(); extern (C) void gtk_file_chooser_button_set_focus_on_click(aGtkFileChooserButton *, int); extern (C) int gtk_file_chooser_button_get_focus_on_click(aGtkFileChooserButton *); @@ -14758,7 +14758,7 @@ extern (C) void gtk_entry_get_layout_offsets(aGtkEntry *, int *, int *); extern (C) void * gtk_entry_get_layout(aGtkEntry *); extern (C) char * gtk_entry_get_text(aGtkEntry *); -extern (C) void gtk_entry_set_text(aGtkEntry *, char *); +extern (C) void gtk_entry_set_text(aGtkEntry *, in char *); extern (C) int gtk_entry_get_width_chars(aGtkEntry *); extern (C) void gtk_entry_set_width_chars(aGtkEntry *, int); extern (C) int gtk_entry_get_activates_default(aGtkEntry *); @@ -14857,7 +14857,7 @@ extern (C) void gtk_editable_cut_clipboard(void *); extern (C) char * gtk_editable_get_chars(void *, int, int); extern (C) void gtk_editable_delete_text(void *, int, int); -extern (C) void gtk_editable_insert_text(void *, char *, int, int *); +extern (C) void gtk_editable_insert_text(void *, in char *, int, int *); extern (C) int gtk_editable_get_selection_bounds(void *, int *, int *); extern (C) void gtk_editable_select_region(void *, int, int); extern (C) uint gtk_editable_get_type(); @@ -15803,7 +15803,7 @@ extern (C) void gtk_label_set_ellipsize(aGtkLabel *, int); extern (C) int gtk_label_get_justify(aGtkLabel *); extern (C) void gtk_label_set_justify(aGtkLabel *, int); -extern (C) void gtk_label_set_text_with_mnemonic(aGtkLabel *, char *); +extern (C) void gtk_label_set_text_with_mnemonic(aGtkLabel *, in char *); extern (C) _GtkWidget * gtk_label_get_mnemonic_widget(aGtkLabel *); extern (C) void gtk_label_set_mnemonic_widget(aGtkLabel *, aGtkWidget *); extern (C) uint gtk_label_get_mnemonic_keyval(aGtkLabel *); @@ -16107,7 +16107,7 @@ extern (C) _GdkColormap * gtk_widget_get_default_colormap(); extern (C) _GtkStyle * gtk_widget_get_default_style(); extern (C) void gtk_widget_set_default_colormap(_GdkColormap *); -extern (C) void gtk_widget_style_get(aGtkWidget *, char *, ...); +extern (C) void gtk_widget_style_get(aGtkWidget *, in char *, ...); extern (C) void gtk_widget_style_get_valist(aGtkWidget *, char *, char *); extern (C) void gtk_widget_style_get_property(aGtkWidget *, char *, _GValue *); extern (C) _GParamSpec * * gtk_widget_class_list_style_properties(aGtkWidgetClass *, uint *);
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/c/pango.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/c/pango.d Fri Mar 27 19:58:06 2009 +0100 @@ -673,7 +673,7 @@ extern (C) void function(void *, char *, int, uint, uint *)pango_layout_set_markup_with_accel; extern (C) void function(void *, char *, int)pango_layout_set_markup; extern (C) char * function(void *)pango_layout_get_text; -extern (C) void function(void *, char *, int)pango_layout_set_text; +extern (C) void function(void *, in char *, int)pango_layout_set_text; extern (C) void * function(void *)pango_layout_get_attributes; extern (C) void function(void *, void *)pango_layout_set_attributes; extern (C) void * function(void *)pango_layout_get_context; @@ -1375,7 +1375,7 @@ extern (C) void pango_layout_set_markup_with_accel(void *, char *, int, uint, uint *); extern (C) void pango_layout_set_markup(void *, char *, int); extern (C) char * pango_layout_get_text(void *); -extern (C) void pango_layout_set_text(void *, char *, int); +extern (C) void pango_layout_set_text(void *, in char *, int); extern (C) void * pango_layout_get_attributes(void *); extern (C) void pango_layout_set_attributes(void *, void *); extern (C) void * pango_layout_get_context(void *);
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/gtk/OS.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/gtk/OS.d Fri Mar 27 19:58:06 2009 +0100 @@ -28,6 +28,7 @@ } else { // Phobos import std.traits; import core.sys.posix.stdlib : realpath; + import std.c.locale; static import std.c.string; } @@ -64,34 +65,35 @@ public alias org.eclipse.swt.internal.c.glib_object.GSignalInvocationHint GSignalInvocationHint; public alias org.eclipse.swt.internal.c.glib_object.GValue GValue; +public alias org.eclipse.swt.internal.c.gdk.GdkBitmap GdkBitmap; public alias org.eclipse.swt.internal.c.gdk.GdkColor GdkColor; -public alias org.eclipse.swt.internal.c.gdk.GdkRegion GdkRegion; +public alias org.eclipse.swt.internal.c.gdk.GdkCursor GdkCursor; +public alias org.eclipse.swt.internal.c.gdk.GdkDisplay GdkDisplay; +public alias org.eclipse.swt.internal.c.gdk.GdkDragContext GdkDragContext; public alias org.eclipse.swt.internal.c.gdk.GdkDrawable GdkDrawable; -public alias org.eclipse.swt.internal.c.gdk.GdkGC GdkGC; -public alias org.eclipse.swt.internal.c.gdk.GdkPixbuf GdkPixbuf; -public alias org.eclipse.swt.internal.c.gdk.GdkCursor GdkCursor; public alias org.eclipse.swt.internal.c.gdk.GdkEvent GdkEvent; -public alias org.eclipse.swt.internal.c.gdk.GdkEventKey GdkEventKey; -public alias org.eclipse.swt.internal.c.gdk.GdkWindow GdkWindow; +public alias org.eclipse.swt.internal.c.gdk.GdkEventAny GdkEventAny; public alias org.eclipse.swt.internal.c.gdk.GdkEventButton GdkEventButton; -public alias org.eclipse.swt.internal.c.gdk.GdkRectangle GdkRectangle; +public alias org.eclipse.swt.internal.c.gdk.GdkEventCrossing GdkEventCrossing; public alias org.eclipse.swt.internal.c.gdk.GdkEventExpose GdkEventExpose; -public alias org.eclipse.swt.internal.c.gdk.GdkEventCrossing GdkEventCrossing; +public alias org.eclipse.swt.internal.c.gdk.GdkEventFocus GdkEventFocus; +public alias org.eclipse.swt.internal.c.gdk.GdkEventKey GdkEventKey; public alias org.eclipse.swt.internal.c.gdk.GdkEventMotion GdkEventMotion; public alias org.eclipse.swt.internal.c.gdk.GdkEventScroll GdkEventScroll; public alias org.eclipse.swt.internal.c.gdk.GdkEventVisibility GdkEventVisibility; -public alias org.eclipse.swt.internal.c.gdk.GdkXEvent GdkXEvent; -public alias org.eclipse.swt.internal.c.gdk.GdkPoint GdkPoint; -public alias org.eclipse.swt.internal.c.gdk.GdkPixmap GdkPixmap; -public alias org.eclipse.swt.internal.c.gdk.GdkBitmap GdkBitmap; +public alias org.eclipse.swt.internal.c.gdk.GdkEventWindowState GdkEventWindowState; +public alias org.eclipse.swt.internal.c.gdk.GdkGC GdkGC; public alias org.eclipse.swt.internal.c.gdk.GdkGCValues GdkGCValues; -public alias org.eclipse.swt.internal.c.gdk.GdkDisplay GdkDisplay; +public alias org.eclipse.swt.internal.c.gdk.GdkGeometry GdkGeometry; public alias org.eclipse.swt.internal.c.gdk.GdkImage GdkImage; -public alias org.eclipse.swt.internal.c.gdk.GdkEventAny GdkEventAny; -public alias org.eclipse.swt.internal.c.gdk.GdkEventFocus GdkEventFocus; +public alias org.eclipse.swt.internal.c.gdk.GdkPixbuf GdkPixbuf; +public alias org.eclipse.swt.internal.c.gdk.GdkPixmap GdkPixmap; +public alias org.eclipse.swt.internal.c.gdk.GdkPoint GdkPoint; +public alias org.eclipse.swt.internal.c.gdk.GdkRectangle GdkRectangle; +public alias org.eclipse.swt.internal.c.gdk.GdkRegion GdkRegion; +public alias org.eclipse.swt.internal.c.gdk.GdkWindow GdkWindow; public alias org.eclipse.swt.internal.c.gdk.GdkWindowAttr GdkWindowAttr; -public alias org.eclipse.swt.internal.c.gdk.GdkEventWindowState GdkEventWindowState; -public alias org.eclipse.swt.internal.c.gdk.GdkDragContext GdkDragContext; +public alias org.eclipse.swt.internal.c.gdk.GdkXEvent GdkXEvent; public alias org.eclipse.swt.internal.c.pango.PangoAttrColor PangoAttrColor; public alias org.eclipse.swt.internal.c.pango.PangoAttribute PangoAttribute; @@ -535,40 +537,40 @@ // function with variadic argument list -private void gtk_widget_style_get1( GtkWidget* widget, char* firstPropertyName, int* res ){ +private void gtk_widget_style_get1( GtkWidget* widget, in char* firstPropertyName, int* res ){ gtk_widget_style_get( widget, firstPropertyName, res, null ); } // function with variadic argument list -private void g_object_get1( void* obj, char* firstPropertyName, int* res ){ +private void g_object_get1( void* obj, in char* firstPropertyName, int* res ){ g_object_get( obj, firstPropertyName, res, null ); } -private void g_object_set1( void* obj, char* firstPropertyName, int value ){ +private void g_object_set1( void* obj, in char* firstPropertyName, int value ){ g_object_set( obj, firstPropertyName, value, null ); } -private void g_object_set1_float( void* obj, char* firstPropertyName, float value ){ +private void g_object_set1_float( void* obj, in char* firstPropertyName, float value ){ g_object_set( obj, firstPropertyName, value, null ); } -private void g_signal_emit_by_name0( void* instance, char* detailed_signal ){ +private void g_signal_emit_by_name0( void* instance, in char* detailed_signal ){ g_signal_emit_by_name( instance, detailed_signal ); } -private void g_signal_emit_by_name1( void* instance, char* detailed_signal, int value ){ +private void g_signal_emit_by_name1( void* instance, in char* detailed_signal, int value ){ g_signal_emit_by_name( instance, detailed_signal, value ); } -private void g_signal_emit_by_name2( void* instance, char* detailed_signal, int value1, int value2 ){ +private void g_signal_emit_by_name2( void* instance, in char* detailed_signal, int value1, int value2 ){ g_signal_emit_by_name( instance, detailed_signal, value1, value2 ); } -private void g_signal_emit_by_name3( void* instance, char* detailed_signal, int value1, int value2, int value3 ){ +private void g_signal_emit_by_name3( void* instance, in char* detailed_signal, int value1, int value2, int value3 ){ g_signal_emit_by_name( instance, detailed_signal, value1, value2, value3 ); } private void gdk_pixbuf_save_to_buffer0(GdkPixbuf *pixbuf, char **buffer, uint *buffer_size, - char *type, GError **error ){ + in char *type, GError **error ){ gdk_pixbuf_save_to_buffer( pixbuf, buffer, buffer_size, type, error ); } @@ -583,10 +585,10 @@ private void gtk_tree_store_set1(void* tree_store, GtkTreeIter *iter, int column, void* value ){ gtk_tree_store_set( tree_store, iter, column, value, -1 ); } -private void gtk_cell_layout_set_attributes1( void *cell_layout, void* cell, void* key, void* value ){ +private void gtk_cell_layout_set_attributes1( void *cell_layout, void* cell, in void* key, void* value ){ gtk_cell_layout_set_attributes( cast(GtkCellLayout *)cell_layout, cast(GtkCellRenderer*)cell, key, value, null ); } -GtkWidget * gtk_file_chooser_dialog_new2(char * title, aGtkWindow * parent, int action, char * btn0_text, int btn0_id, char * btn1_text, int btn1_id ){ +GtkWidget * gtk_file_chooser_dialog_new2(in char * title, aGtkWindow * parent, int action, in char * btn0_text, int btn0_id, in char * btn1_text, int btn1_id ){ return gtk_file_chooser_dialog_new( title, parent, action, btn0_text, btn0_id, btn1_text, btn1_id, null ); } // for linux always true, the other possibility would be GDK_WINDOWING_WIN32 @@ -599,7 +601,7 @@ } // macro -int g_signal_connect( void* instance, char* sig, GCallback handle, void* ptr ){ +int g_signal_connect( void* instance, in char* sig, GCallback handle, void* ptr ){ return g_signal_connect_data( instance, sig, handle, ptr, cast(GClosureNotify) 0, cast(GConnectFlags)0 ); } // macro @@ -617,7 +619,7 @@ // fontconfig.h struct FcConfig{}; -private extern(C) int FcConfigAppFontAddFile (FcConfig *config, char *file); +private extern(C) int FcConfigAppFontAddFile (FcConfig *config, in char *file); template NameOfFunc(alias f) { @@ -2452,14 +2454,14 @@ Utility methods -- conversions of gtk macros **************************************************************************/ - static gulong g_signal_connect( gpointer arg0, gchar* arg1, GCallback arg2, gpointer arg3 ) + static gulong g_signal_connect( gpointer arg0, in gchar* arg1, GCallback arg2, gpointer arg3 ) { lock.lock(); scope(exit) lock.unlock(); return g_signal_connect_data (arg0, arg1, arg2, arg3, null , cast(GConnectFlags) 0) ; } - static gulong g_signal_connect_after( gpointer arg0, gchar* arg1, GCallback arg2, gpointer arg3 ) + static gulong g_signal_connect_after( gpointer arg0, in gchar* arg1, GCallback arg2, gpointer arg3 ) { lock.lock(); scope(exit) lock.unlock(); @@ -2586,14 +2588,14 @@ { lock.lock(); scope(exit) lock.unlock(); - return "gtk-cancel"; + return cast(char*)"gtk-cancel".ptr; } static char* GTK_STOCK_OK() { lock.lock(); scope(exit) lock.unlock(); - return "gtk-ok"; + return cast(char*)"gtk-ok".ptr; } static GType GTK_TYPE_CELL_RENDERER_TEXT() @@ -3002,6 +3004,13 @@ } } //localeconv_decimal_point() localeconv()->decimal_point + static void* memmove( void* trg, in void* src, int len ){ + version(Tango){ + return tango.stdc.string.memmove( trg, src, len ); + } else { // Phobos + return std.c.string.memmove( trg, src, len ); + } + } }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/GIFFileFormat.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/GIFFileFormat.d Fri Mar 27 19:58:06 2009 +0100 @@ -39,8 +39,8 @@ static const int GIF_EXTENSION_BLOCK_ID = 0x21; static const int GIF_IMAGE_BLOCK_ID = 0x2C; static const int GIF_TRAILER_ID = 0x3B; - static const byte[] GIF89a = cast(byte[])"GIF89a"; - static const byte[] NETSCAPE2_0 = cast(byte[])"NETSCAPE2.0"; + static /+const+/ byte[] GIF89a = cast(byte[])"GIF89a"; + static /+const+/ byte[] NETSCAPE2_0 = cast(byte[])"NETSCAPE2.0"; /** * Answer a palette containing numGrays
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGDecoder.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGDecoder.d Fri Mar 27 19:58:06 2009 +0100 @@ -23,8 +23,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } public class JPEGDecoder {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngChunk.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngChunk.d Fri Mar 27 19:58:06 2009 +0100 @@ -44,13 +44,13 @@ // Non-critical chunks. static const int CHUNK_tRNS = 5; - static const byte[] TYPE_IHDR = cast(byte[])"IHDR";//{(byte) 'I', (byte) 'H', (byte) 'D', (byte) 'R'}; - static const byte[] TYPE_PLTE = cast(byte[])"PLTE";//{(byte) 'P', (byte) 'L', (byte) 'T', (byte) 'E'}; - static const byte[] TYPE_IDAT = cast(byte[])"IDAT";//{(byte) 'I', (byte) 'D', (byte) 'A', (byte) 'T'}; - static const byte[] TYPE_IEND = cast(byte[])"IEND";//{(byte) 'I', (byte) 'E', (byte) 'N', (byte) 'D'}; - static const byte[] TYPE_tRNS = cast(byte[])"tRNS";//{(byte) 't', (byte) 'R', (byte) 'N', (byte) 'S'}; + static /+const+/ byte[] TYPE_IHDR = cast(byte[])"IHDR";//{(byte) 'I', (byte) 'H', (byte) 'D', (byte) 'R'}; + static /+const+/ byte[] TYPE_PLTE = cast(byte[])"PLTE";//{(byte) 'P', (byte) 'L', (byte) 'T', (byte) 'E'}; + static /+const+/ byte[] TYPE_IDAT = cast(byte[])"IDAT";//{(byte) 'I', (byte) 'D', (byte) 'A', (byte) 'T'}; + static /+const+/ byte[] TYPE_IEND = cast(byte[])"IEND";//{(byte) 'I', (byte) 'E', (byte) 'N', (byte) 'D'}; + static /+const+/ byte[] TYPE_tRNS = cast(byte[])"tRNS";//{(byte) 't', (byte) 'R', (byte) 'N', (byte) 'S'}; - static const int[] CRC_TABLE; + static int[] CRC_TABLE; //public static void static_this() { static this() { CRC_TABLE = new int[256];
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngDeflater.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngDeflater.d Fri Mar 27 19:58:06 2009 +0100 @@ -122,8 +122,8 @@ } -static const Code lengthCodes[]; -static const Code distanceCodes[]; +static /+const+/ Code lengthCodes[]; +static /+const+/ Code distanceCodes[]; static this() { lengthCodes = [
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/mozilla/nsStringAPI.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/mozilla/nsStringAPI.d Fri Mar 27 19:58:06 2009 +0100 @@ -95,9 +95,9 @@ return buffer[0 .. len].dup; } - static char[] toString( nsAString* str ) + static String toString( nsAString* str ) { - return Utf.toString( nsAString.toString16( str ) ); + return String_valueOf( nsAString.toString16( str ) ); } private:
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FillLayout.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FillLayout.d Fri Mar 27 19:58:06 2009 +0100 @@ -23,8 +23,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormData.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormData.d Fri Mar 27 19:58:06 2009 +0100 @@ -20,8 +20,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormLayout.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormLayout.d Fri Mar 27 19:58:06 2009 +0100 @@ -24,8 +24,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridData.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridData.d Fri Mar 27 19:58:06 2009 +0100 @@ -18,8 +18,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridLayout.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridLayout.d Fri Mar 27 19:58:06 2009 +0100 @@ -24,8 +24,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/RowData.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/RowData.d Fri Mar 27 19:58:06 2009 +0100 @@ -18,8 +18,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/RowLayout.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/RowLayout.d Fri Mar 27 19:58:06 2009 +0100 @@ -21,8 +21,9 @@ import org.eclipse.swt.layout.RowData; import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/opengl/GLData.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/opengl/GLData.d Fri Mar 27 19:58:06 2009 +0100 @@ -16,9 +16,10 @@ import java.lang.all; version(Tango){ -import tango.text.Util; -import tango.util.Convert; + import tango.text.Util; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/printing/PrintDialog.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/printing/PrintDialog.d Fri Mar 27 19:58:06 2009 +0100 @@ -27,8 +27,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /** @@ -397,7 +398,7 @@ printToFile = ( data.name.equals("Print to File")); //$NON-NLS-1$ if (printToFile) { auto address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI.ptr); - data.fileName = fromStringz( address).dup; + data.fileName = fromStringz( address)._idup(); } data.scope_ = scope_; @@ -444,7 +445,7 @@ } void GtkPrintSettingsMeth (char* key, char* value) { - store( fromStringz(key).dup, fromStringz(value).dup ); + store( fromStringz(key)._idup(), fromStringz(value)._idup() ); } void store(String key, int value) { @@ -460,10 +461,10 @@ } void storeBytes(String key, char* value) { - store(key, fromStringz(value).dup ); + store(key, fromStringz(value)._idup() ); } -void store(char [] key, String value) { +void store(String key, String value) { int length = key.length + 1 + value.length + 1; if (index + length + 1 > settingsData.length) { char [] newData = new char[settingsData.length + Math.max(length + 1, 1024)];
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/printing/Printer.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/printing/Printer.d Fri Mar 27 19:58:06 2009 +0100 @@ -29,8 +29,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } @@ -181,10 +182,10 @@ static PrinterData printerDataFromGtkPrinter(GtkPrinter* printer) { auto backend = OS.gtk_printer_get_backend(printer); auto address = OS.G_OBJECT_TYPE_NAME(backend); - String backendType = fromStringz( address ).dup; + String backendType = fromStringz( address )._idup(); address = OS.gtk_printer_get_name (printer); - String name = fromStringz( address ).dup; + String name = fromStringz( address )._idup(); return new PrinterData (backendType, name); } @@ -193,7 +194,7 @@ * Restore printer settings and page_setup data from data. */ static void restore(char[] data, GtkPrintSettings* settings, GtkPageSetup* page_setup) { - settingsData = data; + settingsData = data._idup(); start = end = 0; while (end < settingsData.length && settingsData[end] !is 0) { start = end; @@ -219,9 +220,9 @@ OS.gtk_page_setup_set_bottom_margin(page_setup, restoreDouble("bottom_margin"), OS.GTK_UNIT_MM); //$NON-NLS-1$ OS.gtk_page_setup_set_left_margin(page_setup, restoreDouble("left_margin"), OS.GTK_UNIT_MM); //$NON-NLS-1$ OS.gtk_page_setup_set_right_margin(page_setup, restoreDouble("right_margin"), OS.GTK_UNIT_MM); //$NON-NLS-1$ - char [] name = restoreBytes("paper_size_name", true); //$NON-NLS-1$ - char [] display_name = restoreBytes("paper_size_display_name", true); //$NON-NLS-1$ - char [] ppd_name = restoreBytes("paper_size_ppd_name", true); //$NON-NLS-1$ + String name = restoreBytes("paper_size_name", true); //$NON-NLS-1$ + String display_name = restoreBytes("paper_size_display_name", true); //$NON-NLS-1$ + String ppd_name = restoreBytes("paper_size_ppd_name", true); //$NON-NLS-1$ double width = restoreDouble("paper_size_width"); //$NON-NLS-1$ double height = restoreDouble("paper_size_height"); //$NON-NLS-1$ bool custom = restoreBoolean("paper_size_is_custom"); //$NON-NLS-1$ @@ -309,18 +310,18 @@ } static int restoreInt(String key) { - char [] value = restoreBytes(key, false); - return to!(int)( value ); + String value = restoreBytes(key, false); + return Integer.parseInt( value ); } static double restoreDouble(String key) { - char [] value = restoreBytes(key, false); - return to!(double)( value ); + String value = restoreBytes(key, false); + return Double.parseDouble( value ); } static bool restoreBoolean(String key) { - char [] value = restoreBytes(key, false); - return to!(bool)( value ); + String value = restoreBytes(key, false); + return Boolean.getBoolean( value ); } static String restoreBytes(String key, bool nullTerminate) { @@ -342,7 +343,7 @@ if (DEBUG) getDwtLogger().info( __FILE__, __LINE__, "{}: {}", keyBuffer, valueBuffer ); - return valueBuffer; + return cast(String)valueBuffer; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/program/Program.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/program/Program.d Fri Mar 27 19:58:06 2009 +0100 @@ -785,7 +785,7 @@ version(Tango){ bool contains = extensions.contains(mimeExts[index]); } else { // Phobos - bool contains = std.algorithm.find(extensions, mimeExts[index]) != std.iterator.end(extension); + bool contains = std.algorithm.find(extensions, mimeExts[index]) != std.iterator.end(extensions); } if (!contains) { extensions ~= mimeExts[index];
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Combo.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Combo.d Fri Mar 27 19:58:06 2009 +0100 @@ -1045,7 +1045,7 @@ if (entryHandle !is null) { auto str = OS.gtk_entry_get_text (entryHandle); if (str is null) return ""; - return fromStringz(str).dup; + return fromStringz(str)._idup(); } else { int index = OS.gtk_combo_box_get_active (handle); return index !is -1 ? getItem (index) : ""; @@ -1167,7 +1167,7 @@ } else { if (!ignoreSelect) { auto ptr = OS.gtk_entry_get_text (entryHandle); - String text = fromStringz(ptr).dup; + String text = fromStringz(ptr)._idup(); for (int i = 0; i < items.length; i++) { if (items [i] ==/*eq*/ text) { postEvent (SWT.Selection); @@ -1324,7 +1324,7 @@ } if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; if (new_text is null || new_text_length is 0) return 0; - String oldText = new_text[0..new_text_length]; + String oldText = new_text[0..new_text_length]._idup(); int pos; pos = position; if (pos is -1) {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Composite.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Composite.d Fri Mar 27 19:58:06 2009 +0100 @@ -28,7 +28,7 @@ import org.eclipse.swt.graphics.GC; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Region; -import org.eclipse.swt.internal.cairo.Cairo; +import org.eclipse.swt.internal.cairo.Cairo : Cairo; import org.eclipse.swt.internal.gtk.OS; import org.eclipse.swt.graphics.Rectangle; import java.lang.all;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/DateTime.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/DateTime.d Fri Mar 27 19:58:06 2009 +0100 @@ -34,15 +34,16 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; -static import tango.text.Util; -//static import tango.text.locale.Core; -static import tango.time.Time; -static import tango.time.WallClock; -static import tango.time.chrono.Gregorian; -static import tango.time.chrono.Calendar; + static import tango.text.Util; + //static import tango.text.locale.Core; + static import tango.time.Time; + static import tango.time.WallClock; + static import tango.time.chrono.Gregorian; + static import tango.time.chrono.Calendar; } else { // Phobos + import std.conv; } @@ -85,15 +86,19 @@ } public this(){ - tango.time.Time.Time time = tango.time.WallClock.WallClock.now(); - tango.time.Time.TimeSpan span = time.time.span; - this.second = span.seconds % 60; - this.minute = span.minutes % 60; - this.hour = span.hours; - auto greg = tango.time.chrono.Gregorian.Gregorian.generic; - this.dayofmonth = greg.getDayOfMonth( time ); - this.month = greg.getMonth( time ); - this.year = greg.getYear( time ); + version(Tango){ + tango.time.Time.Time time = tango.time.WallClock.WallClock.now(); + tango.time.Time.TimeSpan span = time.time.span; + this.second = span.seconds % 60; + this.minute = span.minutes % 60; + this.hour = span.hours; + auto greg = tango.time.chrono.Gregorian.Gregorian.generic; + this.dayofmonth = greg.getDayOfMonth( time ); + this.month = greg.getMonth( time ); + this.year = greg.getYear( time ); + } else { // Phobos + implMissing( __FILE__, __LINE__ ); + } } int getActualMaximum(int field){ switch( field ){ @@ -916,8 +921,8 @@ } if (characterCount > 0) { try { - to!(int)(newText); - } catch (ConversionException ex) { + Integer.parseInt(newText); + } catch (NumberFormatException ex) { return; } String value = text.getText(start, end - 1); @@ -1347,8 +1352,8 @@ int unformattedIntValue(int fieldName, String newText, bool adjust, int max) { int newValue; try { - newValue = to!(int)(newText); - } catch (ConversionException ex) { + newValue = Integer.parseInt(newText); + } catch (NumberFormatException ex) { return -1; } if (fieldName is Calendar.MONTH && adjust) {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/DirectoryDialog.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/DirectoryDialog.d Fri Mar 27 19:58:06 2009 +0100 @@ -219,7 +219,7 @@ auto utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, &items_written, null); OS.g_free (path); if (utf8Ptr !is null) { - answer = utf8Ptr[ 0 .. items_written ].dup; + answer = utf8Ptr[ 0 .. items_written ]._idup(); filterPath = answer; OS.g_free (utf8Ptr); } @@ -293,13 +293,13 @@ uint items_written; char* utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, &items_written, null); if (utf8Ptr !is null) { - String osAnswer = utf8Ptr[ 0 .. items_written ]; + String osAnswer = utf8Ptr[ 0 .. items_written ]._idup(); if (osAnswer.length !is 0) { /* remove trailing separator, unless root directory */ if ( osAnswer != SEPARATOR && osAnswer[ $-1 .. $ ] == SEPARATOR ) { osAnswer = osAnswer[ 0 .. $ - 1 ]; } - answer = filterPath = osAnswer.dup; + answer = filterPath = osAnswer._idup(); } OS.g_free (utf8Ptr); } @@ -322,7 +322,7 @@ * @param string the filter path */ public void setFilterPath (String string) { - filterPath = string.dup; + filterPath = string._idup(); } /** * Sets the dialog's message, which is a description of @@ -335,6 +335,6 @@ public void setMessage (String string) { // SWT extension: allow null for zero length string //if (string is null) error (SWT.ERROR_NULL_ARGUMENT); - message = string.dup; + message = string._idup(); } }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Display.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Display.d Fri Mar 27 19:58:06 2009 +0100 @@ -820,11 +820,11 @@ flushRect.height = exposeEvent.height; OS.gdk_window_invalidate_rect (window, flushRect, true); exposeEvent.type = -1; - memmove (xEvent, exposeEvent, XExposeEvent.sizeof); + OS.memmove (xEvent, exposeEvent, XExposeEvent.sizeof); break; } case OS.VisibilityNotify: { - memmove (visibilityEvent, xEvent, XVisibilityEvent.sizeof); + OS.memmove (visibilityEvent, xEvent, XVisibilityEvent.sizeof); GtkWidget* handle; OS.gdk_window_get_user_data (window, cast(void**) & handle); Widget widget = handle !is null ? getWidget (handle) : null; @@ -930,8 +930,8 @@ } OS.gtk_set_locale(); int cnt = 2; - char*[] args = [ "name".ptr, "--sync".ptr, null ]; - char** a = args.ptr; + CCharPtr[] args = [ "name".ptr, "--sync".ptr, null ]; + CCharPtr* a = args.ptr; if (!OS.gtk_init_check (&cnt, &a )) { } assert( cnt is 1 ); @@ -1025,7 +1025,7 @@ bool hasAlpha = cast(bool)OS.gdk_pixbuf_get_has_alpha (pixbuf); char* pixels = OS.gdk_pixbuf_get_pixels (pixbuf); byte [] data = new byte [stride * height]; - memmove (data.ptr, pixels, data.length); + OS.memmove (data.ptr, pixels, data.length); OS.g_object_unref (pixbuf); ImageData imageData = null; if (hasAlpha) { @@ -1069,15 +1069,15 @@ byte[] maskLine = new byte[maskStride]; for (int y=0; y<h; y++) { auto offset = pixels + (y * stride); - memmove(line.ptr, offset, stride); + OS.memmove(line.ptr, offset, stride); auto maskOffset = maskPixels + (y * maskStride); - memmove(maskLine.ptr, maskOffset, maskStride); + OS.memmove(maskLine.ptr, maskOffset, maskStride); for (int x=0; x<w; x++) { if (maskLine[x * 3] is 0) { line[x * 4 + 3] = 0; } } - memmove(offset, line.ptr, stride); + OS.memmove(offset, line.ptr, stride); } OS.g_object_unref(maskPixbuf); } else { @@ -1093,11 +1093,11 @@ byte [] line = new byte [stride]; for (int y = 0; y < h; y++) { auto offset = pixels + (y * stride); - memmove (line.ptr, offset, stride); + OS.memmove (line.ptr, offset, stride); for (int x = 0; x < w; x++) { line [x*4+3] = alpha [y*w+x]; } - memmove (offset, line.ptr, stride); + OS.memmove (offset, line.ptr, stride); } } } @@ -2555,7 +2555,7 @@ auto screen = OS.gdk_screen_get_default (); if (screen !is null) { auto ptr2 = OS.gdk_x11_screen_get_window_manager_name (screen); - windowManager = fromStringz( ptr2 ); + windowManager = fromStringz( ptr2 )._idup(); } } } @@ -3737,7 +3737,7 @@ PangoAttrList* pangoAttrs; auto imHandle = control.imHandle (); OS.gtk_im_context_get_preedit_string (imHandle, &preeditString, &pangoAttrs, null); - if (preeditString !is null && strlen (preeditString) > 0) { + if (preeditString !is null && OS.strlen (preeditString) > 0) { Control widget = control.findBackgroundControl (); if (widget is null) widget = control; OS.gtk_widget_modify_bg (cast(GtkWidget*)preeditWindow, OS.GTK_STATE_NORMAL, widget.getBackgroundColor ());
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/FileDialog.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/FileDialog.d Fri Mar 27 19:58:06 2009 +0100 @@ -123,9 +123,9 @@ char* utf8Ptr = OS.g_filename_to_utf8 (name, -1, null, &items_written, null); OS.g_free (name); if (utf8Ptr !is null) { - fullPath = utf8Ptr[ 0 .. items_written ].dup; + fullPath = utf8Ptr[ 0 .. items_written ]._idup(); int start = fullPath.lastIndexOf( SEPARATOR); - fileNames [writePos++] = fullPath[ start + 1 .. $ ].dup; + fileNames [writePos++] = fullPath[ start + 1 .. $ ]._idup(); OS.g_free (utf8Ptr); } current = OS.g_slist_next (current); @@ -143,7 +143,7 @@ auto utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, &items_written, null); OS.g_free (path); if (utf8Ptr !is null) { - fullPath = utf8Ptr[ 0 .. items_written ].dup; + fullPath = utf8Ptr[ 0 .. items_written ]._idup(); fileNames = new String [1]; int start = fullPath.lastIndexOf( SEPARATOR); fileNames[0] = fullPath[ start + 1 .. $ ]; @@ -156,7 +156,7 @@ if (filter !is null) { auto filterNamePtr = OS.gtk_file_filter_get_name (filter); if (filterNamePtr !is null) { - String filterName = fromStringz(filterNamePtr).dup; + String filterName = fromStringz(filterNamePtr)._idup(); //OS.g_free (filterNamePtr); //GTK owns this pointer - do not free for (int i = 0; i < filterExtensions.length; i++) { if (filterNames.length > 0) { @@ -185,7 +185,7 @@ GtkFileSelection* selection = cast(GtkFileSelection*)handle; auto entry = selection.selection_entry; auto entryText = OS.gtk_entry_get_text (entry); - String txt = fromStringz( entryText ); + String txt = fromStringz( entryText )._idup(); if (txt.length is 0) { auto fileList = selection.file_list; auto listSelection = OS.gtk_tree_view_get_selection (fileList); @@ -215,7 +215,7 @@ auto fileNamePtr = OS.gtk_file_selection_get_filename (handle); uint items_written; auto utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, &items_written, null); - String osAnswer = utf8Ptr[ 0 .. items_written ].dup; + String osAnswer = utf8Ptr[ 0 .. items_written ]._idup(); OS.g_free (utf8Ptr); if (osAnswer.length is 0) return null; @@ -239,9 +239,9 @@ fileNames = new String[](length_); for (int i = 0; i < length_; i++) { utf8Ptr = OS.g_filename_to_utf8 (namesPtr [i], -1, null, &items_written, null); - String name = utf8Ptr[ 0 .. items_written ].dup; + String name = utf8Ptr[ 0 .. items_written ]._idup(); int start = name.lastIndexOf( SEPARATOR); - fileNames [i] = name[ start + 1 .. $ ].dup; + fileNames [i] = name[ start + 1 .. $ ]._idup(); OS.g_free (utf8Ptr); } OS.g_strfreev (namesPtr);
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/IME.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/IME.d Fri Mar 27 19:58:06 2009 +0100 @@ -263,7 +263,7 @@ if (textPtr !is null && inComposition) { int length = OS.strlen (textPtr); if (length !is 0) { - char [] chars = fromStringz(textPtr).dup; + String chars = fromStringz(textPtr)._idup(); Event event = new Event(); event.detail = SWT.COMPOSITION_CHANGED; event.start = startOffset; @@ -292,10 +292,10 @@ int cursorPos; OS.gtk_im_context_get_preedit_string (imHandle_, &preeditString, &pangoAttrs, &cursorPos); caretOffset = cursorPos ; - char [] chars = null; + String chars = null; if (preeditString !is null) { int length = OS.strlen (preeditString); - chars = fromStringz(preeditString).dup; + chars = fromStringz(preeditString)._idup(); if (pangoAttrs !is null) { int count = 0; auto iterator = OS.pango_attr_list_get_iterator (pangoAttrs );
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Item.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Item.d Fri Mar 27 19:58:06 2009 +0100 @@ -183,7 +183,7 @@ checkWidget (); // SWT extension: allow null for zero length string //if (string is null) error (SWT.ERROR_NULL_ARGUMENT); - text = string.dup; + text = string._idup(); } }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Link.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Link.d Fri Mar 27 19:58:06 2009 +0100 @@ -573,7 +573,7 @@ state++; break; default: - if (tango.text.Unicode.isWhitespace(c)) break; + if (Character.isWhitespace(c)) break; else state = 13; } break; @@ -596,7 +596,7 @@ parseMnemonics (buffer, linkStart, endtagStart, result); offsets [linkIndex] = new Point (offset, result.length () - 1); if (ids [linkIndex] is null) { - ids [linkIndex] = buffer[ linkStart .. endtagStart ].dup; + ids [linkIndex] = buffer[ linkStart .. endtagStart ]._idup(); } linkIndex++; start = tagStart = linkStart = endtagStart = refStart = index + 1; @@ -627,12 +627,12 @@ break; case 12: if (c is '"') { - ids[linkIndex] = buffer[ refStart .. index ].dup; + ids[linkIndex] = buffer[ refStart .. index ]._idup(); state = 2; } break; case 13: - if (tango.text.Unicode.isWhitespace (c)) { + if (Character.isWhitespace (c)) { state = 0; } else if (c is '='){ state++;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/List.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/List.d Fri Mar 27 19:58:06 2009 +0100 @@ -26,7 +26,6 @@ import java.lang.all; version(Tango){ -import tango.text.convert.Integer; } else { // Phobos } @@ -455,7 +454,7 @@ OS.gtk_tree_model_iter_nth_child (cast(GtkTreeStore*)modelHandle, &iter, null, index); OS.gtk_tree_model_get1 (cast(GtkTreeStore*)modelHandle, &iter, 0, cast(void**)&ptr ); if (ptr is null) return null; - String res = fromStringz( ptr ).dup; + String res = fromStringz( ptr )._idup(); OS.g_free (ptr); return res; } @@ -530,7 +529,7 @@ OS.gtk_tree_model_iter_nth_child (cast(GtkTreeStore*)modelHandle, &iter, null, index); OS.gtk_tree_model_get1 (cast(GtkTreeStore*)modelHandle, &iter, 0, cast(void**)&ptr); if (ptr !is null) { - String res = fromStringz( ptr ).dup; + String res = fromStringz( ptr )._idup(); OS.g_free (ptr); result [index] = res; } @@ -884,7 +883,7 @@ public bool isSelected (int index) { checkWidget(); auto selection = OS.gtk_tree_view_get_selection (cast(GtkTreeView*)handle); - char* buffer = toStringz(tango.text.convert.Integer.toString(index)); + char* buffer = toStringz(Integer.toString(index)); auto path = OS.gtk_tree_path_new_from_string (buffer); bool answer = cast(bool)OS.gtk_tree_selection_path_is_selected (selection, path); OS.gtk_tree_path_free (path);
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/MenuItem.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/MenuItem.d Fri Mar 27 19:58:06 2009 +0100 @@ -243,7 +243,7 @@ override void createHandle (int index) { state |= HANDLE; - char [] buffer = "\0"; + String buffer = "\0"; int bits = SWT.CHECK | SWT.RADIO | SWT.PUSH | SWT.SEPARATOR; switch (style & bits) { case SWT.SEPARATOR:
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/MessageBox.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/MessageBox.d Fri Mar 27 19:58:06 2009 +0100 @@ -226,7 +226,7 @@ char[] fixPercent (String string) { int i = 0, j = 0; - char [] result = new String( string.length * 2 ); + char [] result = new char[ string.length * 2 ]; while (i < string.length) { switch (string [i]) { case '%':
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Scrollable.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Scrollable.d Fri Mar 27 19:58:06 2009 +0100 @@ -256,7 +256,7 @@ if ((state & CANVAS) !is 0) { ScrollBar scrollBar; GdkEventScroll* gdkEvent = new GdkEventScroll (); - memmove (gdkEvent, eventPtr, GdkEventScroll.sizeof); + OS.memmove (gdkEvent, eventPtr, GdkEventScroll.sizeof); if (gdkEvent.direction is OS.GDK_SCROLL_UP || gdkEvent.direction is OS.GDK_SCROLL_DOWN) { scrollBar = verticalBar; } else {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Shell.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Shell.d Fri Mar 27 19:58:06 2009 +0100 @@ -558,7 +558,7 @@ * to come forward in versions > 2.10.0. The fix is to use the last * user event time. */ - if ( Unicode.toLower( display.windowManager ) ==/*eq*/ "metacity") { + if ( display.windowManager.toLowerCase() ==/*eq*/ "metacity") { OS.gdk_window_focus (window, display.lastUserEventTime); } else { OS.gdk_window_focus (window, OS.GDK_CURRENT_TIME); @@ -1662,7 +1662,7 @@ */ int length_ = string.length; char [] chars = new char [Math.max (6, length_) + 1]; - chars = string[ 0 .. length_]; + chars[ 0 .. length_ ] = string[ 0 .. length_]; for (int i=length_; i<chars.length; i++) chars [i] = ' '; OS.gtk_window_set_title (cast(GtkWindow*)shellHandle, toStringz( chars ) ); }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Spinner.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Spinner.d Fri Mar 27 19:58:06 2009 +0100 @@ -28,8 +28,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /** @@ -231,9 +232,9 @@ } string = buffer; } - char [] buffer1 = string; + auto buffer1 = string; auto ptr = OS.pango_layout_get_text (layout); - String buffer2 = fromStringz( ptr ).dup; + String buffer2 = fromStringz( ptr )._idup(); OS.pango_layout_set_text (layout, buffer1.ptr, buffer1.length); OS.pango_layout_get_size (layout, w.ptr, h.ptr); OS.pango_layout_set_text (layout, buffer2.ptr, buffer2.length); @@ -501,7 +502,7 @@ public String getText () { checkWidget (); auto str = OS.gtk_entry_get_text (handle); - return fromStringz(str).dup; + return fromStringz(str)._idup(); } /** @@ -544,7 +545,7 @@ String getDecimalSeparator () { auto ptr = OS.localeconv_decimal_point (); - return fromStringz( ptr ).dup; + return fromStringz( ptr )._idup(); } override int /*long*/ gtk_activate (GtkWidget* widget) { @@ -554,7 +555,7 @@ override int /*long*/ gtk_changed (GtkWidget* widget) { auto str = OS.gtk_entry_get_text (cast(GtkEntry*)handle); - int length = tango.stdc.string.strlen (str); + int length = OS.strlen (str); if (length > 0) { char* endptr; double value = OS.g_strtod (str, &endptr); @@ -660,7 +661,7 @@ override int /*long*/ gtk_insert_text (GtkEditable* widget, char* new_text, int new_text_length, int position) { // if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; if (new_text is null || new_text_length is 0) return 0; - String oldText = new_text[ 0 .. new_text_length ].dup; + String oldText = new_text[ 0 .. new_text_length ]._idup(); int pos; pos = position; if (pos is -1) { @@ -1106,7 +1107,7 @@ char* preeditString; OS.gtk_im_context_get_preedit_string (imContext, &preeditString, null, null); if (preeditString !is null) { - int length = tango.stdc.string.strlen (preeditString); + int length = OS.strlen (preeditString); OS.g_free (preeditString); if (length !is 0) return false; }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Synchronizer.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Synchronizer.d Fri Mar 27 19:58:06 2009 +0100 @@ -21,7 +21,7 @@ import java.lang.Thread; import org.eclipse.swt.graphics.Device; version(Tango){ -import tango.core.Exception; + import tango.core.Exception; } else { // Phobos } @@ -185,12 +185,16 @@ } synchronized (lock) { bool interrupted = false; - while (!lock.done ()) { - try { - lock.wait (); - } catch (SyncException e) { - interrupted = true; + version(Tango){ + while (!lock.done ()) { + try { + lock.wait (); + } catch (SyncException e) { + interrupted = true; + } } + } else { // Phobos + implMissing( __FILE__, __LINE__); } if (interrupted) { Compatibility.interrupt();
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Table.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Table.d Fri Mar 27 19:58:06 2009 +0100 @@ -41,8 +41,9 @@ import java.lang.all; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/TableItem.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/TableItem.d Fri Mar 27 19:58:06 2009 +0100 @@ -206,7 +206,7 @@ int modelIndex = parent.columnCount is 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex; OS.gtk_tree_model_get1 (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, &ptr); if (ptr is null) return ""; - char[] buffer = fromStringz( cast(char*)ptr).dup; + String buffer = fromStringz( cast(char*)ptr)._idup(); OS.g_free (ptr); return buffer; }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Text.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Text.d Fri Mar 27 19:58:06 2009 +0100 @@ -967,7 +967,7 @@ address = OS.gtk_text_buffer_get_text (bufferHandle, &start, &end, true); } if (address is null) return ""; - String res = fromStringz( address ).dup; + String res = fromStringz( address )._idup(); if ((style & SWT.MULTI) !is 0) OS.g_free (address); return res; } @@ -1007,7 +1007,7 @@ address = OS.gtk_text_buffer_get_text (bufferHandle, &startIter, &endIter, true); } if (address is null) error (SWT.ERROR_CANNOT_GET_TEXT); - String res = fromStringz( address ).dup; + String res = fromStringz( address )._idup(); OS.g_free (address); return res; } @@ -1283,7 +1283,7 @@ override int /*long*/ gtk_insert_text (GtkEditable* widget, char* new_text, int new_text_length, int position) { if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0; if (new_text is null || new_text_length is 0) return 0; - String oldText = (cast(char*)new_text)[ 0 .. new_text_length ].dup; + String oldText = (cast(char*)new_text)[ 0 .. new_text_length ]._idup(); int pos; pos = *cast(int*)position; if (pos is -1) { @@ -1351,7 +1351,7 @@ end = fixEnd; fixStart = fixEnd = -1; } - String oldText = text[ 0 .. len ]; + String oldText = cast(String)text[ 0 .. len ]; String newText = verifyText (oldText, start, end); if (newText is null) { OS.g_signal_stop_emission_by_name (bufferHandle, OS.insert_text.ptr); @@ -2005,7 +2005,7 @@ char* preeditString; OS.gtk_im_context_get_preedit_string (imContext, &preeditString, null, null); if (preeditString !is null) { - int length = tango.stdc.string.strlen (preeditString); + int length = OS.strlen (preeditString); OS.g_free (preeditString); if (length !is 0) return false; }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/TrayItem.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/TrayItem.d Fri Mar 27 19:58:06 2009 +0100 @@ -29,8 +29,9 @@ import org.eclipse.swt.internal.gtk.OS; version(Tango){ -import tango.util.Convert; + import tango.util.Convert; } else { // Phobos + import std.conv; } /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/TreeItem.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/TreeItem.d Fri Mar 27 19:58:06 2009 +0100 @@ -290,7 +290,7 @@ int modelIndex = parent.columnCount is 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex; OS.gtk_tree_model_get1 (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, &ptr); if (ptr is null) return ""; //$NON-NLS-1$ - char[] buffer = fromStringz( cast(char*)ptr).dup; + String buffer = fromStringz( cast(char*)ptr)._idup(); OS.g_free (ptr); return buffer; }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Widget.d Fri Mar 27 15:30:20 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Widget.d Fri Mar 27 19:58:06 2009 +0100 @@ -599,8 +599,8 @@ if ((state & KEYED_DATA) !is 0) { Object[] table = (cast(ArrayWrapperObject) data).array; for (int i=1; i<table.length; i+=2) { - String tablekey = (cast(ArrayWrapperString) table[i]).array; - if (key ==/*eq*/ tablekey ) return table [i+1]; + String tablekey = stringcast(table[i]); + if (key.equals( tablekey) ) return table [i+1]; } } return null; @@ -968,7 +968,7 @@ char [] fixMnemonic (String str, bool replace) { int len = str.length; - String text = str[0 .. len].dup; + auto text = str[0 .. len].dup; int i = 0, j = 0; char [] result = new char [len * 2]; while (i < len) { @@ -1455,7 +1455,7 @@ if ((state & KEYED_DATA) !is 0) { table = (cast(ArrayWrapperObject) data).array; while (index < table.length) { - String tablekey = (cast(ArrayWrapperString)table[index]).array; + String tablekey = stringcast(table[index]); if (key.equals (tablekey) ) break; index += 2; }