diff dwt/internal/c/gtk.d @ 238:380bad9f6852

reverted char[] to String
author Frank Benoit <benoit@tionex.de>
date Mon, 05 May 2008 00:42:55 +0200
parents 29abb9b0d092
children 4bffbf81e2d6
line wrap: on
line diff
--- a/dwt/internal/c/gtk.d	Sat Apr 26 10:01:30 2008 +0200
+++ b/dwt/internal/c/gtk.d	Mon May 05 00:42:55 2008 +0200
@@ -4,6 +4,8 @@
 ******************************************************************************/
 module dwt.internal.c.gtk;
 
+import dwt.dwthelper.utils;
+
 public import dwt.internal.c.atk;
 public import dwt.internal.c.cairo;
 public import dwt.internal.c.pango;
@@ -27,14 +29,14 @@
     import tango.sys.SharedLib : SharedLib;
     import tango.util.log.Trace;
     struct Symbol{
-        char[] name;
+        String name;
         void** symbol;
     }
 }
 
 void loadLib(){
     version(DYNLINK){
-        char[] libname = "libgtk-x11-2.0.so";
+        String libname = "libgtk-x11-2.0.so";
 
         SharedLib lib = SharedLib.load( libname );
         if( lib is null ){
@@ -842,139 +844,139 @@
 const int GTK_PATH_PRIO_MASK = 0x0f;
 const int GTK_BUTTONBOX_DEFAULT = -1;
 const int GTK_MAX_COMPOSE_LEN = 7;
-const char[] GTK_PAPER_NAME_A3 = "iso_a3";
-const char[] GTK_PAPER_NAME_A4 = "iso_a4";
-const char[] GTK_PAPER_NAME_A5 = "iso_a5";
-const char[] GTK_PAPER_NAME_B5 = "iso_b5";
-const char[] GTK_PAPER_NAME_LETTER = "na_letter";
-const char[] GTK_PAPER_NAME_EXECUTIVE = "na_executive";
-const char[] GTK_PAPER_NAME_LEGAL = "na_legal";
-const char[] GTK_PRINT_SETTINGS_PRINTER = "printer";
-const char[] GTK_PRINT_SETTINGS_ORIENTATION = "orientation";
-const char[] GTK_PRINT_SETTINGS_PAPER_FORMAT = "paper-format";
-const char[] GTK_PRINT_SETTINGS_PAPER_WIDTH = "paper-width";
-const char[] GTK_PRINT_SETTINGS_PAPER_HEIGHT = "paper-height";
-const char[] GTK_PRINT_SETTINGS_N_COPIES = "n-copies";
-const char[] GTK_PRINT_SETTINGS_DEFAULT_SOURCE = "default-source";
-const char[] GTK_PRINT_SETTINGS_QUALITY = "quality";
-const char[] GTK_PRINT_SETTINGS_RESOLUTION = "resolution";
-const char[] GTK_PRINT_SETTINGS_USE_COLOR = "use-color";
-const char[] GTK_PRINT_SETTINGS_DUPLEX = "duplex";
-const char[] GTK_PRINT_SETTINGS_COLLATE = "collate";
-const char[] GTK_PRINT_SETTINGS_REVERSE = "reverse";
-const char[] GTK_PRINT_SETTINGS_MEDIA_TYPE = "media-type";
-const char[] GTK_PRINT_SETTINGS_DITHER = "dither";
-const char[] GTK_PRINT_SETTINGS_SCALE = "scale";
-const char[] GTK_PRINT_SETTINGS_PRINT_PAGES = "print-pages";
-const char[] GTK_PRINT_SETTINGS_PAGE_RANGES = "page-ranges";
-const char[] GTK_PRINT_SETTINGS_PAGE_SET = "page-set";
-const char[] GTK_PRINT_SETTINGS_FINISHINGS = "finishings";
-const char[] GTK_PRINT_SETTINGS_NUMBER_UP = "number-up";
-const char[] GTK_PRINT_SETTINGS_OUTPUT_BIN = "output-bin";
-const char[] GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT = "output-file-format";
-const char[] GTK_PRINT_SETTINGS_OUTPUT_URI = "output-uri";
-const char[] GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION = "win32-driver-version";
-const char[] GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA = "win32-driver-extra";
+const String GTK_PAPER_NAME_A3 = "iso_a3";
+const String GTK_PAPER_NAME_A4 = "iso_a4";
+const String GTK_PAPER_NAME_A5 = "iso_a5";
+const String GTK_PAPER_NAME_B5 = "iso_b5";
+const String GTK_PAPER_NAME_LETTER = "na_letter";
+const String GTK_PAPER_NAME_EXECUTIVE = "na_executive";
+const String GTK_PAPER_NAME_LEGAL = "na_legal";
+const String GTK_PRINT_SETTINGS_PRINTER = "printer";
+const String GTK_PRINT_SETTINGS_ORIENTATION = "orientation";
+const String GTK_PRINT_SETTINGS_PAPER_FORMAT = "paper-format";
+const String GTK_PRINT_SETTINGS_PAPER_WIDTH = "paper-width";
+const String GTK_PRINT_SETTINGS_PAPER_HEIGHT = "paper-height";
+const String GTK_PRINT_SETTINGS_N_COPIES = "n-copies";
+const String GTK_PRINT_SETTINGS_DEFAULT_SOURCE = "default-source";
+const String GTK_PRINT_SETTINGS_QUALITY = "quality";
+const String GTK_PRINT_SETTINGS_RESOLUTION = "resolution";
+const String GTK_PRINT_SETTINGS_USE_COLOR = "use-color";
+const String GTK_PRINT_SETTINGS_DUPLEX = "duplex";
+const String GTK_PRINT_SETTINGS_COLLATE = "collate";
+const String GTK_PRINT_SETTINGS_REVERSE = "reverse";
+const String GTK_PRINT_SETTINGS_MEDIA_TYPE = "media-type";
+const String GTK_PRINT_SETTINGS_DITHER = "dither";
+const String GTK_PRINT_SETTINGS_SCALE = "scale";
+const String GTK_PRINT_SETTINGS_PRINT_PAGES = "print-pages";
+const String GTK_PRINT_SETTINGS_PAGE_RANGES = "page-ranges";
+const String GTK_PRINT_SETTINGS_PAGE_SET = "page-set";
+const String GTK_PRINT_SETTINGS_FINISHINGS = "finishings";
+const String GTK_PRINT_SETTINGS_NUMBER_UP = "number-up";
+const String GTK_PRINT_SETTINGS_OUTPUT_BIN = "output-bin";
+const String GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT = "output-file-format";
+const String GTK_PRINT_SETTINGS_OUTPUT_URI = "output-uri";
+const String GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION = "win32-driver-version";
+const String GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA = "win32-driver-extra";
 const int GTK_INPUT_ERROR = -1;
-const char[] GTK_STOCK_DIALOG_AUTHENTICATION = "gtk-dialog-authentication";
-const char[] GTK_STOCK_DIALOG_INFO = "gtk-dialog-info";
-const char[] GTK_STOCK_DIALOG_WARNING = "gtk-dialog-warning";
-const char[] GTK_STOCK_DIALOG_ERROR = "gtk-dialog-error";
-const char[] GTK_STOCK_DIALOG_QUESTION = "gtk-dialog-question";
-const char[] GTK_STOCK_DND = "gtk-dnd";
-const char[] GTK_STOCK_DND_MULTIPLE = "gtk-dnd-multiple";
-const char[] GTK_STOCK_ABOUT = "gtk-about";
-const char[] GTK_STOCK_ADD = "gtk-add";
-const char[] GTK_STOCK_APPLY = "gtk-apply";
-const char[] GTK_STOCK_BOLD = "gtk-bold";
-const char[] GTK_STOCK_CANCEL = "gtk-cancel";
-const char[] GTK_STOCK_CDROM = "gtk-cdrom";
-const char[] GTK_STOCK_CLEAR = "gtk-clear";
-const char[] GTK_STOCK_CLOSE = "gtk-close";
-const char[] GTK_STOCK_COLOR_PICKER = "gtk-color-picker";
-const char[] GTK_STOCK_CONVERT = "gtk-convert";
-const char[] GTK_STOCK_CONNECT = "gtk-connect";
-const char[] GTK_STOCK_COPY = "gtk-copy";
-const char[] GTK_STOCK_CUT = "gtk-cut";
-const char[] GTK_STOCK_DELETE = "gtk-delete";
-const char[] GTK_STOCK_DIRECTORY = "gtk-directory";
-const char[] GTK_STOCK_DISCARD = "gtk-discard";
-const char[] GTK_STOCK_DISCONNECT = "gtk-disconnect";
-const char[] GTK_STOCK_EDIT = "gtk-edit";
-const char[] GTK_STOCK_EXECUTE = "gtk-execute";
-const char[] GTK_STOCK_FILE = "gtk-file";
-const char[] GTK_STOCK_FIND = "gtk-find";
-const char[] GTK_STOCK_FIND_AND_REPLACE = "gtk-find-and-replace";
-const char[] GTK_STOCK_FLOPPY = "gtk-floppy";
-const char[] GTK_STOCK_FULLSCREEN = "gtk-fullscreen";
-const char[] GTK_STOCK_GOTO_BOTTOM = "gtk-goto-bottom";
-const char[] GTK_STOCK_GOTO_FIRST = "gtk-goto-first";
-const char[] GTK_STOCK_GOTO_LAST = "gtk-goto-last";
-const char[] GTK_STOCK_GOTO_TOP = "gtk-goto-top";
-const char[] GTK_STOCK_GO_BACK = "gtk-go-back";
-const char[] GTK_STOCK_GO_DOWN = "gtk-go-down";
-const char[] GTK_STOCK_GO_FORWARD = "gtk-go-forward";
-const char[] GTK_STOCK_GO_UP = "gtk-go-up";
-const char[] GTK_STOCK_HARDDISK = "gtk-harddisk";
-const char[] GTK_STOCK_HELP = "gtk-help";
-const char[] GTK_STOCK_HOME = "gtk-home";
-const char[] GTK_STOCK_INDEX = "gtk-index";
-const char[] GTK_STOCK_INDENT = "gtk-indent";
-const char[] GTK_STOCK_INFO = "gtk-info";
-const char[] GTK_STOCK_UNINDENT = "gtk-unindent";
-const char[] GTK_STOCK_ITALIC = "gtk-italic";
-const char[] GTK_STOCK_JUMP_TO = "gtk-jump-to";
-const char[] GTK_STOCK_JUSTIFY_CENTER = "gtk-justify-center";
-const char[] GTK_STOCK_JUSTIFY_FILL = "gtk-justify-fill";
-const char[] GTK_STOCK_JUSTIFY_LEFT = "gtk-justify-left";
-const char[] GTK_STOCK_JUSTIFY_RIGHT = "gtk-justify-right";
-const char[] GTK_STOCK_LEAVE_FULLSCREEN = "gtk-leave-fullscreen";
-const char[] GTK_STOCK_MISSING_IMAGE = "gtk-missing-image";
-const char[] GTK_STOCK_MEDIA_FORWARD = "gtk-media-forward";
-const char[] GTK_STOCK_MEDIA_NEXT = "gtk-media-next";
-const char[] GTK_STOCK_MEDIA_PAUSE = "gtk-media-pause";
-const char[] GTK_STOCK_MEDIA_PLAY = "gtk-media-play";
-const char[] GTK_STOCK_MEDIA_PREVIOUS = "gtk-media-previous";
-const char[] GTK_STOCK_MEDIA_RECORD = "gtk-media-record";
-const char[] GTK_STOCK_MEDIA_REWIND = "gtk-media-rewind";
-const char[] GTK_STOCK_MEDIA_STOP = "gtk-media-stop";
-const char[] GTK_STOCK_NETWORK = "gtk-network";
-const char[] GTK_STOCK_NEW = "gtk-new";
-const char[] GTK_STOCK_NO = "gtk-no";
-const char[] GTK_STOCK_OK = "gtk-ok";
-const char[] GTK_STOCK_OPEN = "gtk-open";
-const char[] GTK_STOCK_ORIENTATION_PORTRAIT = "gtk-orientation-portrait";
-const char[] GTK_STOCK_ORIENTATION_LANDSCAPE = "gtk-orientation-landscape";
-const char[] GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE = "gtk-orientation-reverse-landscape";
-const char[] GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT = "gtk-orientation-reverse-portrait";
-const char[] GTK_STOCK_PASTE = "gtk-paste";
-const char[] GTK_STOCK_PREFERENCES = "gtk-preferences";
-const char[] GTK_STOCK_PRINT = "gtk-print";
-const char[] GTK_STOCK_PRINT_PREVIEW = "gtk-print-preview";
-const char[] GTK_STOCK_PROPERTIES = "gtk-properties";
-const char[] GTK_STOCK_QUIT = "gtk-quit";
-const char[] GTK_STOCK_REDO = "gtk-redo";
-const char[] GTK_STOCK_REFRESH = "gtk-refresh";
-const char[] GTK_STOCK_REMOVE = "gtk-remove";
-const char[] GTK_STOCK_REVERT_TO_SAVED = "gtk-revert-to-saved";
-const char[] GTK_STOCK_SAVE = "gtk-save";
-const char[] GTK_STOCK_SAVE_AS = "gtk-save-as";
-const char[] GTK_STOCK_SELECT_ALL = "gtk-select-all";
-const char[] GTK_STOCK_SELECT_COLOR = "gtk-select-color";
-const char[] GTK_STOCK_SELECT_FONT = "gtk-select-font";
-const char[] GTK_STOCK_SORT_ASCENDING = "gtk-sort-ascending";
-const char[] GTK_STOCK_SORT_DESCENDING = "gtk-sort-descending";
-const char[] GTK_STOCK_SPELL_CHECK = "gtk-spell-check";
-const char[] GTK_STOCK_STOP = "gtk-stop";
-const char[] GTK_STOCK_STRIKETHROUGH = "gtk-strikethrough";
-const char[] GTK_STOCK_UNDELETE = "gtk-undelete";
-const char[] GTK_STOCK_UNDERLINE = "gtk-underline";
-const char[] GTK_STOCK_UNDO = "gtk-undo";
-const char[] GTK_STOCK_YES = "gtk-yes";
-const char[] GTK_STOCK_ZOOM_100 = "gtk-zoom-100";
-const char[] GTK_STOCK_ZOOM_FIT = "gtk-zoom-fit";
-const char[] GTK_STOCK_ZOOM_IN = "gtk-zoom-in";
-const char[] GTK_STOCK_ZOOM_OUT = "gtk-zoom-out";
+const String GTK_STOCK_DIALOG_AUTHENTICATION = "gtk-dialog-authentication";
+const String GTK_STOCK_DIALOG_INFO = "gtk-dialog-info";
+const String GTK_STOCK_DIALOG_WARNING = "gtk-dialog-warning";
+const String GTK_STOCK_DIALOG_ERROR = "gtk-dialog-error";
+const String GTK_STOCK_DIALOG_QUESTION = "gtk-dialog-question";
+const String GTK_STOCK_DND = "gtk-dnd";
+const String GTK_STOCK_DND_MULTIPLE = "gtk-dnd-multiple";
+const String GTK_STOCK_ABOUT = "gtk-about";
+const String GTK_STOCK_ADD = "gtk-add";
+const String GTK_STOCK_APPLY = "gtk-apply";
+const String GTK_STOCK_BOLD = "gtk-bold";
+const String GTK_STOCK_CANCEL = "gtk-cancel";
+const String GTK_STOCK_CDROM = "gtk-cdrom";
+const String GTK_STOCK_CLEAR = "gtk-clear";
+const String GTK_STOCK_CLOSE = "gtk-close";
+const String GTK_STOCK_COLOR_PICKER = "gtk-color-picker";
+const String GTK_STOCK_CONVERT = "gtk-convert";
+const String GTK_STOCK_CONNECT = "gtk-connect";
+const String GTK_STOCK_COPY = "gtk-copy";
+const String GTK_STOCK_CUT = "gtk-cut";
+const String GTK_STOCK_DELETE = "gtk-delete";
+const String GTK_STOCK_DIRECTORY = "gtk-directory";
+const String GTK_STOCK_DISCARD = "gtk-discard";
+const String GTK_STOCK_DISCONNECT = "gtk-disconnect";
+const String GTK_STOCK_EDIT = "gtk-edit";
+const String GTK_STOCK_EXECUTE = "gtk-execute";
+const String GTK_STOCK_FILE = "gtk-file";
+const String GTK_STOCK_FIND = "gtk-find";
+const String GTK_STOCK_FIND_AND_REPLACE = "gtk-find-and-replace";
+const String GTK_STOCK_FLOPPY = "gtk-floppy";
+const String GTK_STOCK_FULLSCREEN = "gtk-fullscreen";
+const String GTK_STOCK_GOTO_BOTTOM = "gtk-goto-bottom";
+const String GTK_STOCK_GOTO_FIRST = "gtk-goto-first";
+const String GTK_STOCK_GOTO_LAST = "gtk-goto-last";
+const String GTK_STOCK_GOTO_TOP = "gtk-goto-top";
+const String GTK_STOCK_GO_BACK = "gtk-go-back";
+const String GTK_STOCK_GO_DOWN = "gtk-go-down";
+const String GTK_STOCK_GO_FORWARD = "gtk-go-forward";
+const String GTK_STOCK_GO_UP = "gtk-go-up";
+const String GTK_STOCK_HARDDISK = "gtk-harddisk";
+const String GTK_STOCK_HELP = "gtk-help";
+const String GTK_STOCK_HOME = "gtk-home";
+const String GTK_STOCK_INDEX = "gtk-index";
+const String GTK_STOCK_INDENT = "gtk-indent";
+const String GTK_STOCK_INFO = "gtk-info";
+const String GTK_STOCK_UNINDENT = "gtk-unindent";
+const String GTK_STOCK_ITALIC = "gtk-italic";
+const String GTK_STOCK_JUMP_TO = "gtk-jump-to";
+const String GTK_STOCK_JUSTIFY_CENTER = "gtk-justify-center";
+const String GTK_STOCK_JUSTIFY_FILL = "gtk-justify-fill";
+const String GTK_STOCK_JUSTIFY_LEFT = "gtk-justify-left";
+const String GTK_STOCK_JUSTIFY_RIGHT = "gtk-justify-right";
+const String GTK_STOCK_LEAVE_FULLSCREEN = "gtk-leave-fullscreen";
+const String GTK_STOCK_MISSING_IMAGE = "gtk-missing-image";
+const String GTK_STOCK_MEDIA_FORWARD = "gtk-media-forward";
+const String GTK_STOCK_MEDIA_NEXT = "gtk-media-next";
+const String GTK_STOCK_MEDIA_PAUSE = "gtk-media-pause";
+const String GTK_STOCK_MEDIA_PLAY = "gtk-media-play";
+const String GTK_STOCK_MEDIA_PREVIOUS = "gtk-media-previous";
+const String GTK_STOCK_MEDIA_RECORD = "gtk-media-record";
+const String GTK_STOCK_MEDIA_REWIND = "gtk-media-rewind";
+const String GTK_STOCK_MEDIA_STOP = "gtk-media-stop";
+const String GTK_STOCK_NETWORK = "gtk-network";
+const String GTK_STOCK_NEW = "gtk-new";
+const String GTK_STOCK_NO = "gtk-no";
+const String GTK_STOCK_OK = "gtk-ok";
+const String GTK_STOCK_OPEN = "gtk-open";
+const String GTK_STOCK_ORIENTATION_PORTRAIT = "gtk-orientation-portrait";
+const String GTK_STOCK_ORIENTATION_LANDSCAPE = "gtk-orientation-landscape";
+const String GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE = "gtk-orientation-reverse-landscape";
+const String GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT = "gtk-orientation-reverse-portrait";
+const String GTK_STOCK_PASTE = "gtk-paste";
+const String GTK_STOCK_PREFERENCES = "gtk-preferences";
+const String GTK_STOCK_PRINT = "gtk-print";
+const String GTK_STOCK_PRINT_PREVIEW = "gtk-print-preview";
+const String GTK_STOCK_PROPERTIES = "gtk-properties";
+const String GTK_STOCK_QUIT = "gtk-quit";
+const String GTK_STOCK_REDO = "gtk-redo";
+const String GTK_STOCK_REFRESH = "gtk-refresh";
+const String GTK_STOCK_REMOVE = "gtk-remove";
+const String GTK_STOCK_REVERT_TO_SAVED = "gtk-revert-to-saved";
+const String GTK_STOCK_SAVE = "gtk-save";
+const String GTK_STOCK_SAVE_AS = "gtk-save-as";
+const String GTK_STOCK_SELECT_ALL = "gtk-select-all";
+const String GTK_STOCK_SELECT_COLOR = "gtk-select-color";
+const String GTK_STOCK_SELECT_FONT = "gtk-select-font";
+const String GTK_STOCK_SORT_ASCENDING = "gtk-sort-ascending";
+const String GTK_STOCK_SORT_DESCENDING = "gtk-sort-descending";
+const String GTK_STOCK_SPELL_CHECK = "gtk-spell-check";
+const String GTK_STOCK_STOP = "gtk-stop";
+const String GTK_STOCK_STRIKETHROUGH = "gtk-strikethrough";
+const String GTK_STOCK_UNDELETE = "gtk-undelete";
+const String GTK_STOCK_UNDERLINE = "gtk-underline";
+const String GTK_STOCK_UNDO = "gtk-undo";
+const String GTK_STOCK_YES = "gtk-yes";
+const String GTK_STOCK_ZOOM_100 = "gtk-zoom-100";
+const String GTK_STOCK_ZOOM_FIT = "gtk-zoom-fit";
+const String GTK_STOCK_ZOOM_IN = "gtk-zoom-in";
+const String GTK_STOCK_ZOOM_OUT = "gtk-zoom-out";
 alias _GtkVSeparatorClass GtkVSeparatorClass;
 alias _GtkSeparatorClass GtkSeparatorClass;
 alias _GtkVSeparator GtkVSeparator;