diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-09-23 17:19:33 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-09-23 17:19:33 +0000 |
| commit | 89bb2602a15a830b7e2133307a8ec6a08ebd0f84 (patch) | |
| tree | 9d99114076f755d5098b353b1cd26215e74abe61 /src/style.h | |
| parent | Add libunicode-convert: routines for converting between Unicode and nonunicod... (diff) | |
| download | inkscape-89bb2602a15a830b7e2133307a8ec6a08ebd0f84.tar.gz inkscape-89bb2602a15a830b7e2133307a8ec6a08ebd0f84.zip | |
Fixes bug #988601: omnibus patch for EMF input/output support (cross-platform)
(bzr r11668.1.8)
Diffstat (limited to 'src/style.h')
| -rw-r--r-- | src/style.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/style.h b/src/style.h index 576167645..eeb742c00 100644 --- a/src/style.h +++ b/src/style.h @@ -178,12 +178,17 @@ struct SPIPaint { void read( gchar const *str, SPStyle &tyle, SPDocument *document = 0); - // Win32 is a temp work-around until the emf extension is fixed: -#ifndef WIN32 +/* EMF_DRIVER is a temp work-around +The problem is that SPIPaint is private, but is included in the SPStyle struct, and that is needed in emf-inout.cpp, but the compiler +won't accept it there. If the two conditional lines are moved out of the "private" they end up generating undefined reference +errors. +*/ + private: +#ifndef EMF_DRIVER SPIPaint(SPIPaint const&); SPIPaint &operator=(SPIPaint const &); -#endif // WIN32 +#endif // EMF_DRIVER }; /// Filter type internal to SPStyle |