SF.net SVN: geany: [625] trunk/src
eht16 at users.sourceforge.net
eht16 at xxxxx
Tue Jul 25 08:27:18 UTC 2006
Revision: 625
Author: eht16
Date: 2006-07-25 01:27:12 -0700 (Tue, 25 Jul 2006)
ViewCVS: http://svn.sourceforge.net/geany/?rev=625&view=rev
Log Message:
-----------
Don't include windows.h in geany.h.
Modified Paths:
--------------
trunk/src/geany.h
trunk/src/win32.c
Modified: trunk/src/geany.h
===================================================================
--- trunk/src/geany.h 2006-07-25 00:10:36 UTC (rev 624)
+++ trunk/src/geany.h 2006-07-25 08:27:12 UTC (rev 625)
@@ -44,8 +44,6 @@
#if defined(G_OS_WIN32) || defined(WIN32)
-# include <windows.h>
-# include <commdlg.h>
# define GEANY_WIN32
# define GEANY_DATA_DIR PACKAGE_DATA_DIR
#else
Modified: trunk/src/win32.c
===================================================================
--- trunk/src/win32.c 2006-07-25 00:10:36 UTC (rev 624)
+++ trunk/src/win32.c 2006-07-25 08:27:12 UTC (rev 625)
@@ -27,6 +27,9 @@
#ifdef GEANY_WIN32
+#include <windows.h>
+#include <commdlg.h>
+
#include <string.h>
#include <ctype.h>
#include <math.h>
@@ -336,15 +339,15 @@
// convert the Unicode chars to wide chars
/// TODO test if LANG == C then possibly skip conversion
- MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, sizeof(w_msg)/sizeof(w_msg[0]));
+ MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, sizeof(w_msg)/sizeof(w_msg[0]));
MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)/sizeof(w_title[0]));
// display the message box
rc = MessageBoxW(NULL, w_msg, w_title, t);
-
+
if (type == GTK_MESSAGE_QUESTION && rc != IDYES)
ret = FALSE;
-
+
return ret;
}
@@ -358,7 +361,7 @@
// convert the Unicode chars to wide chars
/// TODO test if LANG == C then possibly skip conversion
- MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, sizeof(w_msg)/sizeof(w_msg[0]));
+ MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, sizeof(w_msg)/sizeof(w_msg[0]));
MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)/sizeof(w_title[0]));
ret = MessageBoxW(NULL, w_msg, w_title, MB_YESNOCANCEL | MB_ICONQUESTION);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list