[ZooLib-checkins] SF.net SVN: zoolib:[2616] trunk/zoolib/source/cxx/zoolib

[<ag...@us...>]

Revision: 2616
          http://zoolib.svn.sourceforge.net/zoolib/?rev=2616&view=rev
Author:   agreen
Date:     2011-11-18 20:12:57 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
Make LCID an explicit parameter.

Modified Paths:
--------------
    trunk/zoolib/source/cxx/zoolib/ZWinWND.cpp
    trunk/zoolib/source/cxx/zoolib/ZWinWND.h

Modified: trunk/zoolib/source/cxx/zoolib/ZWinWND.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZWinWND.cpp	2011-11-18 20:12:26 UTC (rev 2615)
+++ trunk/zoolib/source/cxx/zoolib/ZWinWND.cpp	2011-11-18 20:12:57 UTC (rev 2616)
@@ -249,13 +249,11 @@
 #pragma mark -
 #pragma mark * ZWinWND, Callable <--> Dialog
 
-HWND sCreateDialog(LPCWSTR lpTemplate, HWND hWndParent, ZRef<Callable_Dialog> iCallable)
+HWND sCreateDialog(LPCWSTR lpTemplate, LCID iLCID, HWND hWndParent, ZRef<Callable_Dialog> iCallable)
 	{
 	HMODULE theHMODULE = ZUtil_Win::sGetModuleHandle();
 
-	LCID theLCID = ::GetThreadLocale();
-	
-	if (HRSRC theHRSRC = ::FindResourceExW(theHMODULE, (LPCWSTR)RT_DIALOG, lpTemplate, theLCID))
+	if (HRSRC theHRSRC = ::FindResourceExW(theHMODULE, (LPCWSTR)RT_DIALOG, lpTemplate, iLCID))
 		{
 		HGLOBAL theHGLOBAL = ::LoadResource(theHMODULE, theHRSRC);
 		return ::CreateDialogIndirectParam
@@ -274,6 +272,9 @@
 		(LPARAM)iCallable.Get());
 	}
 
+HWND sCreateDialog(LPCWSTR lpTemplate, HWND hWndParent, ZRef<Callable_Dialog> iCallable)
+	{ return sCreateDialog(lpTemplate, ::GetThreadLocale(), hWndParent, iCallable) }
+
 bool sDoOneMessageForDialog(HWND iHWND)
 	{
 	MSG theMSG;

Modified: trunk/zoolib/source/cxx/zoolib/ZWinWND.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZWinWND.h	2011-11-18 20:12:26 UTC (rev 2615)
+++ trunk/zoolib/source/cxx/zoolib/ZWinWND.h	2011-11-18 20:12:57 UTC (rev 2616)
@@ -78,6 +78,7 @@
 
 typedef ZCallable<INT_PTR(HWND,UINT,WPARAM,LPARAM)> Callable_Dialog;
 
+HWND sCreateDialog(LPCWSTR lpTemplate, LCID iLCID, HWND hWndParent, ZRef<Callable_Dialog> iCallable);
 HWND sCreateDialog(LPCWSTR lpTemplate, HWND hWndParent, ZRef<Callable_Dialog> iCallable);
 
 bool sDoOneMessageForDialog(HWND iHWND);

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