diff options
| author | Tor Lillqvist <tml@novell.com> | 2006-06-11 19:59:58 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2006-06-11 19:59:58 +0000 |
| commit | b08305d2d713bd16200bb010b0665d97533b740e (patch) | |
| tree | 12be5656649ee8d81e271ab67e38529dc7f9baf9 | |
| parent | dd9aefca76c98acf0c6614357b791be73ad41eb6 (diff) | |
| download | gdk-pixbuf-b08305d2d713bd16200bb010b0665d97533b740e.tar.gz | |
Fix MSVC build problem. (#339739, Kazuki Iwamoto)
2006-06-11 Tor Lillqvist <tml@novell.com>
* gtk/gtkprintoperation-win32.c: Fix MSVC build problem. (#339739,
Kazuki Iwamoto)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | gtk/gtkprintoperation-win32.c | 6 |
3 files changed, 11 insertions, 1 deletions
@@ -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) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0534d0235..1d20a28e6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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) diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c index dd37581de..818484660 100644 --- a/gtk/gtkprintoperation-win32.c +++ b/gtk/gtkprintoperation-win32.c @@ -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, |