Remove GlobalContext class. Move all native code from EventHandler class to NativeWindowX11 and NativeWindowWin32 classes.

1 files changed, 4 insertions, 6 deletions

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 <string>
+#include <map>
 
-#include "globalcontext.h"
+#include "pixelbuffer.h"
 #include "image.h"
 
-#include <string>
-
 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<char, int> character_offset;
   std::map<char, size_t> character_width;
   std::map<char, int> character_pre_bias;