SF.net SVN: geany:[5916] trunk

[ntrel at users.sourceforge.net]

Revision: 5916
          http://geany.svn.sourceforge.net/geany/?rev=5916&view=rev
Author:   ntrel
Date:     2011-09-14 12:01:29 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
Fix uninitialized font size & other fields.
Remove unhooked font dialog apply button.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/win32.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-09-14 11:57:51 UTC (rev 5915)
+++ trunk/ChangeLog	2011-09-14 12:01:29 UTC (rev 5916)
@@ -1,3 +1,10 @@
+2011-09-14  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/win32.c:
+   Fix uninitialized font size & other fields.
+   Remove unhooked font dialog apply button.
+
+
 2011-09-13  Colomban Wendling  <colomban(at)geany(dot)org>
 
  * data/filetype_extensions.conf:

Modified: trunk/src/win32.c
===================================================================
--- trunk/src/win32.c	2011-09-14 11:57:51 UTC (rev 5915)
+++ trunk/src/win32.c	2011-09-14 12:01:29 UTC (rev 5916)
@@ -536,11 +536,15 @@
 	CHOOSEFONT cf;
 	LOGFONT lf;        /* logical font structure */
 
+	memset(&lf, 0, sizeof lf);
+	/* TODO: init lf members */
+	
 	memset(&cf, 0, sizeof cf);
 	cf.lStructSize = sizeof cf;
 	cf.hwndOwner = GDK_WINDOW_HWND(main_widgets.window->window);
 	cf.lpLogFont = &lf;
-	cf.Flags = CF_APPLY | CF_NOSCRIPTSEL | CF_FORCEFONTEXIST | CF_INITTOLOGFONTSTRUCT | CF_SCREENFONTS;
+	/* support CF_APPLY? */
+	cf.Flags = CF_NOSCRIPTSEL | CF_FORCEFONTEXIST | CF_INITTOLOGFONTSTRUCT | CF_SCREENFONTS;
 
 	retval = ChooseFont(&cf);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.