tGTK+ enumerated types moved into separate header file; dummy gtk_clist_set_col… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit aae2d4fec33b36d3dd3cee90a40092ed5685bd32 | |
parent 84841e7bda51e3bd8f7f88fac6399fc8987b994b | |
Author: Ben Webb <[email protected]> | |
Date: Wed, 31 Jul 2002 14:15:09 +0000 | |
GTK+ enumerated types moved into separate header file; dummy | |
gtk_clist_set_column_justification function added so that new code "should" | |
compile on Win32 systems. | |
Diffstat: | |
M src/gtkport/clist.c | 5 +++++ | |
M src/gtkport/clist.h | 3 +++ | |
A src/gtkport/gtkenums.h | 115 +++++++++++++++++++++++++++++… | |
M src/gtkport/gtkport.h | 77 +----------------------------… | |
4 files changed, 125 insertions(+), 75 deletions(-) | |
--- | |
diff --git a/src/gtkport/clist.c b/src/gtkport/clist.c | |
t@@ -739,6 +739,11 @@ void gtk_clist_update_selection(GtkWidget *widget) | |
g_list_free(oldsel); | |
} | |
+void gtk_clist_set_column_justification(GtkCList *clist, gint column, | |
+ GtkJustification justification) | |
+{ | |
+} | |
+ | |
#else /* for systems with GTK+ */ | |
GtkWidget *gtk_scrolled_clist_new_with_titles(gint columns, | |
diff --git a/src/gtkport/clist.h b/src/gtkport/clist.h | |
t@@ -30,6 +30,7 @@ | |
#ifdef CYGWIN | |
#include <glib.h> | |
+#include "gtkenums.h" | |
typedef struct _GtkCList GtkCList; | |
typedef struct _GtkCListRow GtkCListRow; | |
t@@ -99,6 +100,8 @@ void gtk_clist_set_compare_func(GtkCList *clist, | |
GtkCListCompareFunc cmp_func); | |
void gtk_clist_set_column_auto_resize(GtkCList *clist, gint column, | |
gboolean auto_resize); | |
+void gtk_clist_set_column_justification(GtkCList *clist, gint column, | |
+ GtkJustification justification); | |
#endif /* CYGWIN */ | |
#endif | |
diff --git a/src/gtkport/gtkenums.h b/src/gtkport/gtkenums.h | |
t@@ -0,0 +1,115 @@ | |
+/************************************************************************ | |
+ * gtkenums.h Enumerated types for gtkport code * | |
+ * Copyright (C) 2002 Ben Webb * | |
+ * Email: [email protected] * | |
+ * WWW: http://dopewars.sourceforge.net/ * | |
+ * * | |
+ * This program is free software; you can redistribute it and/or * | |
+ * modify it under the terms of the GNU General Public License * | |
+ * as published by the Free Software Foundation; either version 2 * | |
+ * of the License, or (at your option) any later version. * | |
+ * * | |
+ * This program is distributed in the hope that it will be useful, * | |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of * | |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | |
+ * GNU General Public License for more details. * | |
+ * * | |
+ * You should have received a copy of the GNU General Public License * | |
+ * along with this program; if not, write to the Free Software * | |
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * | |
+ * MA 02111-1307, USA. * | |
+ ************************************************************************/ | |
+ | |
+#ifndef __GTKENUMS_H__ | |
+#define __GTKENUMS_H__ | |
+ | |
+#ifdef HAVE_CONFIG_H | |
+#include <config.h> | |
+#endif | |
+ | |
+#ifdef CYGWIN | |
+ | |
+typedef enum { | |
+ GTK_WINDOW_TOPLEVEL, GTK_WINDOW_DIALOG, GTK_WINDOW_POPUP | |
+} GtkWindowType; | |
+ | |
+typedef enum { | |
+ GTK_ACCEL_VISIBLE = 1 << 0, | |
+ GTK_ACCEL_SIGNAL_VISIBLE = 1 << 1 | |
+} GtkAccelFlags; | |
+ | |
+typedef enum { | |
+ GTK_BUTTONBOX_SPREAD, | |
+ GTK_BUTTONBOX_EDGE, | |
+ GTK_BUTTONBOX_START, | |
+ GTK_BUTTONBOX_END | |
+} GtkButtonBoxStyle; | |
+ | |
+typedef enum { | |
+ GTK_STATE_NORMAL, | |
+ GTK_STATE_ACTIVE, | |
+ GTK_STATE_PRELIGHT, | |
+ GTK_STATE_SELECTED, | |
+ GTK_STATE_INSENSITIVE | |
+} GtkStateType; | |
+ | |
+typedef enum { | |
+ GTK_VISIBILITY_NONE, | |
+ GTK_VISIBILITY_PARTIAL, | |
+ GTK_VISIBILITY_FULL | |
+} GtkVisibility; | |
+ | |
+typedef enum { | |
+ GTK_PROGRESS_LEFT_TO_RIGHT, | |
+ GTK_PROGRESS_RIGHT_TO_LEFT, | |
+ GTK_PROGRESS_BOTTOM_TO_TOP, | |
+ GTK_PROGRESS_TOP_TO_BOTTOM | |
+} GtkProgressBarOrientation; | |
+ | |
+typedef enum { | |
+ GTK_EXPAND = 1 << 0, | |
+ GTK_SHRINK = 1 << 1, | |
+ GTK_FILL = 1 << 2 | |
+} GtkAttachOptions; | |
+ | |
+typedef enum { | |
+ GTK_SELECTION_SINGLE, | |
+ GTK_SELECTION_BROWSE, | |
+ GTK_SELECTION_MULTIPLE, | |
+ GTK_SELECTION_EXTENDED | |
+} GtkSelectionMode; | |
+ | |
+typedef enum { | |
+ GDK_INPUT_READ = 1 << 0, | |
+ GDK_INPUT_WRITE = 1 << 1, | |
+ GDK_INPUT_EXCEPTION = 1 << 2 | |
+} GdkInputCondition; | |
+ | |
+typedef enum { | |
+ GTK_SHADOW_NONE, | |
+ GTK_SHADOW_IN, | |
+ GTK_SHADOW_OUT, | |
+ GTK_SHADOW_ETCHED_IN, | |
+ GTK_SHADOW_ETCHED_OUT | |
+} GtkShadowType; | |
+ | |
+typedef enum { | |
+ GTK_JUSTIFY_LEFT, | |
+ GTK_JUSTIFY_RIGHT, | |
+ GTK_JUSTIFY_CENTER, | |
+ GTK_JUSTIFY_FILL | |
+} GtkJustification; | |
+ | |
+typedef enum { | |
+ GTK_REALIZED = 1 << 6, | |
+ GTK_VISIBLE = 1 << 8, | |
+ GTK_SENSITIVE = 1 << 10, | |
+ GTK_CAN_FOCUS = 1 << 11, | |
+ GTK_HAS_FOCUS = 1 << 12, | |
+ GTK_CAN_DEFAULT = 1 << 13, | |
+ GTK_IS_DEFAULT = 1 << 14 | |
+} GtkWidgetFlags; | |
+ | |
+#endif /* CYGWIN */ | |
+ | |
+#endif /* __GTKENUMS_H__ */ | |
diff --git a/src/gtkport/gtkport.h b/src/gtkport/gtkport.h | |
t@@ -35,6 +35,8 @@ | |
#include <glib.h> | |
#include <stdarg.h> | |
+#include "gtkenums.h" | |
+ | |
#define MB_IMMRETURN 0 | |
#define MYWM_SOCKETDATA (WM_USER+100) | |
t@@ -45,71 +47,6 @@ | |
extern HICON mainIcon; | |
-typedef enum { | |
- GTK_WINDOW_TOPLEVEL, GTK_WINDOW_DIALOG, GTK_WINDOW_POPUP | |
-} GtkWindowType; | |
- | |
-typedef enum { | |
- GTK_ACCEL_VISIBLE = 1 << 0, | |
- GTK_ACCEL_SIGNAL_VISIBLE = 1 << 1 | |
-} GtkAccelFlags; | |
- | |
-typedef enum { | |
- GTK_BUTTONBOX_SPREAD, | |
- GTK_BUTTONBOX_EDGE, | |
- GTK_BUTTONBOX_START, | |
- GTK_BUTTONBOX_END | |
-} GtkButtonBoxStyle; | |
- | |
-typedef enum { | |
- GTK_STATE_NORMAL, | |
- GTK_STATE_ACTIVE, | |
- GTK_STATE_PRELIGHT, | |
- GTK_STATE_SELECTED, | |
- GTK_STATE_INSENSITIVE | |
-} GtkStateType; | |
- | |
-typedef enum { | |
- GTK_VISIBILITY_NONE, | |
- GTK_VISIBILITY_PARTIAL, | |
- GTK_VISIBILITY_FULL | |
-} GtkVisibility; | |
- | |
-typedef enum { | |
- GTK_PROGRESS_LEFT_TO_RIGHT, | |
- GTK_PROGRESS_RIGHT_TO_LEFT, | |
- GTK_PROGRESS_BOTTOM_TO_TOP, | |
- GTK_PROGRESS_TOP_TO_BOTTOM | |
-} GtkProgressBarOrientation; | |
- | |
-typedef enum { | |
- GTK_EXPAND = 1 << 0, | |
- GTK_SHRINK = 1 << 1, | |
- GTK_FILL = 1 << 2 | |
-} GtkAttachOptions; | |
- | |
-typedef enum { | |
- GTK_SELECTION_SINGLE, | |
- GTK_SELECTION_BROWSE, | |
- GTK_SELECTION_MULTIPLE, | |
- GTK_SELECTION_EXTENDED | |
-} GtkSelectionMode; | |
- | |
-typedef enum { | |
- GDK_INPUT_READ = 1 << 0, | |
- GDK_INPUT_WRITE = 1 << 1, | |
- GDK_INPUT_EXCEPTION = 1 << 2 | |
-} GdkInputCondition; | |
- | |
-typedef enum | |
-{ | |
- GTK_SHADOW_NONE, | |
- GTK_SHADOW_IN, | |
- GTK_SHADOW_OUT, | |
- GTK_SHADOW_ETCHED_IN, | |
- GTK_SHADOW_ETCHED_OUT | |
-} GtkShadowType; | |
- | |
#define GDK_KP_0 0xFFB0 | |
#define GDK_KP_1 0xFFB1 | |
#define GDK_KP_2 0xFFB2 | |
t@@ -127,16 +64,6 @@ typedef void (*GdkInputFunction) (gpointer data, gint sour… | |
typedef gchar *(*GtkTranslateFunc) (const gchar *path, gpointer func_data); | |
typedef void (*GtkDestroyNotify) (gpointer data); | |
-typedef enum { | |
- GTK_REALIZED = 1 << 6, | |
- GTK_VISIBLE = 1 << 8, | |
- GTK_SENSITIVE = 1 << 10, | |
- GTK_CAN_FOCUS = 1 << 11, | |
- GTK_HAS_FOCUS = 1 << 12, | |
- GTK_CAN_DEFAULT = 1 << 13, | |
- GTK_IS_DEFAULT = 1 << 14 | |
-} GtkWidgetFlags; | |
- | |
#define GTK_VISIBLE 1 | |
typedef struct _GtkClass GtkClass; |