diff options
| -rw-r--r-- | amiga/gui.c | 1 | ||||
| -rw-r--r-- | atari/ctxmenu.c | 1 | ||||
| -rwxr-xr-x | atari/font.c | 1 | ||||
| -rw-r--r-- | atari/gui.c | 1 | ||||
| -rwxr-xr-x | atari/rootwin.c | 1 | ||||
| -rw-r--r-- | beos/font.cpp | 1 | ||||
| -rw-r--r-- | beos/window.cpp | 1 | ||||
| -rw-r--r-- | cocoa/NetsurfApp.m | 2 | ||||
| -rw-r--r-- | cocoa/font.m | 1 | ||||
| -rw-r--r-- | riscos/configure/con_fonts.c | 1 | ||||
| -rw-r--r-- | windows/font.c | 1 | ||||
| -rw-r--r-- | windows/gui.c | 12 |
12 files changed, 5 insertions, 19 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 70b165efc..354a3e1b0 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -21,7 +21,6 @@ #include "content/fetchers.h" #include "content/fetchers/resource.h" #include "content/urldb.h" -#include "css/utils.h" #include "desktop/browser_history.h" #include "desktop/browser_private.h" #include "desktop/hotlist.h" diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c index 94e12219c..79ed65d97 100644 --- a/atari/ctxmenu.c +++ b/atari/ctxmenu.c @@ -36,7 +36,6 @@ #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" -#include "css/css.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" diff --git a/atari/font.c b/atari/font.c index 24a18edef..ff1c3e7dd 100755 --- a/atari/font.c +++ b/atari/font.c @@ -38,7 +38,6 @@ #include <stdbool.h>
-#include "css/css.h"
#include "desktop/font.h"
#include "utils/utf8.h"
#include "utils/log.h"
diff --git a/atari/gui.c b/atari/gui.c index 29991515e..f0c4ab709 100644 --- a/atari/gui.c +++ b/atari/gui.c @@ -40,7 +40,6 @@ #include "content/fetch.h" #include "content/fetchers/resource.h" #include "content/backing_store.h" -#include "css/utils.h" #include "desktop/gui.h" #include "desktop/plotters.h" #include "desktop/netsurf.h" diff --git a/atari/rootwin.c b/atari/rootwin.c index d6da2d857..c1b9096bc 100755 --- a/atari/rootwin.c +++ b/atari/rootwin.c @@ -46,7 +46,6 @@ #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" -#include "css/css.h" #include "atari/res/netsurf.rsh" #include "atari/gemtk/gemtk.h" diff --git a/beos/font.cpp b/beos/font.cpp index c52e9671c..5b3ef8bce 100644 --- a/beos/font.cpp +++ b/beos/font.cpp @@ -31,7 +31,6 @@ #include <String.h> #include <View.h> extern "C" { -#include "css/css.h" #include "desktop/font.h" #include "utils/utils.h" #include "utils/log.h" diff --git a/beos/window.cpp b/beos/window.cpp index a8c7e8600..50ee9af96 100644 --- a/beos/window.cpp +++ b/beos/window.cpp @@ -23,7 +23,6 @@ extern "C" { #include "content/content.h" #include "content/urldb.h" -#include "css/utils.h" #include "desktop/browser_private.h" #include "desktop/mouse.h" #include "utils/nsoption.h" diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m index 7469e579d..c30a77c55 100644 --- a/cocoa/NetsurfApp.m +++ b/cocoa/NetsurfApp.m @@ -27,7 +27,6 @@ #import "desktop/gui.h" #import "content/urldb.h" -#import "css/utils.h" #import "desktop/gui.h" #import "desktop/mouse.h" #import "desktop/netsurf.h" @@ -41,7 +40,6 @@ #import "utils/log.h" #import "utils/messages.h" #import "utils/utils.h" -#import "css/utils.h" #ifndef NETSURF_HOMEPAGE #define NETSURF_HOMEPAGE "http://www.netsurf-browser.org/welcome/" diff --git a/cocoa/font.m b/cocoa/font.m index 3e28dea47..338339ba8 100644 --- a/cocoa/font.m +++ b/cocoa/font.m @@ -21,7 +21,6 @@ #import "cocoa/plotter.h" #import "cocoa/font.h" -#import "css/css.h" #import "utils/nsoption.h" #import "desktop/font.h" #import "desktop/plotters.h" diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c index 1fe427c24..5e1b27049 100644 --- a/riscos/configure/con_fonts.c +++ b/riscos/configure/con_fonts.c @@ -22,7 +22,6 @@ #include "utils/messages.h" #include "utils/utils.h" #include "desktop/plot_style.h" -#include "css/css.h" #include "riscos/gui.h" #include "riscos/font.h" diff --git a/windows/font.c b/windows/font.c index 6e1efdc6a..5c1fee07e 100644 --- a/windows/font.c +++ b/windows/font.c @@ -26,7 +26,6 @@ #include <windows.h> -#include "css/css.h" #include "desktop/font.h" #include "utils/nsoption.h" #include "utils/utf8.h" diff --git a/windows/gui.c b/windows/gui.c index 0d148f2cc..20167c690 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -31,7 +31,6 @@ #include "content/urldb.h" #include "content/fetch.h" -#include "css/utils.h" #include "desktop/browser_history.h" #include "desktop/browser.h" #include "desktop/mouse.h" @@ -1159,21 +1158,20 @@ static HWND nsws_window_create_statusbar(struct gui_window *w) return hwnd; } -static css_fixed get_window_dpi(HWND hwnd) +static int get_window_dpi(HWND hwnd) { HDC hdc = GetDC(hwnd); int dpi = GetDeviceCaps(hdc, LOGPIXELSY); - css_fixed fix_dpi = INTTOFIX(96); - if (dpi > 10) { - fix_dpi = INTTOFIX(dpi); + if (dpi <= 10) { + dpi = 96; /* 96DPI is the default */ } ReleaseDC(hwnd, hdc); - LOG(("FIX DPI %x", fix_dpi)); + LOG(("FIX DPI %d", dpi)); - return fix_dpi; + return dpi; } /** |