From 895c942289c81ca24346d3bb18d2b922ae469554 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 8 May 2013 14:56:19 +0200 Subject: Remove GlobalContext class. Move all native code from EventHandler class to NativeWindowX11 and NativeWindowWin32 classes. --- plugingui/font.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'plugingui/font.h') diff --git a/plugingui/font.h b/plugingui/font.h index c0a65f4..b47fbde 100644 --- a/plugingui/font.h +++ b/plugingui/font.h @@ -27,13 +27,12 @@ #ifndef __DRUMGIZMO_FONT_H__ #define __DRUMGIZMO_FONT_H__ -#include "pixelbuffer.h" +#include +#include -#include "globalcontext.h" +#include "pixelbuffer.h" #include "image.h" -#include - namespace GUI { class Font { @@ -49,12 +48,11 @@ public: size_t textWidth(std::string text); size_t textHeight(std::string text = ""); - PixelBufferAlpha *render(GlobalContext *gctx, std::string text); + PixelBufferAlpha *render(std::string text); private: Image img_font; - GlobalContext *gctx; std::map character_offset; std::map character_width; std::map character_pre_bias; -- cgit v1.2.3