diff options
| author | Pixel <pixel@nobis-crew.org> | 2010-06-15 00:59:57 -0700 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2010-06-15 00:59:57 -0700 |
| commit | eed0eb6a476d54ce19aeff137984aa981d9e3976 (patch) | |
| tree | 807891636efd2f87dcbd261e971216269973ae07 /iup/srccd | |
| parent | ccc8261e4d48de89da4ddfe7b55e378ae0cd6f47 (diff) | |
Upgrading to iup 3.1
Diffstat (limited to 'iup/srccd')
| -rwxr-xr-x | iup/srccd/Makefile | 2 | ||||
| -rwxr-xr-x | iup/srccd/iup_cd.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/iup/srccd/Makefile b/iup/srccd/Makefile index 43a3f09..8b1d154 100755 --- a/iup/srccd/Makefile +++ b/iup/srccd/Makefile @@ -3,4 +3,4 @@ do_all: iupcd iupcd: - @$(MAKE) --no-print-directory -f ../tecmake_compact.mak + @$(MAKE) --no-print-directory -f ../tecmake.mak diff --git a/iup/srccd/iup_cd.c b/iup/srccd/iup_cd.c index 5998775..619ded7 100755 --- a/iup/srccd/iup_cd.c +++ b/iup/srccd/iup_cd.c @@ -14,7 +14,6 @@ #include <cdiup.h> #include <cdnative.h> - static void (*cdcreatecanvasNATIVE)(cdCanvas* canvas, void* data) = NULL; static void cdcreatecanvasIUP(cdCanvas* canvas, Ihandle *ih_canvas) @@ -24,8 +23,12 @@ static void cdcreatecanvasIUP(cdCanvas* canvas, Ihandle *ih_canvas) #endif char* data; - if (IupGetInt(ih_canvas, "CD_GDK")) + if (cdBaseDriver()==CD_BASE_GDK) + { data = IupGetAttribute(ih_canvas, "DRAWABLE"); /* new IUP 3 attribute, works for GTK only */ + if (!data) + return; + } else { #ifdef WIN32 |