ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2004-12-07 Mike Kestner <mkestner@novell.com>

Browse source 
* */*.cs : s/glue-2.0/glue-2 so that dllimport works on win32.
	* */*.custom : s/glue-2.0/glue-2
	* */glue/makefile.win32 : s/glue-2.0/glue-2
	* */glue/Makefile.am : s/glue-2.0/glue-2

svn path=/trunk/gtk-sharp/; revision=37324
This commit is contained in:
Mike Kestner 2004-12-07 19:03:55 +00:00
parent 628493fa3d
commit 993d91fa31
69 changed files with 328 additions and 320 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-12-07 Mike Kestner <mkestner@novell.com>
* */*.cs : s/glue-2.0/glue-2 so that dllimport works on win32.
* */*.custom : s/glue-2.0/glue-2
* */glue/makefile.win32 : s/glue-2.0/glue-2
* */glue/Makefile.am : s/glue-2.0/glue-2
2004-12-06 John Luke <john.luke@gmail.com> 2004-12-06 John Luke <john.luke@gmail.com>
* gtk/Gtk.metadata: set with_mnemonic as the preferred ctor * gtk/Gtk.metadata: set with_mnemonic as the preferred ctor

12
atk/glue/Makefile.am
View file

@ -1,20 +1,20 @@
lib_LTLIBRARIES = libatksharpglue-2.0.la lib_LTLIBRARIES = libatksharpglue-2.la
libatksharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined libatksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libatksharpglue_2_0_la_SOURCES = \ libatksharpglue_2_la_SOURCES = \
generated.c \ generated.c \
vmglueheaders.h vmglueheaders.h
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libatksharpglue_2_0_la_LIBADD = $(BASE_DEPENDENCIES_LIBS) libatksharpglue_2_la_LIBADD = $(BASE_DEPENDENCIES_LIBS)
INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir) INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir)
libatksharpglue.dll: $(libatksharpglue_2_0_la_OBJECTS) libatksharpglue.rc libatksharpglue.def libatksharpglue.dll: $(libatksharpglue_2_la_OBJECTS) libatksharpglue.rc libatksharpglue.def
./build-dll libatksharpglue-2.0 $(VERSION) ./build-dll libatksharpglue-2 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

8
atk/glue/makefile.win32
View file

@ -7,16 +7,16 @@ GLUE_OBJS = \
generated.o \ generated.o \
win32dll.o win32dll.o
all: atksharpglue-2.0.dll all: atksharpglue-2.dll
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
atksharpglue-2.0.dll: $(GLUE_OBJS) atksharpglue-2.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libatksharpglue-2.0.a --dllname=atksharpglue-2.0.dll --driver-name=gcc --output-def=atksharpglue.def $(GLUE_OBJS) $(GTK_LIBS) $(DLLWRAP) --output-lib=libatksharpglue-2.a --dllname=atksharpglue-2.dll --driver-name=gcc --output-def=atksharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
clean: clean:
rm -f atksharpglue-2.0.dll *.o libatksharpglue-2.0.a rm -f atksharpglue-2.dll *.o libatksharpglue-2.a

16
gdk/Device.custom
View file

@ -19,28 +19,28 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_device_get_name (IntPtr device); static extern IntPtr gtksharp_gdk_device_get_name (IntPtr device);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern InputSource gtksharp_gdk_device_get_source (IntPtr device); static extern InputSource gtksharp_gdk_device_get_source (IntPtr device);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern InputMode gtksharp_gdk_device_get_mode (IntPtr device); static extern InputMode gtksharp_gdk_device_get_mode (IntPtr device);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern bool gtksharp_gdk_device_has_cursor (IntPtr device); static extern bool gtksharp_gdk_device_has_cursor (IntPtr device);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern int gtksharp_gdk_device_get_num_axes (IntPtr device); static extern int gtksharp_gdk_device_get_num_axes (IntPtr device);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern int gtksharp_gdk_device_get_num_keys (IntPtr device); static extern int gtksharp_gdk_device_get_num_keys (IntPtr device);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern DeviceAxis gtksharp_gdk_device_get_device_axis (IntPtr device, uint axis); static extern DeviceAxis gtksharp_gdk_device_get_device_axis (IntPtr device, uint axis);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis); static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis);
[DllImport("libgdk-win32-2.0-0.dll")] [DllImport("libgdk-win32-2.0-0.dll")]

18
gdk/DragContext.custom
View file

@ -20,7 +20,7 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern DragProtocol gtksharp_drag_context_get_protocol (IntPtr ptr); static extern DragProtocol gtksharp_drag_context_get_protocol (IntPtr ptr);
public unsafe DragProtocol DragProtocol { public unsafe DragProtocol DragProtocol {
@ -30,7 +30,7 @@ public unsafe DragProtocol DragProtocol {
} }
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern bool gtksharp_drag_context_get_is_source (IntPtr ptr); static extern bool gtksharp_drag_context_get_is_source (IntPtr ptr);
public bool IsSource { public bool IsSource {
@ -40,7 +40,7 @@ public bool IsSource {
} }
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_drag_context_get_source_window (IntPtr ptr); static extern IntPtr gtksharp_drag_context_get_source_window (IntPtr ptr);
public Gdk.Window SourceWindow { public Gdk.Window SourceWindow {
@ -50,7 +50,7 @@ public Gdk.Window SourceWindow {
} }
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_drag_context_get_dest_window (IntPtr ptr); static extern IntPtr gtksharp_drag_context_get_dest_window (IntPtr ptr);
public Gdk.Window DestWindow { public Gdk.Window DestWindow {
@ -60,7 +60,7 @@ public Gdk.Window DestWindow {
} }
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_drag_context_get_targets (IntPtr ptr); static extern IntPtr gtksharp_drag_context_get_targets (IntPtr ptr);
public Atom [] Targets { public Atom [] Targets {
@ -78,7 +78,7 @@ public Atom [] Targets {
} }
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern DragAction gtksharp_drag_context_get_actions (IntPtr ptr); static extern DragAction gtksharp_drag_context_get_actions (IntPtr ptr);
public DragAction Actions { public DragAction Actions {
@ -87,7 +87,7 @@ public DragAction Actions {
} }
} }
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern DragAction gtksharp_drag_context_get_suggested_action (IntPtr ptr); static extern DragAction gtksharp_drag_context_get_suggested_action (IntPtr ptr);
public DragAction SuggestedAction { public DragAction SuggestedAction {
@ -97,7 +97,7 @@ public DragAction SuggestedAction {
} }
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern DragAction gtksharp_drag_context_get_action (IntPtr ptr); static extern DragAction gtksharp_drag_context_get_action (IntPtr ptr);
public DragAction Action { public DragAction Action {
@ -107,7 +107,7 @@ public DragAction Action {
} }
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_drag_context_get_start_time (IntPtr ptr); static extern uint gtksharp_drag_context_get_start_time (IntPtr ptr);
public uint StartTime { public uint StartTime {

6
gdk/Event.cs
View file

@ -28,13 +28,13 @@ namespace Gdk {
public class Event : GLib.IWrapper { public class Event : GLib.IWrapper {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern EventType gtksharp_gdk_event_get_event_type (IntPtr evt); static extern EventType gtksharp_gdk_event_get_event_type (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_get_window (IntPtr evt); static extern IntPtr gtksharp_gdk_event_get_window (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern sbyte gtksharp_gdk_event_get_send_event (IntPtr evt); static extern sbyte gtksharp_gdk_event_get_send_event (IntPtr evt);
[DllImport("libgdk-win32-2.0-0.dll")] [DllImport("libgdk-win32-2.0-0.dll")]

18
gdk/EventButton.cs
View file

@ -25,31 +25,31 @@ namespace Gdk {
public class EventButton : Event { public class EventButton : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_button_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_button_get_time (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_button_get_x (IntPtr evt); static extern double gtksharp_gdk_event_button_get_x (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_button_get_y (IntPtr evt); static extern double gtksharp_gdk_event_button_get_y (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_button_get_x_root (IntPtr evt); static extern double gtksharp_gdk_event_button_get_x_root (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_button_get_y_root (IntPtr evt); static extern double gtksharp_gdk_event_button_get_y_root (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_button_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_button_get_state (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_button_get_button (IntPtr evt); static extern uint gtksharp_gdk_event_button_get_button (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_button_get_device (IntPtr evt); static extern IntPtr gtksharp_gdk_event_button_get_device (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_button_get_axes (IntPtr evt); static extern IntPtr gtksharp_gdk_event_button_get_axes (IntPtr evt);
public EventButton (IntPtr raw) : base (raw) {} public EventButton (IntPtr raw) : base (raw) {}

8
gdk/EventClient.cs
View file

@ -26,16 +26,16 @@ namespace Gdk {
public class EventClient : Event { public class EventClient : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_client_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_client_get_time (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_client_get_message_type (IntPtr evt); static extern IntPtr gtksharp_gdk_event_client_get_message_type (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern ushort gtksharp_gdk_event_client_get_data_format (IntPtr evt); static extern ushort gtksharp_gdk_event_client_get_data_format (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_client_get_data (IntPtr evt); static extern IntPtr gtksharp_gdk_event_client_get_data (IntPtr evt);
public EventClient (IntPtr raw) : base (raw) {} public EventClient (IntPtr raw) : base (raw) {}

8
gdk/EventConfigure.cs
View file

@ -26,16 +26,16 @@ namespace Gdk {
public class EventConfigure : Event { public class EventConfigure : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern int gtksharp_gdk_event_configure_get_x (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_x (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern int gtksharp_gdk_event_configure_get_y (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_y (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern int gtksharp_gdk_event_configure_get_width (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_width (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern int gtksharp_gdk_event_configure_get_height (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_height (IntPtr evt);
public EventConfigure (IntPtr raw) : base (raw) {} public EventConfigure (IntPtr raw) : base (raw) {}

20
gdk/EventCrossing.cs
View file

@ -26,34 +26,34 @@ namespace Gdk {
public class EventCrossing : Event { public class EventCrossing : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_crossing_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_crossing_get_time (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_crossing_get_x (IntPtr evt); static extern double gtksharp_gdk_event_crossing_get_x (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_crossing_get_y (IntPtr evt); static extern double gtksharp_gdk_event_crossing_get_y (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_crossing_get_x_root (IntPtr evt); static extern double gtksharp_gdk_event_crossing_get_x_root (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_crossing_get_y_root (IntPtr evt); static extern double gtksharp_gdk_event_crossing_get_y_root (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_crossing_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_crossing_get_state (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_crossing_get_subwindow (IntPtr evt); static extern IntPtr gtksharp_gdk_event_crossing_get_subwindow (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern CrossingMode gtksharp_gdk_event_crossing_get_mode (IntPtr evt); static extern CrossingMode gtksharp_gdk_event_crossing_get_mode (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern NotifyType gtksharp_gdk_event_crossing_get_detail (IntPtr evt); static extern NotifyType gtksharp_gdk_event_crossing_get_detail (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern bool gtksharp_gdk_event_crossing_get_focus (IntPtr evt); static extern bool gtksharp_gdk_event_crossing_get_focus (IntPtr evt);
public EventCrossing (IntPtr raw) : base (raw) {} public EventCrossing (IntPtr raw) : base (raw) {}

8
gdk/EventDND.cs
View file

@ -26,16 +26,16 @@ namespace Gdk {
public class EventDND : Event { public class EventDND : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_dnd_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_dnd_get_time (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_dnd_get_context (IntPtr evt); static extern IntPtr gtksharp_gdk_event_dnd_get_context (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern short gtksharp_gdk_event_dnd_get_x_root (IntPtr evt); static extern short gtksharp_gdk_event_dnd_get_x_root (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern short gtksharp_gdk_event_dnd_get_y_root (IntPtr evt); static extern short gtksharp_gdk_event_dnd_get_y_root (IntPtr evt);
public EventDND (IntPtr raw) : base (raw) {} public EventDND (IntPtr raw) : base (raw) {}

6
gdk/EventExpose.cs
View file

@ -26,13 +26,13 @@ namespace Gdk {
public class EventExpose : Event { public class EventExpose : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern Rectangle gtksharp_gdk_event_expose_get_area (IntPtr evt); static extern Rectangle gtksharp_gdk_event_expose_get_area (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_expose_get_region (IntPtr evt); static extern IntPtr gtksharp_gdk_event_expose_get_region (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern int gtksharp_gdk_event_expose_get_count (IntPtr evt); static extern int gtksharp_gdk_event_expose_get_count (IntPtr evt);
public EventExpose (IntPtr raw) : base (raw) {} public EventExpose (IntPtr raw) : base (raw) {}

2
gdk/EventFocus.cs
View file

@ -26,7 +26,7 @@ namespace Gdk {
public class EventFocus : Event { public class EventFocus : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern short gtksharp_gdk_event_focus_get_in (IntPtr evt); static extern short gtksharp_gdk_event_focus_get_in (IntPtr evt);
public EventFocus (IntPtr raw) : base (raw) {} public EventFocus (IntPtr raw) : base (raw) {}

10
gdk/EventKey.cs
View file

@ -26,19 +26,19 @@ namespace Gdk {
public class EventKey : Event { public class EventKey : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_key_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_key_get_time (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_key_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_key_get_state (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_key_get_keyval (IntPtr evt); static extern uint gtksharp_gdk_event_key_get_keyval (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern ushort gtksharp_gdk_event_key_get_hardware_keycode (IntPtr evt); static extern ushort gtksharp_gdk_event_key_get_hardware_keycode (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern byte gtksharp_gdk_event_key_get_group (IntPtr evt); static extern byte gtksharp_gdk_event_key_get_group (IntPtr evt);
public EventKey (IntPtr raw) : base (raw) {} public EventKey (IntPtr raw) : base (raw) {}

18
gdk/EventMotion.cs
View file

@ -26,31 +26,31 @@ namespace Gdk {
public class EventMotion : Event { public class EventMotion : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_motion_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_motion_get_time (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_motion_get_x (IntPtr evt); static extern double gtksharp_gdk_event_motion_get_x (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_motion_get_y (IntPtr evt); static extern double gtksharp_gdk_event_motion_get_y (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_motion_get_x_root (IntPtr evt); static extern double gtksharp_gdk_event_motion_get_x_root (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_motion_get_y_root (IntPtr evt); static extern double gtksharp_gdk_event_motion_get_y_root (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_motion_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_motion_get_state (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern ushort gtksharp_gdk_event_motion_get_is_hint (IntPtr evt); static extern ushort gtksharp_gdk_event_motion_get_is_hint (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_motion_get_device (IntPtr evt); static extern IntPtr gtksharp_gdk_event_motion_get_device (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_motion_get_axes (IntPtr evt); static extern IntPtr gtksharp_gdk_event_motion_get_axes (IntPtr evt);
public EventMotion (IntPtr raw) : base (raw) {} public EventMotion (IntPtr raw) : base (raw) {}

6
gdk/EventProperty.cs
View file

@ -26,13 +26,13 @@ namespace Gdk {
public class EventProperty : Event { public class EventProperty : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_property_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_property_get_time (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_property_get_atom (IntPtr evt); static extern IntPtr gtksharp_gdk_event_property_get_atom (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern PropertyState gtksharp_gdk_event_property_get_state (IntPtr evt); static extern PropertyState gtksharp_gdk_event_property_get_state (IntPtr evt);
public EventProperty (IntPtr raw) : base (raw) {} public EventProperty (IntPtr raw) : base (raw) {}

4
gdk/EventProximity.cs
View file

@ -26,10 +26,10 @@ namespace Gdk {
public class EventProximity : Event { public class EventProximity : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_proximity_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_proximity_get_time (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_proximity_get_device (IntPtr evt); static extern IntPtr gtksharp_gdk_event_proximity_get_device (IntPtr evt);
public EventProximity (IntPtr raw) : base (raw) {} public EventProximity (IntPtr raw) : base (raw) {}

16
gdk/EventScroll.cs
View file

@ -26,28 +26,28 @@ namespace Gdk {
public class EventScroll : Event { public class EventScroll : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_scroll_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_scroll_get_time (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_scroll_get_x (IntPtr evt); static extern double gtksharp_gdk_event_scroll_get_x (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_scroll_get_y (IntPtr evt); static extern double gtksharp_gdk_event_scroll_get_y (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_scroll_get_x_root (IntPtr evt); static extern double gtksharp_gdk_event_scroll_get_x_root (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern double gtksharp_gdk_event_scroll_get_y_root (IntPtr evt); static extern double gtksharp_gdk_event_scroll_get_y_root (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_scroll_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_scroll_get_state (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern ScrollDirection gtksharp_gdk_event_scroll_get_direction (IntPtr evt); static extern ScrollDirection gtksharp_gdk_event_scroll_get_direction (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_scroll_get_device (IntPtr evt); static extern IntPtr gtksharp_gdk_event_scroll_get_device (IntPtr evt);
public EventScroll (IntPtr raw) : base (raw) {} public EventScroll (IntPtr raw) : base (raw) {}

10
gdk/EventSelection.cs
View file

@ -26,19 +26,19 @@ namespace Gdk {
public class EventSelection : Event { public class EventSelection : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_selection_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_selection_get_time (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_selection_get_selection (IntPtr evt); static extern IntPtr gtksharp_gdk_event_selection_get_selection (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_selection_get_target (IntPtr evt); static extern IntPtr gtksharp_gdk_event_selection_get_target (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_selection_get_property (IntPtr evt); static extern IntPtr gtksharp_gdk_event_selection_get_property (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern uint gtksharp_gdk_event_selection_get_requestor (IntPtr evt); static extern uint gtksharp_gdk_event_selection_get_requestor (IntPtr evt);
public EventSelection (IntPtr raw) : base (raw) {} public EventSelection (IntPtr raw) : base (raw) {}

4
gdk/EventSetting.cs
View file

@ -26,10 +26,10 @@ namespace Gdk {
public class EventSetting : Event { public class EventSetting : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern SettingAction gtksharp_gdk_event_setting_get_action (IntPtr evt); static extern SettingAction gtksharp_gdk_event_setting_get_action (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_gdk_event_setting_get_name (IntPtr evt); static extern IntPtr gtksharp_gdk_event_setting_get_name (IntPtr evt);
public EventSetting (IntPtr raw) : base (raw) {} public EventSetting (IntPtr raw) : base (raw) {}

2
gdk/EventVisibility.cs
View file

@ -26,7 +26,7 @@ namespace Gdk {
public class EventVisibility : Event { public class EventVisibility : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern VisibilityState gtksharp_gdk_event_visibility_get_state (IntPtr evt); static extern VisibilityState gtksharp_gdk_event_visibility_get_state (IntPtr evt);
public EventVisibility (IntPtr raw) : base (raw) {} public EventVisibility (IntPtr raw) : base (raw) {}

4
gdk/EventWindowState.cs
View file

@ -26,10 +26,10 @@ namespace Gdk {
public class EventWindowState : Event { public class EventWindowState : Event {
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern WindowState gtksharp_gdk_event_window_state_get_changed_mask (IntPtr evt); static extern WindowState gtksharp_gdk_event_window_state_get_changed_mask (IntPtr evt);
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern WindowState gtksharp_gdk_event_window_state_get_new_window_state (IntPtr evt); static extern WindowState gtksharp_gdk_event_window_state_get_new_window_state (IntPtr evt);
public EventWindowState (IntPtr raw) : base (raw) {} public EventWindowState (IntPtr raw) : base (raw) {}

12
gdk/Global.custom
View file

@ -49,7 +49,7 @@
return result; return result;
} }
[DllImport ("gdksharpglue-2.0")] [DllImport ("gdksharpglue-2")]
static extern IntPtr gtksharp_get_gdk_net_supported (); static extern IntPtr gtksharp_get_gdk_net_supported ();
public static Gdk.Atom[] SupportedWindowManagerHints { public static Gdk.Atom[] SupportedWindowManagerHints {
@ -66,7 +66,7 @@
} }
} }
[DllImport ("gdksharpglue-2.0")] [DllImport ("gdksharpglue-2")]
static extern IntPtr gtksharp_get_gdk_net_client_list (out int count); static extern IntPtr gtksharp_get_gdk_net_client_list (out int count);
public static Gdk.Window[] WindowManagerClientWindows { public static Gdk.Window[] WindowManagerClientWindows {
@ -87,7 +87,7 @@
} }
} }
[DllImport ("gdksharpglue-2.0")] [DllImport ("gdksharpglue-2")]
static extern int gtksharp_get_gdk_net_number_of_desktops (); static extern int gtksharp_get_gdk_net_number_of_desktops ();
public static int NumberOfDesktops { public static int NumberOfDesktops {
@ -96,7 +96,7 @@
} }
} }
[DllImport ("gdksharpglue-2.0")] [DllImport ("gdksharpglue-2")]
static extern int gtksharp_get_gdk_net_current_desktop (); static extern int gtksharp_get_gdk_net_current_desktop ();
public static int CurrentDesktop { public static int CurrentDesktop {
@ -105,7 +105,7 @@
} }
} }
[DllImport ("gdksharpglue-2.0")] [DllImport ("gdksharpglue-2")]
static extern uint gtksharp_get_gdk_net_active_window (); static extern uint gtksharp_get_gdk_net_active_window ();
public static Gdk.Window ActiveWindow { public static Gdk.Window ActiveWindow {
@ -119,7 +119,7 @@
} }
} }
[DllImport ("gdksharpglue-2.0")] [DllImport ("gdksharpglue-2")]
static extern IntPtr gtksharp_get_gdk_net_workarea (); static extern IntPtr gtksharp_get_gdk_net_workarea ();
public static Gdk.Rectangle[] DesktopWorkareas { public static Gdk.Rectangle[] DesktopWorkareas {

6
gdk/Selection.custom
View file

@ -20,17 +20,17 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_get_gdk_selection_primary (); static extern IntPtr gtksharp_get_gdk_selection_primary ();
public static Gdk.Atom Primary = new Gdk.Atom (gtksharp_get_gdk_selection_primary()); public static Gdk.Atom Primary = new Gdk.Atom (gtksharp_get_gdk_selection_primary());
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_get_gdk_selection_secondary (); static extern IntPtr gtksharp_get_gdk_selection_secondary ();
public static Gdk.Atom Secondary = new Gdk.Atom (gtksharp_get_gdk_selection_secondary()); public static Gdk.Atom Secondary = new Gdk.Atom (gtksharp_get_gdk_selection_secondary());
[DllImport("gdksharpglue-2.0")] [DllImport("gdksharpglue-2")]
static extern IntPtr gtksharp_get_gdk_selection_clipboard (); static extern IntPtr gtksharp_get_gdk_selection_clipboard ();
public static Gdk.Atom Clipboard = new Gdk.Atom (gtksharp_get_gdk_selection_clipboard()); public static Gdk.Atom Clipboard = new Gdk.Atom (gtksharp_get_gdk_selection_clipboard());

12
gdk/glue/Makefile.am
View file

@ -1,6 +1,6 @@
lib_LTLIBRARIES = libgdksharpglue-2.0.la lib_LTLIBRARIES = libgdksharpglue-2.la
libgdksharpglue_2_0_la_SOURCES = \ libgdksharpglue_2_la_SOURCES = \
dragcontext.c \ dragcontext.c \
device.c \ device.c \
event.c \ event.c \
@ -11,14 +11,14 @@ libgdksharpglue_2_0_la_SOURCES = \
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libgdksharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined libgdksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libgdksharpglue_2_0_la_LIBADD = $(GTK_LIBS) libgdksharpglue_2_la_LIBADD = $(GTK_LIBS)
INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir) INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)
libgdksharpglue.dll: $(libgdksharpglue_2_0_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def libgdksharpglue.dll: $(libgdksharpglue_2_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def
./build-dll libgdksharpglue-2.0 $(VERSION) ./build-dll libgdksharpglue-2 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

12
gdk/glue/makefile.win32
View file

@ -1,5 +1,5 @@
GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0` GTK_CFLAGS=`pkg-config --cflags gdk-win32-2.0`
GTK_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0` GTK_LIBS=`pkg-config --libs gdk-win32-2.0`
CC=gcc -mno-cygwin -mms-bitfields CC=gcc -mno-cygwin -mms-bitfields
DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols
@ -10,16 +10,16 @@ GLUE_OBJS = \
selection.o \ selection.o \
win32dll.o win32dll.o
all: gdksharpglue-2.0.dll all: gdksharpglue-2.dll
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
gdksharpglue-2.0.dll: $(GLUE_OBJS) gdksharpglue-2.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libgdksharpglue-2.0.a --dllname=gdksharpglue-2.0.dll --driver-name=gcc --output-def=gdksharpglue.def $(GLUE_OBJS) $(GTK_LIBS) $(DLLWRAP) --output-lib=libgdksharpglue-2.a --dllname=gdksharpglue-2.dll --driver-name=gcc --output-def=gdksharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
clean: clean:
rm -f gdksharpglue-2.0.dll *.o libgdksharpglue-2.0.a rm -f gdksharpglue-2.dll *.o libgdksharpglue-2.a

4
generator/BoxedGen.cs
View file

@ -39,10 +39,10 @@ namespace GtkSharp.Generation {
{ {
StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name); StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
base.Generate (gen_info); base.Generate (gen_info);
sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2.0\")]"); sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
sw.WriteLine ("\t\tstatic extern IntPtr glibsharp_value_get_boxed (ref GLib.Value val);"); sw.WriteLine ("\t\tstatic extern IntPtr glibsharp_value_get_boxed (ref GLib.Value val);");
sw.WriteLine (); sw.WriteLine ();
sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2.0\")]"); sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
sw.WriteLine ("\t\tstatic extern void glibsharp_value_set_boxed (ref GLib.Value val, ref " + QualifiedName + " boxed);"); sw.WriteLine ("\t\tstatic extern void glibsharp_value_set_boxed (ref GLib.Value val, ref " + QualifiedName + " boxed);");
sw.WriteLine (); sw.WriteLine ();
sw.WriteLine ("\t\tpublic static explicit operator GLib.Value (" + QualifiedName + " boxed)"); sw.WriteLine ("\t\tpublic static explicit operator GLib.Value (" + QualifiedName + " boxed)");

2
glade/XML.custom
View file

@ -36,7 +36,7 @@
glade_set_custom_handler (callback_wrapper.NativeDelegate, IntPtr.Zero); glade_set_custom_handler (callback_wrapper.NativeDelegate, IntPtr.Zero);
} }
[DllImport("gladesharpglue-2.0")] [DllImport("gladesharpglue-2")]
static extern IntPtr gtksharp_glade_xml_get_filename (IntPtr raw); static extern IntPtr gtksharp_glade_xml_get_filename (IntPtr raw);
public string Filename { public string Filename {

12
glade/glue/Makefile.am
View file

@ -1,22 +1,22 @@
lib_LTLIBRARIES = $(TARGET) lib_LTLIBRARIES = $(TARGET)
if ENABLE_GLADE if ENABLE_GLADE
TARGET = libgladesharpglue-2.0.la TARGET = libgladesharpglue-2.la
else else
TARGET = TARGET =
endif endif
libgladesharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined libgladesharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libgladesharpglue_2_0_la_SOURCES = \ libgladesharpglue_2_la_SOURCES = \
gladexml.c gladexml.c
libgladesharpglue_2_0_la_LIBADD = $(GLADE_LIBS) libgladesharpglue_2_la_LIBADD = $(GLADE_LIBS)
INCLUDES = $(GLADE_CFLAGS) -I$(top_srcdir) INCLUDES = $(GLADE_CFLAGS) -I$(top_srcdir)
libgladesharpglue.dll: $(libgladesharpglue_2_0_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def libgladesharpglue.dll: $(libgladesharpglue_2_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def
./build-dll libgladesharpglue-2.0 $(VERSION) ./build-dll libgladesharpglue-2 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

8
glade/glue/makefile.win32
View file

@ -7,16 +7,16 @@ GLUE_OBJS = \
gladexml.o \ gladexml.o \
win32dll.o win32dll.o
all: gladesharpglue-2.0.dll all: gladesharpglue-2.dll
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
gladesharpglue-2.0.dll: $(GLUE_OBJS) gladesharpglue-2.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libgladesharpglue-2.0.a --dllname=gladesharpglue-2.0.dll --driver-name=gcc --output-def=gladesharpglue.def $(GLUE_OBJS) $(GTK_LIBS) $(DLLWRAP) --output-lib=libgladesharpglue-2.a --dllname=gladesharpglue-2.dll --driver-name=gcc --output-def=gladesharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
clean: clean:
rm -f gladesharpglue-2.0.dll *.o libgladesharpglue-2.0.a rm -f gladesharpglue-2.dll *.o libgladesharpglue-2.a

2
glib/GException.cs
View file

@ -33,7 +33,7 @@ namespace GLib {
this.errptr = errptr; this.errptr = errptr;
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_error_get_message (IntPtr errptr); static extern IntPtr gtksharp_error_get_message (IntPtr errptr);
public override string Message { public override string Message {
get { get {

4
glib/List.cs
View file

@ -34,7 +34,7 @@ namespace GLib {
return new List (g_list_copy (Handle)); return new List (g_list_copy (Handle));
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_list_get_data (IntPtr l); static extern IntPtr gtksharp_list_get_data (IntPtr l);
internal override IntPtr GetData (IntPtr current) internal override IntPtr GetData (IntPtr current)
@ -42,7 +42,7 @@ namespace GLib {
return gtksharp_list_get_data (current); return gtksharp_list_get_data (current);
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_list_get_next (IntPtr l); static extern IntPtr gtksharp_list_get_next (IntPtr l);
internal override IntPtr Next (IntPtr current) internal override IntPtr Next (IntPtr current)

4
glib/Marshaller.cs
View file

@ -173,7 +173,7 @@ namespace GLib {
return local_epoch.AddSeconds ((int)time_t + utc_offset); return local_epoch.AddSeconds ((int)time_t + utc_offset);
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_unichar_to_utf8_string (uint c); static extern IntPtr gtksharp_unichar_to_utf8_string (uint c);
public static char GUnicharToChar (uint ucs4_char) public static char GUnicharToChar (uint ucs4_char)
@ -186,7 +186,7 @@ namespace GLib {
return ret [0]; return ret [0];
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern uint glibsharp_utf16_to_gunichar (ushort c); static extern uint glibsharp_utf16_to_gunichar (ushort c);
public static uint CharToGUnichar (char c) public static uint CharToGUnichar (char c)

14
glib/Object.cs
View file

@ -137,7 +137,7 @@ namespace GLib {
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_register_type (string name, IntPtr parent_type); static extern IntPtr gtksharp_register_type (string name, IntPtr parent_type);
protected static GType RegisterGType (System.Type t) protected static GType RegisterGType (System.Type t)
@ -185,7 +185,7 @@ namespace GLib {
Raw = g_object_new (gtype.Val, IntPtr.Zero); Raw = g_object_new (gtype.Val, IntPtr.Zero);
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_object_newv (IntPtr gtype, int n_params, string[] names, GLib.Value[] vals); static extern IntPtr gtksharp_object_newv (IntPtr gtype, int n_params, string[] names, GLib.Value[] vals);
protected virtual void CreateNativeObject (string[] names, GLib.Value[] vals) protected virtual void CreateNativeObject (string[] names, GLib.Value[] vals)
@ -207,7 +207,7 @@ namespace GLib {
} }
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
private static extern IntPtr gtksharp_get_type_id (IntPtr obj); private static extern IntPtr gtksharp_get_type_id (IntPtr obj);
public static GLib.GType GType { public static GLib.GType GType {
@ -216,7 +216,7 @@ namespace GLib {
} }
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_get_type_name (IntPtr raw); static extern IntPtr gtksharp_get_type_name (IntPtr raw);
protected string TypeName { protected string TypeName {
@ -305,7 +305,7 @@ namespace GLib {
g_object_set_property (Raw, name, ref val); g_object_set_property (Raw, name, ref val);
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern void gtksharp_override_virtual_method (IntPtr gtype, string name, Delegate cb); static extern void gtksharp_override_virtual_method (IntPtr gtype, string name, Delegate cb);
protected static void OverrideVirtualMethod (GType gtype, string name, Delegate cb) protected static void OverrideVirtualMethod (GType gtype, string name, Delegate cb)
@ -316,7 +316,7 @@ namespace GLib {
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]
protected static extern void g_signal_chain_from_overridden (IntPtr args, ref GLib.Value retval); protected static extern void g_signal_chain_from_overridden (IntPtr args, ref GLib.Value retval);
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern bool gtksharp_is_object (IntPtr obj); static extern bool gtksharp_is_object (IntPtr obj);
internal static bool IsObject (IntPtr obj) internal static bool IsObject (IntPtr obj)
@ -324,7 +324,7 @@ namespace GLib {
return gtksharp_is_object (obj); return gtksharp_is_object (obj);
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern int gtksharp_object_get_ref_count (IntPtr obj); static extern int gtksharp_object_get_ref_count (IntPtr obj);
protected int RefCount { protected int RefCount {

8
glib/ObjectManager.cs
View file

@ -32,7 +32,7 @@ namespace GLib {
private static Hashtable types = new Hashtable (); private static Hashtable types = new Hashtable ();
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_get_type_name (IntPtr raw); static extern IntPtr gtksharp_get_type_name (IntPtr raw);
public static GLib.Object CreateObject (IntPtr raw) public static GLib.Object CreateObject (IntPtr raw)
@ -107,13 +107,13 @@ namespace GLib {
return expected_string; return expected_string;
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern int gtksharp_get_type_id (IntPtr raw); static extern int gtksharp_get_type_id (IntPtr raw);
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern int gtksharp_get_parent_type (int typ); static extern int gtksharp_get_parent_type (int typ);
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_get_type_name_for_id (int typ); static extern IntPtr gtksharp_get_type_name_for_id (int typ);
static Type LookupType (string mangled) static Type LookupType (string mangled)

4
glib/SList.cs
View file

@ -34,7 +34,7 @@ namespace GLib {
return new SList (g_slist_copy (Handle)); return new SList (g_slist_copy (Handle));
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_slist_get_data (IntPtr l); static extern IntPtr gtksharp_slist_get_data (IntPtr l);
internal override IntPtr GetData (IntPtr current) internal override IntPtr GetData (IntPtr current)
@ -42,7 +42,7 @@ namespace GLib {
return gtksharp_slist_get_data (current); return gtksharp_slist_get_data (current);
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_slist_get_next (IntPtr l); static extern IntPtr gtksharp_slist_get_next (IntPtr l);
internal override IntPtr Next (IntPtr current) internal override IntPtr Next (IntPtr current)

10
glib/Value.cs
View file

@ -41,13 +41,13 @@ namespace GLib {
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]
static extern void g_value_unset (ref GLib.Value val); static extern void g_value_unset (ref GLib.Value val);
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_value_create_from_property(ref GLib.Value val, IntPtr obj, string name); static extern IntPtr gtksharp_value_create_from_property(ref GLib.Value val, IntPtr obj, string name);
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_value_create_from_type_and_property(ref GLib.Value val, IntPtr gtype, string name); static extern IntPtr gtksharp_value_create_from_type_and_property(ref GLib.Value val, IntPtr gtype, string name);
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_value_create_from_type_name(ref GLib.Value val, string type_name); static extern IntPtr gtksharp_value_create_from_type_name(ref GLib.Value val, string type_name);
public void Dispose () public void Dispose ()
@ -334,7 +334,7 @@ namespace GLib {
static extern int g_value_get_enum (ref Value val); static extern int g_value_get_enum (ref Value val);
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]
static extern uint g_value_get_flags (ref Value val); static extern uint g_value_get_flags (ref Value val);
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern bool glibsharp_value_holds_flags (ref Value val); static extern bool glibsharp_value_holds_flags (ref Value val);
public static explicit operator EnumWrapper (Value val) public static explicit operator EnumWrapper (Value val)
@ -345,7 +345,7 @@ namespace GLib {
return new EnumWrapper (g_value_get_enum (ref val), false); return new EnumWrapper (g_value_get_enum (ref val), false);
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_value_get_value_type (ref Value val); static extern IntPtr gtksharp_value_get_value_type (ref Value val);
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]

4
glib/ValueArray.cs
View file

@ -72,7 +72,7 @@ namespace GLib {
} }
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_value_array_get_array (IntPtr raw); static extern IntPtr gtksharp_value_array_get_array (IntPtr raw);
public IntPtr ArrayPtr { public IntPtr ArrayPtr {
@ -113,7 +113,7 @@ namespace GLib {
g_value_array_remove (Handle, idx); g_value_array_remove (Handle, idx);
} }
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern int gtksharp_value_array_get_count (IntPtr raw); static extern int gtksharp_value_array_get_count (IntPtr raw);
// ICollection // ICollection

12
glib/glue/Makefile.am
View file

@ -1,8 +1,8 @@
lib_LTLIBRARIES = libglibsharpglue-2.0.la lib_LTLIBRARIES = libglibsharpglue-2.la
libglibsharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined libglibsharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libglibsharpglue_2_0_la_SOURCES = \ libglibsharpglue_2_la_SOURCES = \
error.c \ error.c \
list.c \ list.c \
object.c \ object.c \
@ -15,12 +15,12 @@ libglibsharpglue_2_0_la_SOURCES = \
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libglibsharpglue_2_0_la_LIBADD = $(GLIB_LIBS) libglibsharpglue_2_la_LIBADD = $(GLIB_LIBS)
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
libgtksharpglue.dll: $(libgtksharpglue_2_0_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def libgtksharpglue.dll: $(libgtksharpglue_2_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
./build-dll libgtksharpglue-2.0 $(VERSION) ./build-dll libgtksharpglue-2 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

12
glib/glue/makefile.win32
View file

@ -1,5 +1,5 @@
GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0` GTK_CFLAGS=`pkg-config --cflags gobject-2.0`
GTK_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0` GTK_LIBS=`pkg-config --libs gobject-2.0`
CC=gcc -mno-cygwin -mms-bitfields CC=gcc -mno-cygwin -mms-bitfields
DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols
@ -14,16 +14,16 @@ GLUE_OBJS = \
valuearray.o \ valuearray.o \
win32dll.o win32dll.o
all: glibsharpglue-2.0.dll all: glibsharpglue-2.dll
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
glibsharpglue-2.0.dll: $(GLUE_OBJS) glibsharpglue-2.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libglibsharpglue-2.0.a --dllname=glibsharpglue-2.0.dll --driver-name=gcc --output-def=glibsharpglue-2.0.def $(GLUE_OBJS) $(GTK_LIBS) $(DLLWRAP) --output-lib=libglibsharpglue-2.a --dllname=glibsharpglue-2.dll --driver-name=gcc --output-def=glibsharpglue-2.def $(GLUE_OBJS) $(GTK_LIBS)
clean: clean:
rm -f glibsharpglue-2.0.dll *.o libglibsharpglue-2.0.a rm -f glibsharpglue-2.dll *.o libglibsharpglue-2.a

2
gnome/Canvas.custom
View file

@ -33,7 +33,7 @@
gnome_canvas_w2c_affine(Handle, affine); gnome_canvas_w2c_affine(Handle, affine);
} }
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern double gnomesharp_canvas_get_pixels_per_unit (IntPtr raw); static extern double gnomesharp_canvas_get_pixels_per_unit (IntPtr raw);
[DllImport("gnomecanvas-2")] [DllImport("gnomecanvas-2")]

22
gnome/CanvasItem.custom
View file

@ -34,7 +34,7 @@
g_object_ref (Handle); g_object_ref (Handle);
} }
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern IntPtr gtksharp_gnome_canvas_item_get_canvas (IntPtr i); static extern IntPtr gtksharp_gnome_canvas_item_get_canvas (IntPtr i);
public Canvas Canvas { public Canvas Canvas {
get { return GLib.Object.GetObject (gtksharp_gnome_canvas_item_get_canvas (this.Handle), false) as Canvas; } get { return GLib.Object.GetObject (gtksharp_gnome_canvas_item_get_canvas (this.Handle), false) as Canvas; }
@ -56,10 +56,10 @@
gnome_canvas_item_i2w_affine(Handle, affine); gnome_canvas_item_i2w_affine(Handle, affine);
} }
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern void gnomesharp_canvas_item_base_realize (IntPtr handle); static extern void gnomesharp_canvas_item_base_realize (IntPtr handle);
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern void gnomesharp_canvas_item_override_realize (GLib.GType gtype, RealizeDelegate cb); static extern void gnomesharp_canvas_item_override_realize (GLib.GType gtype, RealizeDelegate cb);
delegate void RealizeDelegate (IntPtr item); delegate void RealizeDelegate (IntPtr item);
@ -85,10 +85,10 @@
gnomesharp_canvas_item_base_realize (Handle); gnomesharp_canvas_item_base_realize (Handle);
} }
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern double gnomesharp_canvas_item_base_point (IntPtr handle, double x, double y, int cx, int cy, out IntPtr actual_item_handle); static extern double gnomesharp_canvas_item_base_point (IntPtr handle, double x, double y, int cx, int cy, out IntPtr actual_item_handle);
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern void gnomesharp_canvas_item_override_point (GLib.GType gtype, PointDelegate cb); static extern void gnomesharp_canvas_item_override_point (GLib.GType gtype, PointDelegate cb);
delegate double PointDelegate (IntPtr item, double x, double y, int cx, int cy, out IntPtr actual_item_handle); delegate double PointDelegate (IntPtr item, double x, double y, int cx, int cy, out IntPtr actual_item_handle);
@ -120,10 +120,10 @@
return result; return result;
} }
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern void gnomesharp_canvas_item_base_draw (IntPtr handle, IntPtr drawable, int x, int y, int width, int height); static extern void gnomesharp_canvas_item_base_draw (IntPtr handle, IntPtr drawable, int x, int y, int width, int height);
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern void gnomesharp_canvas_item_override_draw (GLib.GType gtype, DrawDelegate cb); static extern void gnomesharp_canvas_item_override_draw (GLib.GType gtype, DrawDelegate cb);
delegate void DrawDelegate (IntPtr handle, IntPtr drawable, int x, int y, int width, int height); delegate void DrawDelegate (IntPtr handle, IntPtr drawable, int x, int y, int width, int height);
@ -150,10 +150,10 @@
gnomesharp_canvas_item_base_draw (Handle, drawable.Handle, x, y, width, height); gnomesharp_canvas_item_base_draw (Handle, drawable.Handle, x, y, width, height);
} }
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern void gnomesharp_canvas_item_base_render (IntPtr handle, ref CanvasBuf buf); static extern void gnomesharp_canvas_item_base_render (IntPtr handle, ref CanvasBuf buf);
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern void gnomesharp_canvas_item_override_render (GLib.GType gtype, RenderDelegate cb); static extern void gnomesharp_canvas_item_override_render (GLib.GType gtype, RenderDelegate cb);
delegate void RenderDelegate (IntPtr handle, ref CanvasBuf buf); delegate void RenderDelegate (IntPtr handle, ref CanvasBuf buf);
@ -179,10 +179,10 @@
gnomesharp_canvas_item_base_render (Handle, ref buf); gnomesharp_canvas_item_base_render (Handle, ref buf);
} }
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern void gnomesharp_canvas_item_base_update (IntPtr handle, double[] affine, ref Art.SVP clip_path, int flags); static extern void gnomesharp_canvas_item_base_update (IntPtr handle, double[] affine, ref Art.SVP clip_path, int flags);
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern void gnomesharp_canvas_item_override_update (GLib.GType gtype, UpdateDelegate cb); static extern void gnomesharp_canvas_item_override_update (GLib.GType gtype, UpdateDelegate cb);
delegate void UpdateDelegate (IntPtr item, IntPtr affine_ptr, IntPtr clip_path, int flags); delegate void UpdateDelegate (IntPtr item, IntPtr affine_ptr, IntPtr clip_path, int flags);

2
gnome/CanvasPoints.custom
View file

@ -23,7 +23,7 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern System.IntPtr static extern System.IntPtr
gtksharp_gnome_canvas_points_new_from_array (uint num_points, double[] coords); gtksharp_gnome_canvas_points_new_from_array (uint num_points, double[] coords);

2
gnome/Program.custom
View file

@ -32,7 +32,7 @@ struct PropertyArg {
public GLib.Value value; public GLib.Value value;
} }
[DllImport("gnomesharpglue-2.0")] [DllImport("gnomesharpglue-2")]
static extern System.IntPtr static extern System.IntPtr
gtksharp_gnome_program_init (string app_id, string app_version, ref ModuleInfo module, int argc, string[] argv, int nargs, PropertyArg[] args); gtksharp_gnome_program_init (string app_id, string app_version, ref ModuleInfo module, int argc, string[] argv, int nargs, PropertyArg[] args);

12
gnome/glue/Makefile.am
View file

@ -1,14 +1,14 @@
lib_LTLIBRARIES = $(TARGET) lib_LTLIBRARIES = $(TARGET)
if ENABLE_GNOME if ENABLE_GNOME
TARGET = libgnomesharpglue-2.0.la TARGET = libgnomesharpglue-2.la
else else
TARGET = TARGET =
endif endif
libgnomesharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined libgnomesharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libgnomesharpglue_2_0_la_SOURCES = \ libgnomesharpglue_2_la_SOURCES = \
canvas.c \ canvas.c \
canvasitem.c \ canvasitem.c \
canvaspoints.c \ canvaspoints.c \
@ -19,12 +19,12 @@ libgnomesharpglue_2_0_la_SOURCES = \
program.c \ program.c \
# #
libgnomesharpglue_2_0_la_LIBADD = $(GNOME_LIBS) libgnomesharpglue_2_la_LIBADD = $(GNOME_LIBS)
INCLUDES = $(GNOME_CFLAGS) -I$(top_srcdir) INCLUDES = $(GNOME_CFLAGS) -I$(top_srcdir)
libgnomesharpglue.dll: $(libgnomesharpglue_2_0_la_OBJECTS) libgnomesharpglue.rc libgnomesharpglue.def libgnomesharpglue.dll: $(libgnomesharpglue_2_la_OBJECTS) libgnomesharpglue.rc libgnomesharpglue.def
./build-dll libgnomesharpglue-2.0 $(VERSION) ./build-dll libgnomesharpglue-2 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

2
gtk/Adjustment.custom
View file

@ -37,7 +37,7 @@ public Adjustment (double value, double lower, double upper, double step_increme
Raw = gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size); Raw = gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_gtk_adjustment_set_bounds (IntPtr i, double lower, double upper, double step_increment, double page_increment, double page_size); static extern void gtksharp_gtk_adjustment_set_bounds (IntPtr i, double lower, double upper, double step_increment, double page_increment, double page_size);
public void SetBounds (double lower, double upper, double step_increment, double page_increment, double page_size) public void SetBounds (double lower, double upper, double step_increment, double page_increment, double page_size)

4
gtk/Button.custom
View file

@ -39,9 +39,9 @@ public Button (string stock_id) : base (IntPtr.Zero)
Raw = gtk_button_new_from_stock(stock_id); Raw = gtk_button_new_from_stock(stock_id);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern int gtksharp_button_get_in_button (IntPtr button); static extern int gtksharp_button_get_in_button (IntPtr button);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_button_set_in_button (IntPtr button, int b); static extern void gtksharp_button_set_in_button (IntPtr button, int b);
public bool InButton { public bool InButton {

12
gtk/CellRenderer.custom
View file

@ -23,10 +23,10 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_cellrenderer_base_get_size (IntPtr handle, IntPtr widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height); static extern void gtksharp_cellrenderer_base_get_size (IntPtr handle, IntPtr widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_cellrenderer_override_get_size (GLib.GType gtype, GetSizeDelegate cb); static extern void gtksharp_cellrenderer_override_get_size (GLib.GType gtype, GetSizeDelegate cb);
delegate void GetSizeDelegate (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height); delegate void GetSizeDelegate (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height);
@ -64,10 +64,10 @@
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_cellrenderer_base_render (IntPtr handle, IntPtr window, IntPtr widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags); static extern void gtksharp_cellrenderer_base_render (IntPtr handle, IntPtr window, IntPtr widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_cellrenderer_override_render (GLib.GType gtype, RenderDelegate cb); static extern void gtksharp_cellrenderer_override_render (GLib.GType gtype, RenderDelegate cb);
delegate void RenderDelegate (IntPtr item, IntPtr window, IntPtr widget, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, Gtk.CellRendererState flags); delegate void RenderDelegate (IntPtr item, IntPtr window, IntPtr widget, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
@ -95,7 +95,7 @@
gtksharp_cellrenderer_base_render (Handle, window.Handle, widget.Handle, background_area, cell_area, expose_area, flags); gtksharp_cellrenderer_base_render (Handle, window.Handle, widget.Handle, background_area, cell_area, expose_area, flags);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_cellrenderer_override_start_editing (GLib.GType gtype, StartEditingDelegate cb); static extern void gtksharp_cellrenderer_override_start_editing (GLib.GType gtype, StartEditingDelegate cb);
delegate IntPtr StartEditingDelegate (IntPtr raw, IntPtr evnt, IntPtr widget, string path, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, Gtk.CellRendererState flags); delegate IntPtr StartEditingDelegate (IntPtr raw, IntPtr evnt, IntPtr widget, string path, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
@ -120,7 +120,7 @@
gtksharp_cellrenderer_override_start_editing (gtype, StartEditingCallback); gtksharp_cellrenderer_override_start_editing (gtype, StartEditingCallback);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_cellrenderer_base_start_editing(IntPtr raw, IntPtr evnt, IntPtr widget, string path, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, int flags); static extern IntPtr gtksharp_cellrenderer_base_start_editing(IntPtr raw, IntPtr evnt, IntPtr widget, string path, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, int flags);
[GLib.DefaultSignalHandler (Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideStartEditing")] [GLib.DefaultSignalHandler (Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideStartEditing")]

8
gtk/Clipboard.custom
View file

@ -21,16 +21,16 @@
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
static extern bool gtk_clipboard_set_with_data(IntPtr raw, IntPtr targets, int n_targets, GtkSharp.GtkClipboardGetFuncNative get_func, GtkSharp.GtkClipboardClearFuncNative clear_func, uint id); static extern bool gtk_clipboard_set_with_data(IntPtr raw, IntPtr targets, int n_targets, GtkSharp.GtkClipboardGetFuncNative get_func, GtkSharp.GtkClipboardClearFuncNative clear_func, uint id);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_clipboard_target_list_add (IntPtr list, string name, uint flags, uint info); static extern IntPtr gtksharp_clipboard_target_list_add (IntPtr list, string name, uint flags, uint info);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_clipboard_target_list_to_array (IntPtr list); static extern IntPtr gtksharp_clipboard_target_list_to_array (IntPtr list);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_clipboard_target_array_free (IntPtr targets); static extern void gtksharp_clipboard_target_array_free (IntPtr targets);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_clipboard_target_list_free (IntPtr list); static extern void gtksharp_clipboard_target_list_free (IntPtr list);
GtkSharp.GtkClipboardGetFuncWrapper get_func_wrapper; GtkSharp.GtkClipboardGetFuncWrapper get_func_wrapper;

8
gtk/ColorSelectionDialog.custom
View file

@ -35,25 +35,25 @@ public class ColorSelectionButton : Gtk.Button {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_color_selection_dialog_get_colorsel (IntPtr i); static extern IntPtr gtksharp_color_selection_dialog_get_colorsel (IntPtr i);
public Gtk.ColorSelection ColorSelection { public Gtk.ColorSelection ColorSelection {
get { return new ColorSelection (gtksharp_color_selection_dialog_get_colorsel (this.Handle)); } get { return new ColorSelection (gtksharp_color_selection_dialog_get_colorsel (this.Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_color_selection_dialog_get_ok_button (IntPtr i); static extern IntPtr gtksharp_color_selection_dialog_get_ok_button (IntPtr i);
public Gtk.Button OkButton { public Gtk.Button OkButton {
get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_ok_button (this.Handle)); } get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_ok_button (this.Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_color_selection_dialog_get_cancel_button (IntPtr i); static extern IntPtr gtksharp_color_selection_dialog_get_cancel_button (IntPtr i);
public Gtk.Button CancelButton { public Gtk.Button CancelButton {
get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_cancel_button (this.Handle)); } get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_cancel_button (this.Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_color_selection_dialog_get_help_button (IntPtr i); static extern IntPtr gtksharp_color_selection_dialog_get_help_button (IntPtr i);
public Gtk.Button HelpButton { public Gtk.Button HelpButton {
get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_help_button (this.Handle)); } get { return new ColorSelectionButton (this, gtksharp_color_selection_dialog_get_help_button (this.Handle)); }

4
gtk/Combo.custom
View file

@ -26,7 +26,7 @@ public string[] PopdownStrings {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_combo_get_entry(IntPtr i); static extern IntPtr gtksharp_combo_get_entry(IntPtr i);
public Gtk.Entry Entry { public Gtk.Entry Entry {
@ -35,7 +35,7 @@ public Gtk.Entry Entry {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_combo_get_button(IntPtr i); static extern IntPtr gtksharp_combo_get_button(IntPtr i);
public Gtk.Button Button { public Gtk.Button Button {

14
gtk/Container.custom
View file

@ -19,7 +19,7 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_container_child_get_property (IntPtr container, IntPtr child, string property, ref GLib.Value value); static extern void gtksharp_container_child_get_property (IntPtr container, IntPtr child, string property, ref GLib.Value value);
public GLib.Value ChildGetProperty (Gtk.Widget child, string property_name) { public GLib.Value ChildGetProperty (Gtk.Widget child, string property_name) {
@ -74,7 +74,7 @@ public Widget[] FocusChain {
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_container_get_focus_child(IntPtr raw); static extern IntPtr gtksharp_container_get_focus_child(IntPtr raw);
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
@ -95,13 +95,13 @@ public Gtk.Widget FocusChild {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_container_base_forall (IntPtr handle, bool include_internals, IntPtr cb, IntPtr data); static extern void gtksharp_container_base_forall (IntPtr handle, bool include_internals, IntPtr cb, IntPtr data);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_container_override_forall (GLib.GType gtype, ForallDelegate cb); static extern void gtksharp_container_override_forall (GLib.GType gtype, ForallDelegate cb);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_container_invoke_gtk_callback (IntPtr cb, IntPtr handle, IntPtr data); static extern void gtksharp_container_invoke_gtk_callback (IntPtr cb, IntPtr handle, IntPtr data);
delegate void ForallDelegate (IntPtr container, bool include_internals, IntPtr cb, IntPtr data); delegate void ForallDelegate (IntPtr container, bool include_internals, IntPtr cb, IntPtr data);
@ -156,10 +156,10 @@ protected virtual void ForAll (bool include_internals, CallbackInvoker invoker)
gtksharp_container_base_forall (Handle, include_internals, invoker.Callback, invoker.Data); gtksharp_container_base_forall (Handle, include_internals, invoker.Callback, invoker.Data);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_container_base_child_type(IntPtr raw); static extern IntPtr gtksharp_container_base_child_type(IntPtr raw);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_container_override_child_type (GLib.GType type, ChildTypeDelegate cb); static extern void gtksharp_container_override_child_type (GLib.GType type, ChildTypeDelegate cb);
delegate IntPtr ChildTypeDelegate (IntPtr raw); delegate IntPtr ChildTypeDelegate (IntPtr raw);

4
gtk/Dialog.custom
View file

@ -48,13 +48,13 @@ public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags) : base(In
Raw = gtk_dialog_new_with_buttons (title, parent.Handle, (int) flags, IntPtr.Zero); Raw = gtk_dialog_new_with_buttons (title, parent.Handle, (int) flags, IntPtr.Zero);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_dialog_get_vbox (IntPtr i); static extern IntPtr gtksharp_dialog_get_vbox (IntPtr i);
public Gtk.VBox VBox { public Gtk.VBox VBox {
get { return GLib.Object.GetObject (gtksharp_dialog_get_vbox (this.Handle), false) as VBox; } get { return GLib.Object.GetObject (gtksharp_dialog_get_vbox (this.Handle), false) as VBox; }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_dialog_get_action_area (IntPtr i); static extern IntPtr gtksharp_dialog_get_action_area (IntPtr i);
public Gtk.HButtonBox ActionArea { public Gtk.HButtonBox ActionArea {
get { return GLib.Object.GetObject (gtksharp_dialog_get_action_area (this.Handle), false) as HButtonBox; } get { return GLib.Object.GetObject (gtksharp_dialog_get_action_area (this.Handle), false) as HButtonBox; }

34
gtk/FileSelection.custom
View file

@ -36,73 +36,73 @@ public class FSButton : Gtk.Button {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_dir_list (IntPtr i); static extern IntPtr gtksharp_file_selection_get_dir_list (IntPtr i);
public Gtk.TreeView DirList { public Gtk.TreeView DirList {
get { return GLib.Object.GetObject (gtksharp_file_selection_get_dir_list (this.Handle), false) as Gtk.TreeView; } get { return GLib.Object.GetObject (gtksharp_file_selection_get_dir_list (this.Handle), false) as Gtk.TreeView; }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_file_list (IntPtr i); static extern IntPtr gtksharp_file_selection_get_file_list (IntPtr i);
public Gtk.TreeView FileList { public Gtk.TreeView FileList {
get { return GLib.Object.GetObject (gtksharp_file_selection_get_file_list (this.Handle), false) as Gtk.TreeView; } get { return GLib.Object.GetObject (gtksharp_file_selection_get_file_list (this.Handle), false) as Gtk.TreeView; }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_selection_entry (IntPtr i); static extern IntPtr gtksharp_file_selection_get_selection_entry (IntPtr i);
public Gtk.Entry SelectionEntry { public Gtk.Entry SelectionEntry {
get { return GLib.Object.GetObject (gtksharp_file_selection_get_selection_entry (this.Handle), false) as Gtk.Entry; } get { return GLib.Object.GetObject (gtksharp_file_selection_get_selection_entry (this.Handle), false) as Gtk.Entry; }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_selection_text (IntPtr i); static extern IntPtr gtksharp_file_selection_get_selection_text (IntPtr i);
public Gtk.Label SelectionText { public Gtk.Label SelectionText {
get { return GLib.Object.GetObject (gtksharp_file_selection_get_selection_text (this.Handle), false) as Gtk.Label; } get { return GLib.Object.GetObject (gtksharp_file_selection_get_selection_text (this.Handle), false) as Gtk.Label; }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_ok_button (IntPtr i); static extern IntPtr gtksharp_file_selection_get_ok_button (IntPtr i);
public Gtk.Button OkButton { public Gtk.Button OkButton {
get { return new FSButton (this, gtksharp_file_selection_get_ok_button (this.Handle)); } get { return new FSButton (this, gtksharp_file_selection_get_ok_button (this.Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_cancel_button (IntPtr i); static extern IntPtr gtksharp_file_selection_get_cancel_button (IntPtr i);
public Gtk.Button CancelButton { public Gtk.Button CancelButton {
get { return new FSButton (this, gtksharp_file_selection_get_cancel_button (this.Handle)); } get { return new FSButton (this, gtksharp_file_selection_get_cancel_button (this.Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_help_button (IntPtr i); static extern IntPtr gtksharp_file_selection_get_help_button (IntPtr i);
public Gtk.Button HelpButton { public Gtk.Button HelpButton {
get { return new FSButton (this, gtksharp_file_selection_get_help_button (this.Handle)); } get { return new FSButton (this, gtksharp_file_selection_get_help_button (this.Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_history_pulldown (IntPtr i); static extern IntPtr gtksharp_file_selection_get_history_pulldown (IntPtr i);
public Gtk.OptionMenu HistoryPulldown { public Gtk.OptionMenu HistoryPulldown {
get { return GLib.Object.GetObject (gtksharp_file_selection_get_history_pulldown (this.Handle), false) as Gtk.OptionMenu; } get { return GLib.Object.GetObject (gtksharp_file_selection_get_history_pulldown (this.Handle), false) as Gtk.OptionMenu; }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_history_menu (IntPtr i); static extern IntPtr gtksharp_file_selection_get_history_menu (IntPtr i);
public Gtk.Menu HistoryMenu { public Gtk.Menu HistoryMenu {
get { return GLib.Object.GetObject (gtksharp_file_selection_get_history_menu (this.Handle), false) as Gtk.Menu; } get { return GLib.Object.GetObject (gtksharp_file_selection_get_history_menu (this.Handle), false) as Gtk.Menu; }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_fileop_dialog (IntPtr i); static extern IntPtr gtksharp_file_selection_get_fileop_dialog (IntPtr i);
public Gtk.MessageDialog FileopDialog { public Gtk.MessageDialog FileopDialog {
get { return GLib.Object.GetObject (gtksharp_file_selection_get_fileop_dialog (this.Handle), false) as Gtk.MessageDialog; } get { return GLib.Object.GetObject (gtksharp_file_selection_get_fileop_dialog (this.Handle), false) as Gtk.MessageDialog; }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_fileop_entry (IntPtr i); static extern IntPtr gtksharp_file_selection_get_fileop_entry (IntPtr i);
public Gtk.Entry FileopEntry { public Gtk.Entry FileopEntry {
get { return GLib.Object.GetObject (gtksharp_file_selection_get_fileop_entry (this.Handle), false) as Gtk.Entry; } get { return GLib.Object.GetObject (gtksharp_file_selection_get_fileop_entry (this.Handle), false) as Gtk.Entry; }
} }
[DllImport("gtksharpglue-2.0", CallingConvention=CallingConvention.Cdecl)] [DllImport("gtksharpglue-2", CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr gtksharp_file_selection_get_fileop_file (IntPtr i); static extern IntPtr gtksharp_file_selection_get_fileop_file (IntPtr i);
public string FileopFile { public string FileopFile {
get { get {
@ -110,31 +110,31 @@ public string FileopFile {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_fileop_c_dir (IntPtr i); static extern IntPtr gtksharp_file_selection_get_fileop_c_dir (IntPtr i);
public Gtk.Button FileopCDir { public Gtk.Button FileopCDir {
get { return new FSButton (this, gtksharp_file_selection_get_fileop_c_dir(this.Handle)); } get { return new FSButton (this, gtksharp_file_selection_get_fileop_c_dir(this.Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_fileop_del_file (IntPtr i); static extern IntPtr gtksharp_file_selection_get_fileop_del_file (IntPtr i);
public Gtk.Button FileopDelFile { public Gtk.Button FileopDelFile {
get { return new FSButton (this, gtksharp_file_selection_get_fileop_del_file (this.Handle)); } get { return new FSButton (this, gtksharp_file_selection_get_fileop_del_file (this.Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_fileop_ren_file (IntPtr i); static extern IntPtr gtksharp_file_selection_get_fileop_ren_file (IntPtr i);
public Gtk.Button FileopRenFile { public Gtk.Button FileopRenFile {
get { return new FSButton (this, gtksharp_file_selection_get_fileop_ren_file (this.Handle)); } get { return new FSButton (this, gtksharp_file_selection_get_fileop_ren_file (this.Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_button_area (IntPtr i); static extern IntPtr gtksharp_file_selection_get_button_area (IntPtr i);
public Gtk.HButtonBox ButtonArea { public Gtk.HButtonBox ButtonArea {
get { return GLib.Object.GetObject (gtksharp_file_selection_get_button_area (this.Handle), false) as Gtk.HButtonBox; } get { return GLib.Object.GetObject (gtksharp_file_selection_get_button_area (this.Handle), false) as Gtk.HButtonBox; }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_file_selection_get_action_area (IntPtr i); static extern IntPtr gtksharp_file_selection_get_action_area (IntPtr i);
public new Gtk.HButtonBox ActionArea { public new Gtk.HButtonBox ActionArea {
get { return GLib.Object.GetObject (gtksharp_file_selection_get_action_area (this.Handle), false) as Gtk.HButtonBox; } get { return GLib.Object.GetObject (gtksharp_file_selection_get_action_area (this.Handle), false) as Gtk.HButtonBox; }

4
gtk/InputDialog.custom
View file

@ -21,7 +21,7 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_input_dialog_get_save_button (IntPtr i); static extern IntPtr gtksharp_input_dialog_get_save_button (IntPtr i);
public Gtk.Button SaveButton { public Gtk.Button SaveButton {
@ -31,7 +31,7 @@
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_input_dialog_get_close_button (IntPtr i); static extern IntPtr gtksharp_input_dialog_get_close_button (IntPtr i);
public Gtk.Button CloseButton { public Gtk.Button CloseButton {

2
gtk/Layout.custom
View file

@ -24,7 +24,7 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_layout_get_bin_window (IntPtr layout); static extern IntPtr gtksharp_gtk_layout_get_bin_window (IntPtr layout);
public Gdk.Window BinWindow { public Gdk.Window BinWindow {

14
gtk/NodeStore.cs
View file

@ -260,7 +260,7 @@ namespace Gtk {
return true; return true;
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_node_store_set_tree_model_callbacks (IntPtr raw, ref TreeModelIfaceDelegates cbs); static extern void gtksharp_node_store_set_tree_model_callbacks (IntPtr raw, ref TreeModelIfaceDelegates cbs);
private void BuildTreeModelIface () private void BuildTreeModelIface ()
@ -281,7 +281,7 @@ namespace Gtk {
gtksharp_node_store_set_tree_model_callbacks (Handle, ref tree_model_iface); gtksharp_node_store_set_tree_model_callbacks (Handle, ref tree_model_iface);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_node_store_new (); static extern IntPtr gtksharp_node_store_new ();
public NodeStore (Type node_type) : base (IntPtr.Zero) public NodeStore (Type node_type) : base (IntPtr.Zero)
@ -339,7 +339,7 @@ namespace Gtk {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_node_store_emit_row_changed (IntPtr handle, IntPtr path, int node_idx); static extern void gtksharp_node_store_emit_row_changed (IntPtr handle, IntPtr path, int node_idx);
private void changed_cb (object o, EventArgs args) private void changed_cb (object o, EventArgs args)
@ -350,7 +350,7 @@ namespace Gtk {
gtksharp_node_store_emit_row_changed (Handle, get_path_cb (node.ID), node.ID); gtksharp_node_store_emit_row_changed (Handle, get_path_cb (node.ID), node.ID);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_node_store_emit_row_inserted (IntPtr handle, IntPtr path, int node_idx); static extern void gtksharp_node_store_emit_row_inserted (IntPtr handle, IntPtr path, int node_idx);
private void child_added_cb (object o, ITreeNode child) private void child_added_cb (object o, ITreeNode child)
@ -360,10 +360,10 @@ namespace Gtk {
gtksharp_node_store_emit_row_inserted (Handle, get_path_cb (child.ID), child.ID); gtksharp_node_store_emit_row_inserted (Handle, get_path_cb (child.ID), child.ID);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_node_store_emit_row_deleted (IntPtr handle, IntPtr path); static extern void gtksharp_node_store_emit_row_deleted (IntPtr handle, IntPtr path);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_node_store_emit_row_has_child_toggled (IntPtr handle, IntPtr path, int node_idx); static extern void gtksharp_node_store_emit_row_has_child_toggled (IntPtr handle, IntPtr path, int node_idx);
private void child_deleted_cb (object o, int idx) private void child_deleted_cb (object o, int idx)
@ -439,7 +439,7 @@ namespace Gtk {
return GetNodeAtPath (path); return GetNodeAtPath (path);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_node_store_get_type (); static extern IntPtr gtksharp_node_store_get_type ();
public static new GLib.GType GType { public static new GLib.GType GType {

4
gtk/Object.custom
View file

@ -21,10 +21,10 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
private static extern bool gtksharp_object_is_floating (IntPtr raw); private static extern bool gtksharp_object_is_floating (IntPtr raw);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
private static extern bool gtksharp_object_set_floating (IntPtr raw, bool val); private static extern bool gtksharp_object_set_floating (IntPtr raw, bool val);
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]

12
gtk/SelectionData.custom
View file

@ -18,7 +18,7 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
private static extern int gtksharp_gtk_selection_data_get_format (IntPtr selection_data); private static extern int gtksharp_gtk_selection_data_get_format (IntPtr selection_data);
public int Format { public int Format {
@ -27,7 +27,7 @@
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
private static extern int gtksharp_gtk_selection_data_get_length (IntPtr selection_data); private static extern int gtksharp_gtk_selection_data_get_length (IntPtr selection_data);
public int Length { public int Length {
@ -54,7 +54,7 @@
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
private static extern IntPtr gtksharp_gtk_selection_data_get_data_pointer (IntPtr selection_data); private static extern IntPtr gtksharp_gtk_selection_data_get_data_pointer (IntPtr selection_data);
public byte[] Data { public byte[] Data {
@ -70,7 +70,7 @@
Set(type, format, data, data.Length); Set(type, format, data, data.Length);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
private static extern IntPtr gtksharp_gtk_selection_data_get_selection (IntPtr selection_data); private static extern IntPtr gtksharp_gtk_selection_data_get_selection (IntPtr selection_data);
public Gdk.Atom Selection { public Gdk.Atom Selection {
@ -79,7 +79,7 @@
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
private static extern IntPtr gtksharp_gtk_selection_data_get_target (IntPtr selection_data); private static extern IntPtr gtksharp_gtk_selection_data_get_target (IntPtr selection_data);
public Gdk.Atom Target { public Gdk.Atom Target {
@ -111,7 +111,7 @@
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
private static extern IntPtr gtksharp_gtk_selection_data_get_type (IntPtr selection_data); private static extern IntPtr gtksharp_gtk_selection_data_get_type (IntPtr selection_data);
public Gdk.Atom Type { public Gdk.Atom Type {

54
gtk/Style.custom
View file

@ -33,21 +33,21 @@ static Gdk.GC EnsureGC (IntPtr raw) {
return ret; return ret;
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_white_gc (IntPtr style); static extern IntPtr gtksharp_gtk_style_get_white_gc (IntPtr style);
public Gdk.GC WhiteGC { public Gdk.GC WhiteGC {
get { return EnsureGC (gtksharp_gtk_style_get_white_gc (Handle)); } get { return EnsureGC (gtksharp_gtk_style_get_white_gc (Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_black_gc (IntPtr style); static extern IntPtr gtksharp_gtk_style_get_black_gc (IntPtr style);
public Gdk.GC BlackGC { public Gdk.GC BlackGC {
get { return EnsureGC (gtksharp_gtk_style_get_black_gc (Handle)); } get { return EnsureGC (gtksharp_gtk_style_get_black_gc (Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_fg_gc (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_fg_gc (IntPtr style, int i);
public Gdk.GC ForegroundGC (StateType state) public Gdk.GC ForegroundGC (StateType state)
@ -56,7 +56,7 @@ public Gdk.GC ForegroundGC (StateType state)
return EnsureGC (raw); return EnsureGC (raw);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_set_fg_gc (IntPtr style, int i, IntPtr gc); static extern IntPtr gtksharp_gtk_style_set_fg_gc (IntPtr style, int i, IntPtr gc);
public void SetForegroundGC (StateType state, Gdk.GC gc) public void SetForegroundGC (StateType state, Gdk.GC gc)
@ -75,7 +75,7 @@ public Gdk.GC[] ForegroundGCs {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_bg_gc (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_bg_gc (IntPtr style, int i);
public Gdk.GC BackgroundGC (StateType state) public Gdk.GC BackgroundGC (StateType state)
@ -84,7 +84,7 @@ public Gdk.GC BackgroundGC (StateType state)
return EnsureGC (raw); return EnsureGC (raw);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_set_bg_gc (IntPtr style, int i, IntPtr gc); static extern IntPtr gtksharp_gtk_style_set_bg_gc (IntPtr style, int i, IntPtr gc);
public void SetBackgroundGC (StateType state, Gdk.GC gc) public void SetBackgroundGC (StateType state, Gdk.GC gc)
@ -103,7 +103,7 @@ public Gdk.GC[] BackgroundGCs {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_base_gc (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_base_gc (IntPtr style, int i);
public Gdk.GC BaseGC (StateType state) public Gdk.GC BaseGC (StateType state)
@ -112,7 +112,7 @@ public Gdk.GC BaseGC (StateType state)
return EnsureGC (raw); return EnsureGC (raw);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_set_base_gc (IntPtr style, int i, IntPtr gc); static extern IntPtr gtksharp_gtk_style_set_base_gc (IntPtr style, int i, IntPtr gc);
public void SetBaseGC (StateType state, Gdk.GC gc) public void SetBaseGC (StateType state, Gdk.GC gc)
@ -120,7 +120,7 @@ public void SetBaseGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_base_gc (Handle, (int) state, gc.Handle); gtksharp_gtk_style_set_base_gc (Handle, (int) state, gc.Handle);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_text_gc (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_text_gc (IntPtr style, int i);
public Gdk.GC TextGC (StateType state) public Gdk.GC TextGC (StateType state)
@ -129,7 +129,7 @@ public Gdk.GC TextGC (StateType state)
return EnsureGC (raw); return EnsureGC (raw);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_set_text_gc (IntPtr style, int i, IntPtr gc); static extern IntPtr gtksharp_gtk_style_set_text_gc (IntPtr style, int i, IntPtr gc);
public void SetTextGC (StateType state, Gdk.GC gc) public void SetTextGC (StateType state, Gdk.GC gc)
@ -137,7 +137,7 @@ public void SetTextGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_text_gc (Handle, (int) state, gc.Handle); gtksharp_gtk_style_set_text_gc (Handle, (int) state, gc.Handle);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_text_aa_gc (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_text_aa_gc (IntPtr style, int i);
public Gdk.GC TextAAGC (StateType state) public Gdk.GC TextAAGC (StateType state)
@ -146,7 +146,7 @@ public Gdk.GC TextAAGC (StateType state)
return EnsureGC (raw); return EnsureGC (raw);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_set_text_aa_gc (IntPtr style, int i, IntPtr gc); static extern IntPtr gtksharp_gtk_style_set_text_aa_gc (IntPtr style, int i, IntPtr gc);
public void SetTextAAGC (StateType state, Gdk.GC gc) public void SetTextAAGC (StateType state, Gdk.GC gc)
@ -154,7 +154,7 @@ public void SetTextAAGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_text_aa_gc (Handle, (int) state, gc.Handle); gtksharp_gtk_style_set_text_aa_gc (Handle, (int) state, gc.Handle);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_light_gc (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_light_gc (IntPtr style, int i);
public Gdk.GC LightGC (StateType state) public Gdk.GC LightGC (StateType state)
@ -163,7 +163,7 @@ public Gdk.GC LightGC (StateType state)
return EnsureGC (raw); return EnsureGC (raw);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_set_light_gc (IntPtr style, int i, IntPtr gc); static extern IntPtr gtksharp_gtk_style_set_light_gc (IntPtr style, int i, IntPtr gc);
public void SetLightGC (StateType state, Gdk.GC gc) public void SetLightGC (StateType state, Gdk.GC gc)
@ -171,7 +171,7 @@ public void SetLightGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_light_gc (Handle, (int) state, gc.Handle); gtksharp_gtk_style_set_light_gc (Handle, (int) state, gc.Handle);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_dark_gc (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_dark_gc (IntPtr style, int i);
public Gdk.GC DarkGC (StateType state) public Gdk.GC DarkGC (StateType state)
@ -180,7 +180,7 @@ public Gdk.GC DarkGC (StateType state)
return EnsureGC (raw); return EnsureGC (raw);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_set_dark_gc (IntPtr style, int i, IntPtr gc); static extern IntPtr gtksharp_gtk_style_set_dark_gc (IntPtr style, int i, IntPtr gc);
public void SetDarkGC (StateType state, Gdk.GC gc) public void SetDarkGC (StateType state, Gdk.GC gc)
@ -188,7 +188,7 @@ public void SetDarkGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_dark_gc (Handle, (int) state, gc.Handle); gtksharp_gtk_style_set_dark_gc (Handle, (int) state, gc.Handle);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_mid_gc (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_mid_gc (IntPtr style, int i);
public Gdk.GC MidGC (StateType state) public Gdk.GC MidGC (StateType state)
@ -197,7 +197,7 @@ public Gdk.GC MidGC (StateType state)
return EnsureGC (raw); return EnsureGC (raw);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_set_mid_gc (IntPtr style, int i, IntPtr gc); static extern IntPtr gtksharp_gtk_style_set_mid_gc (IntPtr style, int i, IntPtr gc);
public void SetMidGC (StateType state, Gdk.GC gc) public void SetMidGC (StateType state, Gdk.GC gc)
@ -205,21 +205,21 @@ public void SetMidGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_mid_gc (Handle, (int) state, gc.Handle); gtksharp_gtk_style_set_mid_gc (Handle, (int) state, gc.Handle);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_white (IntPtr style); static extern IntPtr gtksharp_gtk_style_get_white (IntPtr style);
public Gdk.Color White { public Gdk.Color White {
get { return Gdk.Color.New (gtksharp_gtk_style_get_white (Handle)); } get { return Gdk.Color.New (gtksharp_gtk_style_get_white (Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_black (IntPtr style); static extern IntPtr gtksharp_gtk_style_get_black (IntPtr style);
public Gdk.Color Black { public Gdk.Color Black {
get { return Gdk.Color.New (gtksharp_gtk_style_get_black (Handle)); } get { return Gdk.Color.New (gtksharp_gtk_style_get_black (Handle)); }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_bg (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_bg (IntPtr style, int i);
public Gdk.Color Background (StateType state) public Gdk.Color Background (StateType state)
@ -239,7 +239,7 @@ public Gdk.Color[] Backgrounds {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_fg (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_fg (IntPtr style, int i);
public Gdk.Color Foreground (StateType state) public Gdk.Color Foreground (StateType state)
@ -259,7 +259,7 @@ public Gdk.Color[] Foregrounds {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_text (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_text (IntPtr style, int i);
public Gdk.Color Text (StateType state) public Gdk.Color Text (StateType state)
@ -279,7 +279,7 @@ public Gdk.Color[] TextColors {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_base (IntPtr style, int i); static extern IntPtr gtksharp_gtk_style_get_base (IntPtr style, int i);
public Gdk.Color Base (StateType state) public Gdk.Color Base (StateType state)
@ -299,9 +299,9 @@ public Gdk.Color[] BaseColors {
} }
} }
[DllImport ("gtksharpglue-2.0")] [DllImport ("gtksharpglue-2")]
static extern int gtksharp_gtk_style_get_thickness (IntPtr style, int x_axis); static extern int gtksharp_gtk_style_get_thickness (IntPtr style, int x_axis);
[DllImport ("gtksharpglue-2.0")] [DllImport ("gtksharpglue-2")]
static extern void gtksharp_gtk_style_set_thickness (IntPtr style, int value); static extern void gtksharp_gtk_style_set_thickness (IntPtr style, int value);
public int XThickness { public int XThickness {
@ -324,7 +324,7 @@ public int YThickness {
} }
} }
[DllImport ("gtksharpglue-2.0")] [DllImport ("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_style_get_font_description (IntPtr style); static extern IntPtr gtksharp_gtk_style_get_font_description (IntPtr style);
public Pango.FontDescription FontDescription { public Pango.FontDescription FontDescription {

2
gtk/TextIter.custom
View file

@ -19,7 +19,7 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("glibsharpglue-2.0")] [DllImport("glibsharpglue-2")]
static extern IntPtr gtksharp_unichar_to_utf8_string (int raw); static extern IntPtr gtksharp_unichar_to_utf8_string (int raw);
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]

18
gtk/Widget.custom
View file

@ -44,10 +44,10 @@ private void Widget_ParentSet (object o, ParentSetArgs args)
ParentedWidgets.Remove (this); ParentedWidgets.Remove (this);
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_widget_get_allocation (IntPtr style); static extern IntPtr gtksharp_gtk_widget_get_allocation (IntPtr style);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_gtk_widget_set_allocation (IntPtr raw, Gdk.Rectangle rect); static extern void gtksharp_gtk_widget_set_allocation (IntPtr raw, Gdk.Rectangle rect);
public Gdk.Rectangle Allocation { public Gdk.Rectangle Allocation {
@ -56,9 +56,9 @@ public Gdk.Rectangle Allocation {
} }
[DllImport ("gtksharpglue-2.0")] [DllImport ("gtksharpglue-2")]
static extern IntPtr gtksharp_gtk_widget_get_window (IntPtr widget); static extern IntPtr gtksharp_gtk_widget_get_window (IntPtr widget);
[DllImport ("gtksharpglue-2.0")] [DllImport ("gtksharpglue-2")]
static extern void gtksharp_gtk_widget_set_window (IntPtr widget, IntPtr window); static extern void gtksharp_gtk_widget_set_window (IntPtr widget, IntPtr window);
public Gdk.Window GdkWindow { public Gdk.Window GdkWindow {
get { get {
@ -85,7 +85,7 @@ public void AddAccelerator (string accel_signal, AccelGroup accel_group, AccelKe
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
static extern void gtk_widget_set_state (IntPtr raw, int state); static extern void gtk_widget_set_state (IntPtr raw, int state);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern int gtksharp_gtk_widget_get_state (IntPtr raw); static extern int gtksharp_gtk_widget_get_state (IntPtr raw);
public Gtk.StateType State { public Gtk.StateType State {
@ -97,10 +97,10 @@ public Gtk.StateType State {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern int gtksharp_gtk_widget_get_flags (IntPtr raw); static extern int gtksharp_gtk_widget_get_flags (IntPtr raw);
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_gtk_widget_set_flags (IntPtr raw, int flags); static extern void gtksharp_gtk_widget_set_flags (IntPtr raw, int flags);
public int Flags { public int Flags {
@ -177,7 +177,7 @@ public bool IsDrawable {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern int gtksharp_gtk_widget_style_get_int (IntPtr raw, string name); static extern int gtksharp_gtk_widget_style_get_int (IntPtr raw, string name);
public int FocusLineWidth { public int FocusLineWidth {
@ -186,7 +186,7 @@ public int FocusLineWidth {
} }
} }
[DllImport("gtksharpglue-2.0")] [DllImport("gtksharpglue-2")]
static extern int gtksharp_widget_connect_set_scroll_adjustments_signal (IntPtr gtype, SetScrollAdjustmentsDelegate cb); static extern int gtksharp_widget_connect_set_scroll_adjustments_signal (IntPtr gtype, SetScrollAdjustmentsDelegate cb);
delegate void SetScrollAdjustmentsDelegate (IntPtr widget, IntPtr hadj, IntPtr vadj); delegate void SetScrollAdjustmentsDelegate (IntPtr widget, IntPtr hadj, IntPtr vadj);

12
gtk/glue/Makefile.am
View file

@ -1,6 +1,6 @@
lib_LTLIBRARIES = libgtksharpglue-2.0.la lib_LTLIBRARIES = libgtksharpglue-2.la
libgtksharpglue_2_0_la_SOURCES = \ libgtksharpglue_2_la_SOURCES = \
adjustment.c \ adjustment.c \
button.c \ button.c \
cellrenderer.c \ cellrenderer.c \
@ -23,14 +23,14 @@ libgtksharpglue_2_0_la_SOURCES = \
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libgtksharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined libgtksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libgtksharpglue_2_0_la_LIBADD = $(GTK_LIBS) libgtksharpglue_2_la_LIBADD = $(GTK_LIBS)
INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir) INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)
libgtksharpglue.dll: $(libgtksharpglue_2_0_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def libgtksharpglue.dll: $(libgtksharpglue_2_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
./build-dll libgtksharpglue-2.0 $(VERSION) ./build-dll libgtksharpglue-2 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

8
gtk/glue/makefile.win32
View file

@ -22,16 +22,16 @@ GLUE_OBJS = \
widget.o \ widget.o \
win32dll.o win32dll.o
all: gtksharpglue-2.0.dll all: gtksharpglue-2.dll
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
gtksharpglue-2.0.dll: $(GLUE_OBJS) gtksharpglue-2.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libgtksharpglue-2.0.a --dllname=gtksharpglue-2.0.dll --driver-name=gcc --output-def=gtksharpglue-2.0.def $(GLUE_OBJS) $(GTK_LIBS) $(DLLWRAP) --output-lib=libgtksharpglue-2.a --dllname=gtksharpglue-2.dll --driver-name=gcc --output-def=gtksharpglue-2.def $(GLUE_OBJS) $(GTK_LIBS)
clean: clean:
rm -f gtksharpglue-2.0.dll *.o libgtksharpglue-2.0.a rm -f gtksharpglue-2.dll *.o libgtksharpglue-2.a

8
panelapplet/glue/Makefile.am
View file

@ -1,17 +1,17 @@
lib_LTLIBRARIES = $(TARGET) lib_LTLIBRARIES = $(TARGET)
if ENABLE_PANEL if ENABLE_PANEL
TARGET = libpanelappletsharpglue-2.0.la TARGET = libpanelappletsharpglue-2.la
else else
TARGET = TARGET =
endif endif
libpanelappletsharpglue_2_0_la_SOURCES = \ libpanelappletsharpglue_2_la_SOURCES = \
panelapplet.c panelapplet.c
libpanelappletsharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined libpanelappletsharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libpanelappletsharpglue_2_0_la_LIBADD = $(LIBPANEL_LIBS) libpanelappletsharpglue_2_la_LIBADD = $(LIBPANEL_LIBS)
INCLUDES = $(LIBPANEL_CFLAGS) -I$(top_srcdir) INCLUDES = $(LIBPANEL_CFLAGS) -I$(top_srcdir)

6
pango/LayoutLine.custom
View file

@ -21,7 +21,7 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("pangosharpglue-2.0")] [DllImport("pangosharpglue-2")]
static extern IntPtr pangosharp_pango_layout_line_get_layout (IntPtr line); static extern IntPtr pangosharp_pango_layout_line_get_layout (IntPtr line);
public Layout Layout { public Layout Layout {
@ -36,7 +36,7 @@ public Layout Layout {
} }
} }
[DllImport("pangosharpglue-2.0")] [DllImport("pangosharpglue-2")]
static extern int pangosharp_pango_layout_line_get_start_index (IntPtr line); static extern int pangosharp_pango_layout_line_get_start_index (IntPtr line);
public int StartIndex { public int StartIndex {
@ -45,7 +45,7 @@ public int StartIndex {
} }
} }
[DllImport("pangosharpglue-2.0")] [DllImport("pangosharpglue-2")]
static extern int pangosharp_pango_layout_line_get_length (IntPtr line); static extern int pangosharp_pango_layout_line_get_length (IntPtr line);
public int Length { public int Length {

12
pango/glue/Makefile.am
View file

@ -1,19 +1,19 @@
lib_LTLIBRARIES = libpangosharpglue-2.0.la lib_LTLIBRARIES = libpangosharpglue-2.la
libpangosharpglue_2_0_la_SOURCES = \ libpangosharpglue_2_la_SOURCES = \
layoutline.c layoutline.c
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libpangosharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined libpangosharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libpangosharpglue_2_0_la_LIBADD = $(PANGO_LIBS) libpangosharpglue_2_la_LIBADD = $(PANGO_LIBS)
INCLUDES = $(PANGO_CFLAGS) -I$(top_srcdir) INCLUDES = $(PANGO_CFLAGS) -I$(top_srcdir)
libpangosharpglue.dll: $(libpangosharpglue_2_0_la_OBJECTS) libpangosharpglue.rc libpangosharpglue.def libpangosharpglue.dll: $(libpangosharpglue_2_la_OBJECTS) libpangosharpglue.rc libpangosharpglue.def
./build-dll libpangosharpglue-2.0 $(VERSION) ./build-dll libpangosharpglue-2 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

8
pango/glue/makefile.win32
View file

@ -7,16 +7,16 @@ GLUE_OBJS = \
layoutline.o \ layoutline.o \
win32dll.o win32dll.o
all: pangosharpglue-2.0.dll all: pangosharpglue-2.dll
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $(PANGO_CFLAGS) -o $@ $^ $(CC) -c $(CFLAGS) $(PANGO_CFLAGS) -o $@ $^
gtksharpglue-2.0.dll: $(GLUE_OBJS) gtksharpglue-2.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libpangosharpglue-2.0.a --dllname=pangosharpglue-2.0.dll --driver-name=gcc --output-def=pangosharpglue-2.0.def $(GLUE_OBJS) $(PANGO_LIBS) $(DLLWRAP) --output-lib=libpangosharpglue-2.a --dllname=pangosharpglue-2.dll --driver-name=gcc --output-def=pangosharpglue-2.def $(GLUE_OBJS) $(PANGO_LIBS)
clean: clean:
rm -f pangosharpglue-2.0.dll *.o libpangosharpglue-2.0.a rm -f pangosharpglue-2.dll *.o libpangosharpglue-2.a

1
sample/TreeViewDemo.cs
View file

@ -30,6 +30,7 @@ namespace GtkSamples {
TreeView tv = new TreeView (store); TreeView tv = new TreeView (store);
tv.HeadersVisible = true; tv.HeadersVisible = true;
tv.EnableSearch = false;
tv.AppendColumn ("Name", new CellRendererText (), "text", 0); tv.AppendColumn ("Name", new CellRendererText (), "text", 0);
tv.AppendColumn ("Type", new CellRendererText (), "text", 1); tv.AppendColumn ("Type", new CellRendererText (), "text", 1);