callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix win32 build

Browse Source
This commit is contained in:
Fridrich Štrba 2011-01-11 16:13:34 +01:00
parent 7e33c009a0
commit a606ea62a1
9 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/win32/Makefile.am
View File

@ -33,6 +33,7 @@ libgdk_win32_la_SOURCES = \
gdkdevice-wintab.c \ gdkdevice-wintab.c \
gdkdevice-wintab.h \ gdkdevice-wintab.h \
gdkdisplay-win32.c \ gdkdisplay-win32.c \
gdkdisplaymanager-win32.c \
gdkdnd-win32.c \ gdkdnd-win32.c \
gdkevents-win32.c \ gdkevents-win32.c \
gdkgeometry-win32.c \ gdkgeometry-win32.c \

1
gdk/win32/gdkprivate-win32.h
View File

@ -109,7 +109,6 @@ GdkScreen *GDK_WINDOW_SCREEN(GObject *win);
#define GDK_WINDOW_IS_WIN32(win) (GDK_IS_WINDOW_IMPL_WIN32 (win->impl)) #define GDK_WINDOW_IS_WIN32(win) (GDK_IS_WINDOW_IMPL_WIN32 (win->impl))
typedef struct _GdkColormapPrivateWin32 GdkColormapPrivateWin32; typedef struct _GdkColormapPrivateWin32 GdkColormapPrivateWin32;
typedef struct _GdkWin32Cursor GdkWin32Cursor;
typedef struct _GdkWin32SingleFont GdkWin32SingleFont; typedef struct _GdkWin32SingleFont GdkWin32SingleFont;
struct _GdkWin32Cursor struct _GdkWin32Cursor

4
gtk/Makefile.am
View File

@ -894,10 +894,10 @@ libgtk_3_0_la_LIBADD = $(libadd)
libgtk_3_0_la_DEPENDENCIES = $(deps) libgtk_3_0_la_DEPENDENCIES = $(deps)
#libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid #libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
#libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
#libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
if USE_WIN32 if USE_WIN32
libgtk_3_0_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
libgtk_3_0_la_DEPENDENCIES += $(gtk_win32_res) $(deps)
libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
endif endif

2
gtk/gtk.symbols
View File

@ -1335,7 +1335,7 @@ gtk_info_bar_set_message_type
gtk_info_bar_set_response_sensitive gtk_info_bar_set_response_sensitive
gtk_init gtk_init
gtk_init_check gtk_init_check
#ifdef GDK_WINDOWING_WIN32 #ifdef G_OS_WIN32
gtk_init_abi_check gtk_init_abi_check
gtk_init_check_abi_check gtk_init_check_abi_check
#endif #endif

2
gtk/gtkappchooserbutton.c
View File

@ -271,7 +271,9 @@ gtk_app_chooser_button_populate (GtkAppChooserButton *self)
GIcon *icon; GIcon *icon;
gboolean cycled_recommended; gboolean cycled_recommended;
#ifndef G_OS_WIN32
recommended_apps = g_app_info_get_recommended_for_type (self->priv->content_type); recommended_apps = g_app_info_get_recommended_for_type (self->priv->content_type);
#endif
cycled_recommended = FALSE; cycled_recommended = FALSE;
for (l = recommended_apps; l != NULL; l = l->next) for (l = recommended_apps; l != NULL; l = l->next)

2
gtk/gtkappchooserwidget.c
View File

@ -722,6 +722,7 @@ gtk_app_chooser_widget_real_add_items (GtkAppChooserWidget *self)
} }
} }
#ifndef G_OS_WIN32
if (self->priv->show_recommended || self->priv->show_all) if (self->priv->show_recommended || self->priv->show_all)
{ {
recommended_apps = g_app_info_get_recommended_for_type (self->priv->content_type); recommended_apps = g_app_info_get_recommended_for_type (self->priv->content_type);
@ -748,6 +749,7 @@ gtk_app_chooser_widget_real_add_items (GtkAppChooserWidget *self)
exclude_apps = g_list_concat (exclude_apps, exclude_apps = g_list_concat (exclude_apps,
g_list_copy (fallback_apps)); g_list_copy (fallback_apps));
} }
#endif
if (self->priv->show_other || self->priv->show_all) if (self->priv->show_other || self->priv->show_all)
{ {

9
gtk/gtkmain.c
View File

@ -1169,7 +1169,14 @@ gtk_init (int *argc, char ***argv)
} }
} }
#ifdef G_PLATFORM_WIN32 #ifdef G_OS_WIN32
/* This is relevant when building with gcc for Windows (MinGW),
* where we want to be struct packing compatible with MSVC,
* i.e. use the -mms-bitfields switch.
* For Cygwin there should be no need to be compatible with MSVC,
* so no need to use G_PLATFORM_WIN32.
*/
static void static void
check_sizeof_GtkWindow (size_t sizeof_GtkWindow) check_sizeof_GtkWindow (size_t sizeof_GtkWindow)

2
gtk/gtkmain.h
View File

@ -107,7 +107,7 @@ gboolean gtk_init_with_args (gint *argc,
GOptionGroup *gtk_get_option_group (gboolean open_default_display); GOptionGroup *gtk_get_option_group (gboolean open_default_display);
#ifdef G_PLATFORM_WIN32 #ifdef G_OS_WIN32
/* Variants that are used to check for correct struct packing /* Variants that are used to check for correct struct packing
* when building GTK+-using code. * when building GTK+-using code.

4
modules/input/gtkimcontextime.c
View File

@ -25,6 +25,10 @@
* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/appendix/hh/appendix/imeimes2_35ph.asp * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/appendix/hh/appendix/imeimes2_35ph.asp
*/ */
#ifdef GTK_DISABLE_DEPRECATED
#undef GTK_DISABLE_DEPRECATED
#endif
#include "gtkimcontextime.h" #include "gtkimcontextime.h"
#include "imm-extra.h" #include "imm-extra.h"