diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2013-05-16 07:06:27 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2013-05-16 07:06:27 +0000 |
| commit | 23a4845204c734b968c01731767a8261cbc77ce7 (patch) | |
| tree | 7d45ac45c25aae2530f34b61fd4fbb3302a26850 /src | |
| parent | Win32. Fixing some more include issues (glibmm threads depracation). (diff) | |
| download | inkscape-23a4845204c734b968c01731767a8261cbc77ce7.tar.gz inkscape-23a4845204c734b968c01731767a8261cbc77ce7.zip | |
Win32. More include fixes for glibmm 2.36 (file dialog).
(bzr r12337)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/filedialog.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/filedialogimpl-win32.cpp | 4 | ||||
| -rw-r--r-- | src/ui/dialog/filedialogimpl-win32.h | 12 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp index 3413b0b0d..e71605739 100644 --- a/src/ui/dialog/filedialog.cpp +++ b/src/ui/dialog/filedialog.cpp @@ -15,9 +15,9 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "filedialogimpl-win32.h" #include "filedialogimpl-gtkmm.h" #include "filedialog.h" -#include "filedialogimpl-win32.h" #include "gc-core.h" #include <dialogs/dialog-events.h> diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index f8aa291ee..9d91f5d56 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -16,7 +16,7 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif - +#include "filedialogimpl-win32.h" //General includes #include <list> #include <unistd.h> @@ -42,7 +42,7 @@ #include "display/canvas-arena.h" #include "filedialog.h" -#include "filedialogimpl-win32.h" + #include "sp-root.h" #include <zlib.h> diff --git a/src/ui/dialog/filedialogimpl-win32.h b/src/ui/dialog/filedialogimpl-win32.h index 223240453..0839be8a8 100644 --- a/src/ui/dialog/filedialogimpl-win32.h +++ b/src/ui/dialog/filedialogimpl-win32.h @@ -9,14 +9,18 @@ * * Released under GNU GPL, read the file 'COPYING' for more information */ +#if HAVE_CONFIG_H +# include "config.h" +#endif #ifdef WIN32 - +#if WITH_GLIBMM_2_32 +# include <glibmm/threads.h> +#endif #include "gc-core.h" #include <windows.h> -#if GLIB_CHECK_VERSION(2,32,0) -#include <glibmm/threads.h> -#endif +#include "filedialogimpl-gtkmm.h" + namespace Inkscape { |