projects/dwt-linux: dwt/custom/CTabFolder.d comparison

comparison dwt/custom/CTabFolder.d @ 238:380bad9f6852

reverted char[] to String

author	Frank Benoit <benoit@tionex.de>
date	Mon, 05 May 2008 00:42:55 +0200
parents	d0081b1505da
children	ce446666f5a2

comparison

equal deleted inserted replaced

-:98b80b00af79
+:380bad9f6852
 * Port to the D programming language:
 *     Frank Benoit <benoit@tionex.de>
 *******************************************************************************/
 module dwt.custom.CTabFolder;
+import tango.util.log.Trace;
 import dwt.DWT;
 import dwt.DWTException;
 import dwt.accessibility.ACC;
 import dwt.accessibility.Accessible;
 * but a texture.  To show the correct default background, we must allow
 * the operating system to draw it and therefore, we can not use the
 * NO_BACKGROUND style.  The NO_BACKGROUND style is not required on platforms
 * that use double buffering which is true in both of these cases.
 */
-char[] platform = DWT.getPlatform();
+String platform = DWT.getPlatform();
 if ("carbon"==platform || "gtk"==platform) return style; //$NON-NLS-1$ //$NON-NLS-2$
 //TEMPORARY CODE
 /*
 * In Right To Left orientation on Windows, all GC calls that use a brush are drawing
 while (showCount < priority.length && items[priority[showCount]].showing) {
 showCount++;
 }
 count = items.length - showCount;
 }
-char[] chevronString = count > 99 ? "99+" : to!(char[])(count); //$NON-NLS-1$
+String chevronString = count > 99 ? "99+" : to!(String)(count); //$NON-NLS-1$
 switch (chevronImageState) {
 case NORMAL: {
 Color chevronBorder = single ? getSelectionForeground() : getForeground();
 gc.setForeground(chevronBorder);
 gc.setFont(f);
 /*
 * Return the lowercase of the first non-'&' character following
 * an '&' character in the given string. If there are no '&'
 * characters in the given string, return '\0'.
 */
-dchar _findMnemonic (char[] string) {
+dchar _findMnemonic (String string) {
 if (string is null) return '\0';
 int index = 0;
 int length_ = string.length;
 do {
 while (index < length_ && string[index] !is '&') index++;
 if (string[index] !is '&') return CharacterFirstToLower(string[index..$]);
 index++;
 } while (index < length_);
 return '\0';
 }
-char[] stripMnemonic (char[] string) {
+String stripMnemonic (String string) {
 int index = 0;
 int length_ = string.length;
 do {
 while ((index < length_) && (string[index] !is '&')) index++;
 if (++index >= length_) return string;
 if (items[i] is item) return i;
 }
 return -1;
 }
 void initAccessible() {
-final Accessible accessible = getAccessible();
+Accessible accessible = getAccessible();
 accessible.addAccessibleListener(new class() AccessibleAdapter {
 public void getName(AccessibleEvent e) {
-char[] name = null;
+String name = null;
 int childID = e.childID;
 if (childID >= 0 && childID < items.length) {
 name = stripMnemonic(items[childID].getText());
 } else if (childID is items.length + CHEVRON_CHILD_ID) {
 name = DWT.getMessage("SWT_ShowList"); //$NON-NLS-1$
 }
 e.result = name;
 }
 public void getHelp(AccessibleEvent e) {
-char[] help = null;
+String help = null;
 int childID = e.childID;
 if (childID is ACC.CHILDID_SELF) {
 help = getToolTipText();
 } else if (childID >= 0 && childID < items.length) {
 help = items[childID].getToolTipText();
 }
 e.result = help;
 }
 public void getKeyboardShortcut(AccessibleEvent e) {
-char[] shortcut = null;
+String shortcut = null;
 int childID = e.childID;
 if (childID >= 0 && childID < items.length) {
-char[] text = items[childID].getText();
+String text = items[childID].getText();
 if (text !is null) {
 dchar mnemonic = _findMnemonic(text);
 if (mnemonic !is '\0') {
 shortcut = "Alt+"~tango.text.convert.Utf.toString([mnemonic]); //$NON-NLS-1$
 }
 public void getChildCount(AccessibleControlEvent e) {
 e.detail = items.length + EXTRA_CHILD_ID_COUNT;
 }
 public void getDefaultAction(AccessibleControlEvent e) {
-char[] action = null;
+String action = null;
 int childID = e.childID;
 if (childID >= 0 && childID < items.length) {
 action = DWT.getMessage ("SWT_Switch"); //$NON-NLS-1$
 }
 if (childID >= items.length && childID < items.length + EXTRA_CHILD_ID_COUNT) {
 }
 e.children = children;
 }
 });
-addListener(DWT.Selection, new class(accessible) Listener {
+addListener(DWT.Selection, getInst(accessible) );
-Accessible acc;
+addListener(DWT.FocusIn, new class(accessible) Listener {
-this( Accessible acc ){ this.acc = acc; }
+Accessible acc2;
+this( Accessible acc2 ){ this.acc2 = acc2; }
 public void handleEvent(Event event) {
-if (isFocusControl()) {
+if (this.outer.selectedIndex is -1) {
+acc2.setFocus(ACC.CHILDID_SELF);
+} else {
+acc2.setFocus(this.outer.selectedIndex);
+}
+}
+});
+}
+Listener getInst(Accessible accessible ){
+return new class/+accessible+/ Listener {
+//Accessible acc;
+//this( Accessible acc ){ this.acc = acc; }
+public void handleEvent(Event event) {
+Trace.formatln( "{} {}", __FILE__, __LINE__ );
+Trace.formatln( "{} {} {}", __FILE__, __LINE__, cast(void*)this );
+Trace.formatln( "{} {} {}", __FILE__, __LINE__, cast(void*)this.outer );
+//auto p = &this.outer.isFocusControl;
+//Trace.formatln( "{} {} {}", __FILE__, __LINE__, cast(void*)p.ptr );
+//Trace.formatln( "{} {} {}", __FILE__, __LINE__, cast(void*)p.funcptr );
+test();
+Trace.formatln( "{} {}", __FILE__, __LINE__ );
+//             if (this.outer.isFocusControl()) {
+//         Trace.formatln( "{} {}", __FILE__, __LINE__ );
 if (selectedIndex is -1) {
-acc.setFocus(ACC.CHILDID_SELF);
+//         Trace.formatln( "{} {}", __FILE__, __LINE__ );
-} else {
+//            acc.setFocus(ACC.CHILDID_SELF);
-acc.setFocus(selectedIndex);
+//         Trace.formatln( "{} {}", __FILE__, __LINE__ );
-}
+//                 } else {
-}
+//         Trace.formatln( "{} {}", __FILE__, __LINE__ );
-}
+//         //            acc.setFocus(this.outer.selectedIndex);
-});
+//         Trace.formatln( "{} {}", __FILE__, __LINE__ );
+//                 }
-addListener(DWT.FocusIn, new class(accessible) Listener {
+Trace.formatln( "{} {}", __FILE__, __LINE__ );
-Accessible acc;
+}
-this( Accessible acc ){ this.acc = acc; }
+Trace.formatln( "{} {}", __FILE__, __LINE__ );
-public void handleEvent(Event event) {
-if (selectedIndex is -1) {
+}
-acc.setFocus(ACC.CHILDID_SELF);
+};
-} else {
+}
-acc.setFocus(selectedIndex);
+void test(){
-}
+Trace.formatln( "{} {}", __FILE__, __LINE__ );
-}
-});
 }
 void onKeyDown (Event event) {
 switch (event.keyCode) {
 case DWT.ARROW_LEFT:
 case DWT.ARROW_RIGHT:
 MenuItem[] items = showMenu.getItems();
 for (int i = 0; i < items.length; i++) {
 items[i].dispose();
 }
 }
-static const char[] id = "CTabFolder_showList_Index"; //$NON-NLS-1$
+static const String id = "CTabFolder_showList_Index"; //$NON-NLS-1$
 for (int i = 0; i < items.length; i++) {
 CTabItem tab = items[i];
 if (tab.showing) continue;
 MenuItem item = new MenuItem(showMenu, DWT.NONE);
 item.setText(tab.getText());
 showItem(getSelection());
 }
 }
 void _setToolTipText (int x, int y) {
-char[] oldTip = getToolTipText();
+String oldTip = getToolTipText();
-char[] newTip = _getToolTip(x, y);
+String newTip = _getToolTip(x, y);
 if (newTip is null || newTip!=oldTip) {
 setToolTipText(newTip);
 }
 }
 20+d, 12+d,  21+d, 12+d,  22+d,  12+d ];
 }
 notifyListeners(DWT.Resize, new Event());
 return true;
 }
-char[] _getToolTip(int x, int y) {
+String _getToolTip(int x, int y) {
 if (showMin && minRect.contains(x, y)) return minimized ? DWT.getMessage("SWT_Restore") : DWT.getMessage("SWT_Minimize"); //$NON-NLS-1$ //$NON-NLS-2$
 if (showMax && maxRect.contains(x, y)) return maximized ? DWT.getMessage("SWT_Restore") : DWT.getMessage("SWT_Maximize"); //$NON-NLS-1$ //$NON-NLS-2$
 if (showChevron && chevronRect.contains(x, y)) return DWT.getMessage("SWT_ShowList"); //$NON-NLS-1$
 CTabItem item = getItem(new Point (x, y));
 if (item is null) return null;

Mercurial > projects > dwt-linux

comparison dwt/custom/CTabFolder.d @ 238:380bad9f6852