Commit: 796e8c58993d9c3ea8430b4cbc1477eb5303b946 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revision: 796e8c58993d9c3ea8430b4cbc1477eb5303b946 (tree)
• Time: 2008-11-02 09:18:02
• Author: John E. <tdragon@user...>
• Commiter: John E.

Log Message

Remove renamed or deprecated sources

Change Summary

• delete: download.cpp
• delete: getbindir.cpp
• delete: inst_manager.cpp
• delete: inst_manager.hpp
• delete: instselect.cpp
• delete: main.cpp
• delete: pkg_index.cpp
• delete: pkg_index.hpp
• delete: versioning.c
• delete: wxtest.cpp

Incremental Difference

--- a/download.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-
-#include <curl/curl.h>
-#include "ref.hpp"
-
-
-struct CallbackInfo
-{
-	void (*next_callback)(size_t);
-	int total_sent;
-};
-
-extern "C" int DLCallback
- (void* clientp,
-  double dltotal,
-  double dlnow,
-  double ultotal,
-  double ulnow)
-{
-	CallbackInfo* cbi = reinterpret_cast< CallbackInfo* >(clientp);
-	if (!cbi->total_sent)
-	{
-		cbi->next_callback((size_t)dltotal);
-		cbi->total_sent = 1;
-	}
-	cbi->next_callback((size_t)dlnow);
-	return 0;
-}
-
-
-size_t DownloadFile
- (const char* url,
-  const char* local,
-  void (*prog_callback)(size_t) = 0)
-{
-	CURL* curl = curl_easy_init();
-	if (!curl)
-		return 0;
-	RefType< CURL >::Ref curl_closer(curl, curl_easy_cleanup);
-
-	curl_easy_setopt(curl, CURLOPT_URL, url);
-	curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
-
-	FILE* outfile = fopen(local, "wb");
-	if (!outfile)
-		return 0;
-	RefType< FILE >::Ref fcloser(outfile, fclose);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
-
-	if (prog_callback)
-	{
-		curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, DLCallback);
-		CallbackInfo info;
-		info.next_callback = prog_callback;
-		info.total_sent = 0;
-		curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &info);
-	}
-	else
-		curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
-
-	CURLcode success = curl_easy_perform(curl);
-
-	if (success != 0)
-	{
-		fcloser = RefType< FILE >::Ref();
-		DeleteFile(local);
-		return 0;
-	}
-
-	double dltotal = 0.0;
-	curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &dltotal);
-	return (size_t)dltotal;
-}

--- a/getbindir.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/** \file getbindir.cpp
- *
- * Created: JohnE, 2008-10-09
- */
-
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <string>
-
-
-std::string GetBinDir()
-{
-	char path[1024];
-	GetModuleFileName(0, path, 1024);
-	for (int i = strlen(path) - 1; i >= 0; --i)
-	{
-		if (path[i] == '/' || path[i] == '\\')
-		{
-			path[i] = '\0';
-			break;
-		}
-		path[i] = '\0';
-	}
-	return path;
-}

--- a/inst_manager.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-
-#include "inst_manager.hpp"
-
-#include <cstdarg>
-#include "tracked_install.hpp"
-#include "ref.hpp"
-#include "package.hpp"
-#include "ui.hpp"
-
-
-char InstManager::sm_lasterror[2048] = {0};
-std::string InstManager::sm_inst_loc;
-
-
-const char* InstManager::GetError()
-{
-	return sm_lasterror;
-}
-
-
-struct DirCreated
-{
-	std::string rdir;
-	DirCreated(const std::string& dir)
-	 : rdir(dir)
-	{
-	}
-	bool Revert()
-	{
-		return RemoveDirectory(rdir.c_str());
-	}
-};
-struct FileCreated
-{
-	std::string rfile;
-	FileCreated(const std::string& file)
-	 : rfile(file)
-	{
-	}
-	bool Revert()
-	{
-		return DeleteFile(rfile.c_str());
-	}
-};
-
-size_t DownloadFile
- (const char*,
-  const char*,
-  void (*)(size_t) = 0);
-std::string GetBinDir();
-
-bool InstManager::Load(const std::string& inst_loc, bool create)
-{
-	sm_inst_loc = inst_loc;
-	if (sm_inst_loc[sm_inst_loc.length() - 1] == '\\'
-	 || sm_inst_loc[sm_inst_loc.length() - 1] == '/')
-		sm_inst_loc.erase(sm_inst_loc.length() - 1);
-
-	ChangeSet::Ref changes(new ChangeSet);
-	do
-	{
-		if (create)
-		{
-			if (!CreateDirectory(sm_inst_loc.c_str(), 0)
-			 && ::GetLastError() != ERROR_ALREADY_EXISTS)
-			{
-				SetError("Couldn't create the directory '%s'",
-				 sm_inst_loc.c_str());
-				break;
-			}
-			changes->Push(DirCreated(sm_inst_loc));
-
-#if 0
-			if (DownloadFile("http://localhost:1330/mingwinst/mingw_avail.mft",
-			 (GetBinDir() + "\\mingw_avail.mft").c_str(), 0) <= 0)
-			{
-				SetError("Couldn't download the following file:\r\n%s",
-				 "http://localhost:1330/mingwinst/mingw_avail.mft");
-				break;
-			}
-#endif
-
-			return true;
-		}
-		else
-		{
-			return true;
-		}
-	} while (0);
-
-	// Error
-	changes->RevertAll();
-	return false;
-}
-
-
-void InstManager::Save()
-{
-}
-
-
-void InstManager::SetError(const char* fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vsnprintf(sm_lasterror, 2048, fmt, ap);
-	va_end(ap);
-}

--- a/inst_manager.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef INST_MANAGER_HPP_INC
-#define INST_MANAGER_HPP_INC
-
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <string>
-#include <map>
-#include <vector>
-#include "tinyxml/tinyxml.h"
-#include "ref.hpp"
-
-
-struct Package;
-
-
-class InstManager
-{
-public:
-	static const char* GetError();
-
-	static bool Load
-	 (const std::string& inst_loc,
-	  bool create = false);
-	static void Save();
-
-private:
-	static void SetError(const char* fmt, ...);
-
-	static char sm_lasterror[];
-	static std::string sm_inst_loc;
-};
-
-
-#endif // INST_MANAGER_HPP_INC

--- a/instselect.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <windowsx.h>
-#include <shlobj.h>
-#include <sys/stat.h>
-#include <string>
-#include <map>
-#include "resource.h"
-#include "inst_manager.hpp"
-
-
-extern "C" {
-char g_inst_loc[MAX_PATH] = {0};
-}
-
-
-static HWND g_hdlg = 0;
-static BOOL g_createinst = FALSE;
-
-struct CmpStrI
-{
-	bool operator () (const std::string& s1, const std::string& s2)
-	{
-		return (stricmp(s1.c_str(), s2.c_str()) < 0);
-	}
-};
-typedef std::map< std::string, int, CmpStrI > InstIndexMap;
-static InstIndexMap prev_insts;
-
-
-static void ValidateInstPath(HWND hdlg, const std::string& path)
-{
-	int valid = 0;
-	if (path.length() > 0)
-	{
-		size_t i = path.find_last_of("/\\", path.length() - 2);
-		if (path[1] == ':' && i != std::string::npos)
-		{
-			std::string pdir = (i >= 4) ? path.substr(0, i) : path.substr(0, i + 1);
-			struct _stat st;
-			if (_stat(pdir.c_str(), &st) == 0
-			 && _S_ISDIR(st.st_mode))
-			{
-				std::string dpath = path;
-				if (dpath[dpath.length() - 1] == '/'
-				 || dpath[dpath.length() - 1] == '\\')
-					dpath.erase(dpath.length() - 1);
-				if (_stat(dpath.c_str(), &st) == 0)
-				{
-					if (_S_ISDIR(st.st_mode))
-					{
-						if (_stat((dpath + "\\mingwpkg.mft").c_str(), 
-						 &st) == 0)
-						{
-							valid = 1;
-							g_createinst = FALSE;
-							Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
-							 "This is an existing installation");
-							Button_SetCheck(GetDlgItem(hdlg, IDC_EXISTMANAGE),
-							 BST_CHECKED);
-							EnableWindow(GetDlgItem(hdlg, IDC_PREVINSTLIST),
-							 TRUE);
-							InstIndexMap::iterator found =
-							 prev_insts.find(dpath);
-							if (found != prev_insts.end())
-							{
-								(void)ListBox_SetCurSel(
-								 GetDlgItem(hdlg, IDC_PREVINSTLIST),
-								 found->second
-								 );
-							}
-							else
-							{
-								(void)ListBox_SetCurSel(
-								 GetDlgItem(hdlg, IDC_PREVINSTLIST), -1
-								 );
-							}
-						}
-						else
-						{
-							valid = 1;
-							g_createinst = TRUE;
-							Button_SetCheck(GetDlgItem(hdlg, IDC_EXISTMANAGE),
-							 BST_UNCHECKED);
-							EnableWindow(GetDlgItem(hdlg, IDC_PREVINSTLIST),
-							 FALSE);
-							Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
-							 "This path exists");
-						}
-					}
-					else
-					{
-						Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
-						 "This path is not a directory");
-					}
-				}
-				else
-				{
-					valid = 1;
-					g_createinst = TRUE;
-					Button_SetCheck(GetDlgItem(hdlg, IDC_EXISTMANAGE),
-					 BST_UNCHECKED);
-					EnableWindow(GetDlgItem(hdlg, IDC_PREVINSTLIST), FALSE);
-					Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
-					 "This directory will be created");
-				}
-			}
-			else
-			{
-				Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
-				 "The parent directory doesn't exist");
-			}
-		}
-		else
-		{
-			Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
-			 "Not a valid installation path");
-		}
-	}
-	else
-	{
-		Static_SetText(GetDlgItem(hdlg, IDC_VALTEXT),
-		 "Please enter an installation path");
-	}
-	EnableWindow(GetDlgItem(hdlg, IDOK), valid ? TRUE : FALSE);
-}
-
-
-extern "C" int GetPrevInstalls(void (*)(const char*));
-
-extern "C" void PrevInstCallback(const char* path)
-{
-	int index = ListBox_AddString(GetDlgItem(g_hdlg, IDC_PREVINSTLIST), path);
-	prev_insts[path] = index;
-}
-
-static int CALLBACK InstBrowseProc
- (HWND hwnd,
-  UINT uMsg,
-  LPARAM lParam,
-  LPARAM lpData)
-{
-	if (uMsg == BFFM_INITIALIZED)
-		SendMessage(hwnd, BFFM_SETSELECTION, TRUE, lpData);
-	return 0;
-}
-
-static BOOL CALLBACK InstSelProc
- (HWND hwndDlg,
-  UINT uMsg,
-  WPARAM wParam,
-  LPARAM lParam)
-{
-	switch(uMsg)
-	{
-	case WM_INITDIALOG:
-		{
-			g_hdlg = hwndDlg;
-			if (!g_inst_loc[0])
-				strcpy(g_inst_loc, "C:\\mingwgettest");
-			if (GetPrevInstalls(PrevInstCallback) > 0)
-			{
-				SendMessage(GetDlgItem(hwndDlg, IDC_PREVINSTLIST), LB_SETCURSEL,
-				 0, 0);
-				SendMessage(hwndDlg, WM_COMMAND,
-				 MAKEWPARAM(IDC_PREVINSTLIST, LBN_SELCHANGE),
-				 (LPARAM)GetDlgItem(hwndDlg, IDC_PREVINSTLIST));
-				EnableWindow(GetDlgItem(hwndDlg, IDC_PREVINSTLIST), TRUE);
-			}
-			else
-			{
-				EnableWindow(GetDlgItem(hwndDlg, IDC_PREVINSTLIST), FALSE);
-				EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);
-				Edit_SetText(GetDlgItem(hwndDlg, IDC_INSTPATH), g_inst_loc);
-			}
-			SetFocus(GetDlgItem(hwndDlg, IDC_INSTPATH));
-		}
-		return FALSE;
-
-	case WM_COMMAND:
-		switch(LOWORD(wParam))
-		{
-		case IDOK:
-			{
-				g_inst_loc[0] = 0;
-				Edit_GetText(GetDlgItem(hwndDlg, IDC_INSTPATH), g_inst_loc,
-				 MAX_PATH);
-				EndDialog(hwndDlg, 1);
-			}
-			return TRUE;
-		case IDCANCEL:
-			EndDialog(hwndDlg, 0);
-			return TRUE;
-		case IDC_EXISTMANAGE:
-			EnableWindow(GetDlgItem(hwndDlg, IDC_PREVINSTLIST),
-			 Button_GetCheck((HWND)lParam) == BST_CHECKED);
-			return TRUE;
-		case IDC_BROWSENEWINST:
-			{
-				char path[MAX_PATH];
-				path[0] = 0;
-				Edit_GetText(GetDlgItem(hwndDlg, IDC_INSTPATH), path, MAX_PATH);
-				if (!path[0])
-					strcpy(path, "C:\\");
-				BROWSEINFO bi;
-				bi.hwndOwner = hwndDlg;
-				bi.pidlRoot = 0;
-				bi.pszDisplayName = 0;
-				bi.lpszTitle = "Select a Folder";
-				bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE;
-				bi.lpfn = InstBrowseProc;
-				bi.lParam = reinterpret_cast< LPARAM >(path);
-				bi.iImage = 0;
-				LPITEMIDLIST pidl = SHBrowseForFolder(&bi);
-				if (pidl)
-				{
-					char cpath[MAX_PATH];
-					if (SHGetPathFromIDList(pidl, cpath))
-					{
-						std::string path = cpath;
-						if (path.length() < 5
-						 || stricmp(path.c_str() + path.length() - 5, "mingw")
-						  != 0)
-						{
-							if (path[path.length() - 1] != '\\')
-								path += '\\';
-							Edit_SetText(GetDlgItem(hwndDlg, IDC_INSTPATH),
-							 (path + "MinGW").c_str());
-						}
-						else
-						{
-							Edit_SetText(GetDlgItem(hwndDlg, IDC_INSTPATH),
-							 path.c_str());
-						}
-					}
-					CoTaskMemFree(pidl);
-				}
-			}
-			return TRUE;
-		case IDC_INSTPATH:
-			if (HIWORD(wParam) == EN_CHANGE)
-			{
-				char path[MAX_PATH];
-				path[0] = 0;
-				Edit_GetText((HWND)lParam, path, MAX_PATH);
-				ValidateInstPath(hwndDlg, path);
-				return TRUE;
-			}
-			break;
-		case IDC_PREVINSTLIST:
-			if (HIWORD(wParam) == LBN_SELCHANGE)
-			{
-				int sel = ListBox_GetCurSel((HWND)lParam);
-				int len = ListBox_GetTextLen((HWND)lParam, sel);
-				char* txt = (char*)malloc(len + 1);
-				if (ListBox_GetText((HWND)lParam, sel, txt) > 0)
-					Edit_SetText(GetDlgItem(hwndDlg, IDC_INSTPATH), txt);
-				free(txt);
-				return TRUE;
-			}
-			break;
-		}
-		break;
-
-	case WM_CLOSE:
-		EndDialog(hwndDlg, 0);
-		return TRUE;
-	}
-
-    return FALSE;
-}
-
-
-extern "C" void SelectInst(HINSTANCE hinstance, HWND hparent)
-{
-	if (!DialogBox(hinstance, MAKEINTRESOURCE(IDD_INSTSEL), hparent,
-	 InstSelProc) || !g_inst_loc[0])
-		return;
-	if (!InstManager::Load(g_inst_loc, g_createinst))
-	{
-		MessageBox(hparent, InstManager::GetError(),
-		 "Installation Failure", MB_OK | MB_ICONEXCLAMATION);
-		return;
-	}
-	char title[1024];
-	snprintf(title, 1024, "mingw-get: %s", g_inst_loc);
-	SetWindowText(hparent, title);
-}

--- a/main.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <string>
-#include "pkg_index.hpp"
-
-
-extern "C" HWND CreateMainWnd(HINSTANCE);
-extern "C" int MainMessageLoop(HWND);
-std::string GetBinDir();
-extern "C" void SelectInst(HINSTANCE, HWND);
-
-int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
-{
-	HWND mainwnd = CreateMainWnd(hInstance);
-	if (!mainwnd)
-		return 1;
-
-	PkgIndex::LoadManifest(GetBinDir() + "\\mingw_avail.mft");
-
-	SelectInst(hInstance, mainwnd);
-
-	return MainMessageLoop(mainwnd);
-}

--- a/pkg_index.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/** \file pkg_index.cpp
- *
- * Created: JohnE, 2008-10-09
- */
-
-
-#include "pkg_index.hpp"
-
-#include <string>
-#include <cstdarg>
-#include "tinyxml/tinyxml.h"
-#include "ui.hpp"
-#include "package.hpp"
-
-
-char PkgIndex::sm_lasterror[2048] = {0};
-std::vector< std::string > PkgIndex::sm_index_categories;
-PkgIndex::StringIntMap PkgIndex::sm_id_categories;
-PkgIndex::StringPackageMap PkgIndex::sm_id_packages;
-
-
-static const char* NonEmptyAttribute(const TiXmlElement* el, const char* name)
-{
-	const char* attr = el->Attribute(name);
-	if (attr && attr[0])
-		return attr;
-	return 0;
-}
-
-
-int PkgIndex::NumCategories()
-{
-	return sm_index_categories.size();
-}
-
-
-const char* PkgIndex::GetCategory(int cat)
-{
-	return sm_index_categories[cat].c_str();
-}
-
-
-int PkgIndex::CategoryIndex(const char* cat_id)
-{
-	StringIntMap::iterator found = sm_id_categories.find(cat_id);
-	if (found == sm_id_categories.end())
-		return -1;
-	return found->second;
-}
-
-
-PkgIndex::PackageIter PkgIndex::Packages_Begin()
-{
-	return sm_id_packages.begin();
-}
-
-
-PkgIndex::PackageIter PkgIndex::Packages_End()
-{
-	return sm_id_packages.end();
-}
-
-
-bool PkgIndex::LoadManifest(const std::string& mfile)
-{
-	TiXmlDocument doc(mfile.c_str());
-	if (!doc.LoadFile())
-	{
-		SetError("Couldn't load '%s' as XML", mfile.c_str());
-		return false;
-	}
-	for (TiXmlElement* cat_el =
-	  TiXmlHandle(doc.RootElement()->FirstChildElement("package-categories")).
-	  FirstChildElement("category").ToElement();
-	 cat_el;
-	 cat_el = cat_el->NextSiblingElement("category"))
-	{
-		const char* id = NonEmptyAttribute(cat_el, "id");
-		if (!id)
-			continue;
-		const char* name = NonEmptyAttribute(cat_el, "name");
-		if (!name)
-			continue;
-		sm_id_categories[id] = sm_index_categories.size();
-		sm_index_categories.push_back(name);
-	}
-	for (TiXmlElement* package_el =
-	  TiXmlHandle(doc.RootElement()->FirstChildElement("package-collection")).
-	  FirstChildElement("package").ToElement();
-	 package_el;
-	 package_el = package_el->NextSiblingElement("package"))
-	{
-		const char* id = NonEmptyAttribute(package_el, "id");
-		if (!id)
-			continue;
-		StringPackageMap::iterator found = sm_id_packages.find(id);
-		if (found != sm_id_packages.end())
-			continue;
-		Package::Ref newpkg(new Package(id, package_el));
-		InsertPackage(newpkg);
-	}
-	return true;
-}
-
-
-void PkgIndex::ClearAll()
-{
-	sm_index_categories.clear();
-	sm_id_categories.clear();
-	sm_id_packages.clear();
-}
-
-
-void PkgIndex::InsertPackage(Package::Ref ins)
-{
-	sm_id_packages.insert(std::make_pair(ins->m_id, ins));
-}
-
-
-void PkgIndex::SetError(const char* fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vsnprintf(sm_lasterror, 2048, fmt, ap);
-	va_end(ap);
-}

--- a/pkg_index.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/** \file pkg_index.hpp
- *
- * Created: JohnE, 2008-10-09
- */
-#ifndef PKG_INDEX_HPP_INC
-#define PKG_INDEX_HPP_INC
-
-
-#include <list>
-#include <map>
-#include <vector>
-#include "ref.hpp"
-
-
-struct Package;
-
-
-class PkgIndex
-{
-public:
-	static void ClearAll();
-	static bool LoadManifest(const std::string& mfile);
-
-	static int NumCategories();
-	static const char* GetCategory(int cat);
-	static int CategoryIndex(const char* cat_id);
-
-	typedef std::map< std::string, RefType< Package >::Ref > StringPackageMap;
-	typedef StringPackageMap::const_iterator PackageIter;
-	static PackageIter Packages_Begin();
-	static PackageIter Packages_End();
-
-private:
-	static void SetError(const char* fmt, ...);
-	static void InsertPackage(RefType< Package >::Ref ins);
-
-	static char sm_lasterror[];
-	static std::vector< std::string > sm_index_categories;
-	typedef std::map< std::string, int > StringIntMap;
-	static StringIntMap sm_id_categories;
-	static StringPackageMap sm_id_packages;
-};
-
-
-#endif // PKG_INDEX_HPP_INC

--- a/versioning.c
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#include <string.h>
-
-static int IsDigit(char ch)
-{
-	return (ch >= '0' && ch <= '9');
-}
-
-int VersionCompare(const char* v1, const char* v2)
-{
-	static int at1, at2, num1, num2;
-	at1 = 0, at2 = 0;
-	while (v1[at1] && v2[at2])
-	{
-		if (v1[at1] != v2[at2])
-		{
-			if (IsDigit(v1[at1]) && IsDigit(v2[at2]))
-			{
-				num1 = 0;
-				while (IsDigit(v1[at1]))
-				{
-					num1 = num1 * 10 + v1[at1] - '0';
-					++at1;
-				}
-				num2 = 0;
-				while (IsDigit(v2[at2]))
-				{
-					num2 = num2 * 10 + v2[at2] - '0';
-					++at2;
-				}
-				if (num1 != num2)
-					return num1 - num2;
-			}
-			else
-				return v1[at1] - v2[at2];
-		}
-		else
-		{
-			++at1;
-			++at2;
-		}
-	}
-	return v1[at1] - v2[at2];
-}

--- a/wxtest.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#include <wx/app.h>
-#include <wx/dialog.h>
-
-extern "C" int ShowMainWnd2
- (HINSTANCE hInstance,
-  HINSTANCE hPrevInstance,
-  LPSTR lpCmdLine,
-  int nShowCmd)
-{
-	return ::wxEntry(hInstance, hPrevInstance, lpCmdLine, nShowCmd);
-}
-
-class TestDialog : public wxDialog
-{
-public:
-	TestDialog()
-	 : wxDialog(0, -1, wxString("Hello"))
-	{
-	}
-
-private:
-	void OnClose(wxCloseEvent&)
-	{
-		Destroy();
-	}
-
-	DECLARE_EVENT_TABLE() //macro
-};
-
-BEGIN_EVENT_TABLE(TestDialog, wxDialog)
-	EVT_CLOSE(TestDialog::OnClose)
-END_EVENT_TABLE()
-
-
-class MyApp : public wxApp
-{
-    virtual bool OnInit()
-    {
-    	TestDialog* dlg = new TestDialog;
-    	dlg->Show();
-    	return true;
-    }
-};
-
-IMPLEMENT_APP_NO_MAIN(MyApp) //macro