Commit 3380383e authored by Ivan, Wong Yat Cheung's avatar Ivan, Wong Yat Cheung Committed by Ivan Wong Yat Cheung
Browse files

Build as non-console Win32 application by default.

2006-01-24  Ivan, Wong Yat Cheung  <ivanwong@gnome.org>

	* src/Makefile.am: Build as non-console Win32 application by default.

	* src/main-application.c (main): Attach to an existing console (only
	if there is one)

	* src/item-cursor.c (item_cursor_draw): Use GDK_XOR which is more
	common than GDK_EQUIV for drawing item cursor. Fixes #314210.
parent efa0f4bc
2006-01-24 Ivan, Wong Yat Cheung <ivanwong@gnome.org>
* src/Makefile.am: Build as non-console Win32 application by default.
* src/main-application.c (main): Attach to an existing console (only
if there is one)
* src/item-cursor.c (item_cursor_draw): Use GDK_XOR which is more
common than GDK_EQUIV for drawing item cursor. Fixes #314210.
2006-01-13 Morten Welinder <terra@gnome.org>
* src/stf-parse.c (stf_parse_general): Drop maxline argument. All
......
Gnumeric 1.6.2
Ivan, Y.C. Wong:
* Fix Gdk-WARNING when cutting or copying cells. [#314210]
* No more debug command prompt. Error/warning messages will
go to an existing command prompt (if any).
Jody:
* Disable the IRC link in the help menu.
* Use the cannonical web page in case of problems.
......
2006-01-24 Ivan, Wong Yat Cheung <ivanwong@gnome.org>
* src/Makefile.am: Build as non-console Win32 application by default.
* src/main-application.c (main): Attach to an existing console (only
if there is one)
* src/item-cursor.c (item_cursor_draw): Use GDK_XOR which is more
common than GDK_EQUIV for drawing item cursor. Fixes #314210.
2006-01-13 Morten Welinder <terra@gnome.org>
* src/stf-parse.c (stf_parse_general): Drop maxline argument. All
......
......@@ -315,6 +315,7 @@ gnumeric_LDFLAGS = -export-dynamic
if WITH_WIN32
libspreadsheet_la_LDFLAGS += -no-undefined -Wl,--export-all-symbols,--enable-runtime-pseudo-relo
gnumeric_LDADD += gnumeric_rc.o
gnumeric_LDFLAGS += -mwindows
endif
gnumeric_app_libs = \
......
......@@ -335,9 +335,9 @@ item_cursor_draw (FooCanvasItem *item, GdkDrawable *drawable,
gdk_gc_set_line_attributes (ic->gc, 1,
GDK_LINE_SOLID, GDK_CAP_BUTT, GDK_JOIN_MITER);
gdk_gc_set_rgb_fg_color (ic->gc, &gs_black);
gdk_gc_set_rgb_fg_color (ic->gc, &gs_white);
gdk_gc_set_rgb_bg_color (ic->gc, &gs_white);
values.function = GDK_EQUIV;
values.function = GDK_XOR;
gdk_gc_set_values (ic->gc, &values, GDK_GC_FUNCTION);
if (draw_external) {
......
......@@ -14,8 +14,10 @@
#include <glib/gi18n.h>
#include "gnumeric.h"
#include "libgnumeric.h"
#ifdef WIN32
#ifdef G_OS_WIN32
#define POPT_STATIC
#define _WIN32_WINNT 0x0501
#include <windows.h>
#endif
#include <popt.h>
......@@ -337,6 +339,25 @@ main (int argc, char const *argv [])
GSList *wbcgs_to_kill = NULL;
poptContext ctx;
gchar const **args = go_shell_argv_to_glib_encoding (argc, argv);
#ifdef G_OS_WIN32
gboolean has_console = FALSE;
{
typedef BOOL (CALLBACK* LPFNATTACHCONSOLE)(DWORD);
LPFNATTACHCONSOLE MyAttachConsole = NULL;
HMODULE hmod;
if ((hmod = GetModuleHandle("kernel32.dll"))) {
MyAttachConsole = (LPFNATTACHCONSOLE) GetProcAddress(hmod, "AttachConsole");
if (MyAttachConsole(ATTACH_PARENT_PROCESS)) {
freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
dup2(fileno(stdout), 1);
dup2(fileno(stderr), 2);
has_console = TRUE;
}
}
}
#endif
gnm_pre_parse_init (args[0]);
......@@ -475,6 +496,12 @@ main (int argc, char const *argv [])
#ifdef WITH_GNOME
bonobo_ui_debug_shutdown ();
#elif defined(G_OS_WIN32)
if (has_console) {
close(1);
close(2);
FreeConsole();
}
#endif
go_shell_argv_to_glib_encoding_free ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment