merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -13,6 +13,10 @@
#define __WIN95__
#endif
//#ifdef _MSC_VER
#define __VISUALC__ _MSC_VER
//#endif
#ifdef __GNUWIN32__
#define wxID_OK 5100
#define wxID_CANCEL 5101