diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-06-26 02:44:01 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-06-26 02:44:01 +0000 |
| commit | 23d5469ec5ad66224b3097145335eee3e27b633b (patch) | |
| tree | b090187f2fe22e1c471a7ee7d1776c8d23afe5af /src/ui | |
| parent | Fix filters/extensions menus not populating (diff) | |
| parent | fix windows build (gtk3) partly. broken because of windows.h poluting namespa... (diff) | |
| download | inkscape-23d5469ec5ad66224b3097145335eee3e27b633b.tar.gz inkscape-23d5469ec5ad66224b3097145335eee3e27b633b.zip | |
Update to exp. r13409
(bzr r13341.5.5)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/filedialogimpl-win32.h | 3 | ||||
| -rw-r--r-- | src/ui/dialog/print.cpp | 9 | ||||
| -rw-r--r-- | src/ui/widget/preferences-widget.cpp | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/ui/dialog/filedialogimpl-win32.h b/src/ui/dialog/filedialogimpl-win32.h index c523f041d..f77249abd 100644 --- a/src/ui/dialog/filedialogimpl-win32.h +++ b/src/ui/dialog/filedialogimpl-win32.h @@ -22,13 +22,14 @@ #endif #endif +#include "filedialogimpl-gtkmm.h" + #include "gc-core.h" // define WINVER high enough so we get the correct OPENFILENAMEW size #ifndef WINVER #define WINVER 0x0500 #endif #include <windows.h> -#include "filedialogimpl-gtkmm.h" namespace Inkscape diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp index 03ac9dc64..459e64041 100644 --- a/src/ui/dialog/print.cpp +++ b/src/ui/dialog/print.cpp @@ -13,10 +13,6 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#ifdef WIN32 -#include <io.h> -#include <windows.h> -#endif #include "print.h" #include <gtkmm/stock.h> @@ -33,6 +29,11 @@ #include <glibmm/i18n.h> +#ifdef WIN32 +#include <io.h> +#include <windows.h> +#endif + static void draw_page( #ifdef WIN32 diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index 3ba00c083..7f3e6cd47 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -14,10 +14,6 @@ # include <config.h> #endif -#ifdef WIN32 -#include <windows.h> -#endif - #if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> #endif @@ -49,6 +45,10 @@ #include <glibmm/convert.h> #include <glibmm/i18n.h> +#ifdef WIN32 +#include <windows.h> +#endif + using namespace Inkscape::UI::Widget; namespace Inkscape { |