AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix MSVC build problem. (#339739, Kazuki Iwamoto)

Browse Source 
2006-06-11  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkprintoperation-win32.c: Fix MSVC build problem. (#339739,
	Kazuki Iwamoto)
This commit is contained in:
Tor Lillqvist 2006-06-11 19:59:58 +00:00 committed by Tor Lillqvist
parent dd9aefca76
commit b08305d2d7
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-06-11 Tor Lillqvist <tml@novell.com>
* gtk/gtkprintoperation-win32.c: Fix MSVC build problem. (#339739,
Kazuki Iwamoto)
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Convert \n
to \r\n also when storing CF_UNICODETEXT (UTF-16) in the
Clipboard. (#344496)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-06-11 Tor Lillqvist <tml@novell.com>
* gtk/gtkprintoperation-win32.c: Fix MSVC build problem. (#339739,
Kazuki Iwamoto)
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Convert \n
to \r\n also when storing CF_UNICODETEXT (UTF-16) in the
Clipboard. (#344496)

6
gtk/gtkprintoperation-win32.c
View File

@ -29,6 +29,7 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <io.h>
#include <stdio.h>
#include <stdlib.h>
#include <cairo-win32.h>
@ -70,6 +71,7 @@ static void win32_poll_status (GtkPrintOperation *op);
static const GUID myIID_IPrintDialogCallback = {0x5852a2c3,0x6530,0x11d1,{0xb6,0xa3,0x0,0x0,0xf8,0x75,0x7b,0xf9}};
#ifndef _MSC_VER
#undef INTERFACE
#define INTERFACE IPrintDialogCallback
DECLARE_INTERFACE_ (IPrintDialogCallback, IUnknown)
@ -81,6 +83,7 @@ DECLARE_INTERFACE_ (IPrintDialogCallback, IUnknown)
STDMETHOD (SelectionChange)(THIS) PURE;
STDMETHOD (HandleMessage)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT*) PURE;
};
#endif
static UINT got_gdk_events_message;
@ -536,8 +539,9 @@ win32_poll_status (GtkPrintOperation *op)
status_str = NULL;
if (ret)
{
DWORD win32_status;
job_info = (JOB_INFO_1W *)data;
DWORD win32_status = job_info->Status;
win32_status = job_info->Status;
if (job_info->pStatus)
status_str = g_utf16_to_utf8 (job_info->pStatus,