tFixed to build properly under Win32 - vaccinewars - be a doctor and try to vaccinate the world (HTM) git clone git://src.adamsgaard.dk/vaccinewars (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 8c0b5b5403bdb3c0e2d8ad13b48de29717127207 (DIR) parent 78e0d578944ebf15dd90531a4189046a746d4281 (HTM) Author: Ben Webb <ben@salilab.org> Date: Fri, 1 Mar 2002 18:21:40 +0000 Fixed to build properly under Win32 Diffstat: M src/gtkport/clist.c | 6 ++++++ M src/gtkport/gtkport.c | 37 +++++-------------------------- M src/gtkport/gtkport.h | 32 +++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 31 deletions(-) --- (DIR) diff --git a/src/gtkport/clist.c b/src/gtkport/clist.c t@@ -28,6 +28,12 @@ #ifdef CYGWIN +#include <windows.h> +#include <commctrl.h> + +#define LISTITEMHPACK 3 +#define LISTHEADERPACK 6 + static void gtk_clist_size_request(GtkWidget *widget, GtkRequisition *requisition); static void gtk_clist_set_size(GtkWidget *widget, (DIR) diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c t@@ -46,8 +46,6 @@ #include <commctrl.h> #define LISTITEMVPACK 0 -#define LISTITEMHPACK 3 -#define LISTHEADERPACK 6 #define PANED_STARTPOS 200 t@@ -62,7 +60,6 @@ static const gchar *WC_GTKHPANED = "WC_GTKHPANED"; static const gchar *WC_GTKDIALOG = "WC_GTKDIALOG"; static const gchar *WC_GTKURL = "WC_GTKURL"; -static BOOL GetTextSize(HWND hWnd, char *text, LPSIZE lpSize, HFONT hFont); static void gtk_button_size_request(GtkWidget *widget, GtkRequisition *requisition); static void gtk_entry_size_request(GtkWidget *widget, t@@ -112,7 +109,6 @@ static gint gtk_window_delete_event(GtkWidget *widget, GdkEvent *event); static void gtk_window_realize(GtkWidget *widget); static void gtk_window_show(GtkWidget *widget); static void gtk_window_hide(GtkWidget *widget); -static void gtk_container_realize(GtkWidget *widget); static void gtk_button_realize(GtkWidget *widget); static void gtk_entry_realize(GtkWidget *widget); static void gtk_text_realize(GtkWidget *widget); t@@ -121,7 +117,6 @@ static void gtk_radio_button_realize(GtkWidget *widget); static void gtk_radio_button_destroy(GtkWidget *widget); static void gtk_box_realize(GtkWidget *widget); -static HWND gtk_get_parent_hwnd(GtkWidget *widget); static void gtk_label_size_request(GtkWidget *widget, GtkRequisition *requisition); static void gtk_label_set_size(GtkWidget *widget, t@@ -149,27 +144,6 @@ static void gtk_table_hide_all(GtkWidget *widget, gboolean hWndOnly); static void gtk_widget_hide_all_full(GtkWidget *widget, gboolean hWndOnly); static void gtk_widget_hide_full(GtkWidget *widget, gboolean recurse); -static void gtk_marshal_BOOL__GPOIN(GtkObject *object, GSList *actions, - GtkSignalFunc default_action, - va_list args); -static void gtk_marshal_BOOL__GINT(GtkObject *object, GSList *actions, - GtkSignalFunc default_action, - va_list args); -static void gtk_marshal_VOID__VOID(GtkObject *object, GSList *actions, - GtkSignalFunc default_action, - va_list args); -static void gtk_marshal_VOID__BOOL(GtkObject *object, GSList *actions, - GtkSignalFunc default_action, - va_list args); -static void gtk_marshal_VOID__GPOIN(GtkObject *object, GSList *actions, - GtkSignalFunc default_action, - va_list args); -static void gtk_marshal_VOID__GINT(GtkObject *object, GSList *actions, - GtkSignalFunc default_action, - va_list args); -void gtk_marshal_VOID__GINT_GINT_EVENT(GtkObject *object, GSList *actions, - GtkSignalFunc default_action, - va_list args); static void gtk_menu_bar_realize(GtkWidget *widget); static void gtk_menu_item_realize(GtkWidget *widget); static void gtk_menu_item_enable(GtkWidget *widget); t@@ -508,7 +482,7 @@ static GtkSignalType GtkContainerSignals[] = { {"", NULL, NULL} }; -static GtkClass GtkContainerClass = { +GtkClass GtkContainerClass = { "container", &GtkWidgetClass, sizeof(GtkContainer), GtkContainerSignals, NULL }; t@@ -640,8 +614,9 @@ static GtkClass GtkWindowClass = { const GtkType GTK_TYPE_WINDOW = &GtkWindowClass; const GtkType GTK_TYPE_MENU_BAR = &GtkMenuBarClass; -static HINSTANCE hInst; -static HFONT defFont, urlFont; +HINSTANCE hInst; +HFONT defFont; +static HFONT urlFont; static GSList *WindowList = NULL; static GSList *GdkInputs = NULL; static GSList *GtkTimeouts = NULL; t@@ -649,12 +624,12 @@ static HWND TopLevel = NULL; static WNDPROC wpOrigEntryProc, wpOrigTextProc; -static void gtk_set_default_font(HWND hWnd) +void gtk_set_default_font(HWND hWnd) { SendMessage(hWnd, WM_SETFONT, (WPARAM)defFont, MAKELPARAM(FALSE, 0)); } -static GtkObject *GtkNewObject(GtkClass *klass) +GtkObject *GtkNewObject(GtkClass *klass) { GtkObject *newObj; (DIR) diff --git a/src/gtkport/gtkport.h b/src/gtkport/gtkport.h t@@ -462,6 +462,10 @@ struct _GtkTableRowCol { gint16 spacing; }; +extern GtkClass GtkContainerClass; +extern HFONT defFont; +extern HINSTANCE hInst; + #define GTK_OBJECT(obj) ((GtkObject *)(obj)) #define GTK_CONTAINER(obj) ((GtkContainer *)(obj)) #define GTK_PANED(obj) ((GtkPaned *)(obj)) t@@ -694,6 +698,34 @@ guint gtk_timeout_add(guint32 interval, GtkFunction function, gpointer data); void gtk_timeout_remove(guint timeout_handler_id); guint gtk_main_level(void); +GtkObject *GtkNewObject(GtkClass *klass); +BOOL GetTextSize(HWND hWnd, char *text, LPSIZE lpSize, HFONT hFont); +void gtk_container_realize(GtkWidget *widget); +void gtk_set_default_font(HWND hWnd); +HWND gtk_get_parent_hwnd(GtkWidget *widget); + +/* Functions for handling emitted signals */ +void gtk_marshal_BOOL__GPOIN(GtkObject *object, GSList *actions, + GtkSignalFunc default_action, + va_list args); +void gtk_marshal_BOOL__GINT(GtkObject *object, GSList *actions, + GtkSignalFunc default_action, + va_list args); +void gtk_marshal_VOID__VOID(GtkObject *object, GSList *actions, + GtkSignalFunc default_action, + va_list args); +void gtk_marshal_VOID__BOOL(GtkObject *object, GSList *actions, + GtkSignalFunc default_action, + va_list args); +void gtk_marshal_VOID__GPOIN(GtkObject *object, GSList *actions, + GtkSignalFunc default_action, + va_list args); +void gtk_marshal_VOID__GINT(GtkObject *object, GSList *actions, + GtkSignalFunc default_action, + va_list args); +void gtk_marshal_VOID__GINT_GINT_EVENT(GtkObject *object, GSList *actions, + GtkSignalFunc default_action, + va_list args); /* Private functions */ void gtk_container_set_size(GtkWidget *widget, GtkAllocation *allocation);