diff options
author | Dominik Picheta <dominikpicheta@googlemail.com> | 2012-08-19 02:40:21 +0100 |
---|---|---|
committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2012-08-19 02:40:21 +0100 |
commit | 3a4e22de33754c8f0ee48892d45a7f1057ee3300 (patch) | |
tree | 48ac23d2c89f4c043f720862b7d99065324b362f | |
parent | 2898cc7c0e71336e6945a2f7122208cf5a474097 (diff) | |
download | Nim-3a4e22de33754c8f0ee48892d45a7f1057ee3300.tar.gz |
os.JoinPath now uses varargs. Some additions to gtk wrappers.
-rwxr-xr-x | lib/pure/os.nim | 2 | ||||
-rwxr-xr-x | lib/wrappers/gtk/glib2.nim | 3 | ||||
-rwxr-xr-x | lib/wrappers/gtk/gtk2.nim | 27 |
3 files changed, 25 insertions, 7 deletions
diff --git a/lib/pure/os.nim b/lib/pure/os.nim index 5ec46d6b7..5a298db5b 100755 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -411,7 +411,7 @@ proc JoinPath*(head, tail: string): string {. else: result = head & DirSep & tail -proc JoinPath*(parts: openarray[string]): string {.noSideEffect, +proc JoinPath*(parts: varargs[string]): string {.noSideEffect, rtl, extern: "nos$1OpenArray".} = ## The same as `JoinPath(head, tail)`, but works with any number ## of directory parts. diff --git a/lib/wrappers/gtk/glib2.nim b/lib/wrappers/gtk/glib2.nim index 2d5227e09..b69b708fe 100755 --- a/lib/wrappers/gtk/glib2.nim +++ b/lib/wrappers/gtk/glib2.nim @@ -4529,3 +4529,6 @@ proc g_idle_add_full*(priority: guint, function, proc g_source_remove*(tag: guint): gboolean {. cdecl, dynlib: gliblib, importc: "g_source_remove".} + +proc g_signal_emit_by_name*(instance: gpointer, detailed_signal: cstring) {. + cdecl, varargs, dynlib: gobjectlib, importc.} diff --git a/lib/wrappers/gtk/gtk2.nim b/lib/wrappers/gtk/gtk2.nim index 7527faf60..ed5632140 100755 --- a/lib/wrappers/gtk/gtk2.nim +++ b/lib/wrappers/gtk/gtk2.nim @@ -4444,6 +4444,10 @@ proc get_value*(adjustment: PAdjustment): gdouble{.cdecl, dynlib: lib, importc: "gtk_adjustment_get_value".} proc set_value*(adjustment: PAdjustment, value: gdouble){.cdecl, dynlib: lib, importc: "gtk_adjustment_set_value".} +proc get_upper*(adjustment: PAdjustment): gdouble{.cdecl, + dynlib: lib, importc: "gtk_adjustment_get_upper".} +proc get_page_size*(adjustment: PAdjustment): gdouble{.cdecl, + dynlib: lib, importc: "gtk_adjustment_get_page_size".} proc TYPE_ALIGNMENT*(): GType proc ALIGNMENT*(obj: pointer): PAlignment proc ALIGNMENT_CLASS*(klass: pointer): PAlignmentClass @@ -9507,6 +9511,14 @@ proc get_line_log_attrs*(buffer: PTextBuffer, dynlib: lib, importc: "_gtk_text_buffer_get_line_log_attrs".} proc notify_will_remove_tag*(buffer: PTextBuffer, tag: PTextTag){. cdecl, dynlib: lib, importc: "_gtk_text_buffer_notify_will_remove_tag".} +proc get_has_selection*(buffer: PTextBuffer): bool {.cdecl, + dynlib: lib, importc: "gtk_text_buffer_get_has_selection".} +proc select_range*(buffer: PTextBuffer, ins, + bound: PTextIter) {.cdecl, dynlib: lib, importc: "gtk_text_buffer_select_range".} +proc backspace*(buffer: PTextBuffer, iter: PTextIter, + interactive, defaultEditable: bool): bool {.cdecl, + dynlib: lib, importc: "gtk_text_buffer_backspace".} + proc TYPE_TEXT_LAYOUT*(): GType proc TEXT_LAYOUT*(obj: pointer): PTextLayout proc TEXT_LAYOUT_CLASS*(klass: pointer): PTextLayoutClass @@ -16874,12 +16886,6 @@ proc get_realized*(w: PWidget): gboolean {.cdecl, dynlib: lib, proc set_skip_taskbar_hint*(window: PWindow, setting: gboolean){.cdecl, dynlib: lib, importc: "gtk_window_set_skip_taskbar_hint".} -proc nimrod_init*() = - var - cmdLine{.importc: "cmdLine".}: array[0..255, cstring] - cmdCount{.importc: "cmdCount".}: cint - init(addr(cmdLine), addr(cmdCount)) - type TTooltip* {.pure, final.} = object PTooltip* = ptr TTooltip @@ -16904,3 +16910,12 @@ proc set_markup*(tp: PTooltip, mk: cstring){.cdecl, dynlib: lib, proc set_visible_window*(evBox: PEventBox, v: gboolean){.cdecl, dynlib: lib, importc: "gtk_event_box_set_visible_window".} + +proc get_vadjustment*(scrolled_window: PTextView): PAdjustment{. + cdecl, dynlib: lib, importc: "gtk_text_view_get_vadjustment".} + +proc nimrod_init*() = + var + cmdLine{.importc: "cmdLine".}: array[0..255, cstring] + cmdCount{.importc: "cmdCount".}: cint + init(addr(cmdLine), addr(cmdCount)) |