[Igarden-commit] CommonSource/yaaf/Libraries/yaaf_gui/sources XGGlobals.cpp, NONE, 1.1 AppMain.cpp, 1.2, 1.3

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/CommonSource/yaaf/Libraries/yaaf_gui/sources
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12186

Modified Files:
	AppMain.cpp 
Added Files:
	XGGlobals.cpp 
Log Message:
Move globals from AppMain to XGGlobals

Index: AppMain.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/yaaf/Libraries/yaaf_gui/sources/AppMain.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AppMain.cpp	9 Oct 2006 00:40:14 -0000	1.2
--- AppMain.cpp	18 Oct 2006 01:17:14 -0000	1.3
***************
*** 44,101 ****
  /************************************************************************/
  /*																		*/
- /*	Internal globals													*/
- /*																		*/
- /************************************************************************/
- 
- namespace yaaf {
- 
- #if OPT_WINOS == 1
- 
- HINSTANCE	_GInstance;
- HINSTANCE	_GPrevInstance;
- LPSTR		_GArgString;
- int			_GArgShow;
- 
- char		_GDDEAppName[256];
- char		_GDDETopicName[256];
- 
- HWND		_GMainWindow;
- HWND		_GMDIWindow;
- HWND		_GToolWindow;
- 
- XGWindow	*_GWindow;
- XGView		*_GView;
- 
- char		_GPopClass[32];
- char		_GWindowClass[32];
- char		_GToolClass[32];
- char		_GMainClass[32];
- char		_GFrameClass[32];
- char		_GControlClass[32];
- char		_GDlogClass[32];
- char		_GCopyrightClass[32];
- XGView		*_GToolView;
- 
- #endif
- 
- #if OPT_XWIN == 1
- 
- int			_GArgC;
- char		**_GArgV;
- Display		*_GDisplay;
- bool		_GDialogFlag = false;
- 
- #endif
- 
- #if OPT_MACOS
- 
- extern bool		_GAppFrontmost;		// frontmost application global
- 
- #endif
- 
- } // namespace yaaf
- 
- /************************************************************************/
- /*																		*/
  /*	Main entry point													*/
  /*																		*/
--- 44,47 ----

--- NEW FILE: XGGlobals.cpp ---
/**********************************************************************

YAAF is Copyright 1997-1999 by William Woody.

Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions 
are met:

Redistributions of source code must retain the above copyright notice, 
this list of conditions and the following disclaimer.

Neither the name of the copyright holder or other contributors may
be used to promote products derived from this software without
specific written prior permission.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.

Contact:   wo...@al...
Web page:  http://www.pandawave.com/yaaf/

**********************************************************************/

#include <XConfig.h>			// must be first to optimize compile on MSVC++
#include <XGAppCore.h>
#if OPT_XWIN
#include <stdio.h>
#endif

/************************************************************************/
/*																		*/
/*	Internal globals													*/
/*																		*/
/************************************************************************/

namespace yaaf {
	
#if OPT_WINOS == 1
	
	HINSTANCE	_GInstance;
	HINSTANCE	_GPrevInstance;
	LPSTR		_GArgString;
	int			_GArgShow;
	
	char		_GDDEAppName[256];
	char		_GDDETopicName[256];
	
	HWND		_GMainWindow;
	HWND		_GMDIWindow;
	HWND		_GToolWindow;
	
	XGWindow	*_GWindow;
	XGView		*_GView;
	
	char		_GPopClass[32];
	char		_GWindowClass[32];
	char		_GToolClass[32];
	char		_GMainClass[32];
	char		_GFrameClass[32];
	char		_GControlClass[32];
	char		_GDlogClass[32];
	char		_GCopyrightClass[32];
	XGView		*_GToolView;
	
#endif
	
#if OPT_XWIN == 1
	
	int			_GArgC;
	char		**_GArgV;
	Display		*_GDisplay;
	bool		_GDialogFlag = false;
	
#endif
	
#if OPT_MACOS
	
	extern bool		_GAppFrontmost;		// frontmost application global
	
#endif
	
} // namespace yaaf