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

@@ -6,6 +6,7 @@ top_builddir = ../..
program_dir = samples/dragimag
PROGRAM=dragimag
DATAFILES=backgrnd.png shape01.png shape02.png shape03.png
OBJECTS=$(PROGRAM).o

View File

@@ -25,7 +25,7 @@
// Under Windows, change this to 1
// to use wxGenericDragImage
#define wxUSE_GENERIC_DRAGIMAGE 0
#define wxUSE_GENERIC_DRAGIMAGE 1
#if wxUSE_GENERIC_DRAGIMAGE
#include "wx/generic/dragimgg.h"

View File

@@ -6,5 +6,5 @@ WXDIR = ../..
TARGET=dragimag
OBJECTS = $(TARGET).o
include $(WXDIR)\src\makeprog.g95
include $(WXDIR)/src/makeprog.g95