summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2009-03-14 10:23:05 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2009-03-14 10:23:05 +0000
commit039a9be3f5f05677ff850f8b73466abaab664d8b (patch)
treeb5b61f0018bb26a13650410f366e3c9d1c2324f4
parentdf19ff61b78b65c03166d576ce1205f6dd189d35 (diff)
Fl_Preferences.H now doesn't include windows.h any more
(Windows only, STR #2173). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6682 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES2
-rw-r--r--FL/Fl_Preferences.H5
-rw-r--r--src/Fl_Preferences.cxx3
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 1e133e154..39db6f77d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.3.0
+ - Fl_Preferences.H now doesn't include windows.h any more
+ (Windows only, STR #2173).
- Fl_Window::draw() now doesn't reset its x/y-coordinates to 0
anymore before drawing itself and its children.
- All draw() methods of widgets are now protected (STR #2142).
diff --git a/FL/Fl_Preferences.H b/FL/Fl_Preferences.H
index fc50cb7c5..f59c255d7 100644
--- a/FL/Fl_Preferences.H
+++ b/FL/Fl_Preferences.H
@@ -31,11 +31,6 @@
#ifndef Fl_Preferences_H
# define Fl_Preferences_H
-# ifdef WIN32
-# include <windows.h>
-# endif // WIN32
-
-# include <stdio.h>
# include "Fl_Export.H"
diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx
index 810ad5635..314841ed0 100644
--- a/src/Fl_Preferences.cxx
+++ b/src/Fl_Preferences.cxx
@@ -51,6 +51,9 @@
# include <unistd.h>
#endif
+#ifdef WIN32
+#include <windows.h>
+#endif // WIN32
char Fl_Preferences::nameBuffer[128];