From 8f25f501b9bd60cbb0efecf7a2297cb828c0dba7 Mon Sep 17 00:00:00 2001
From: corvid <corvid@lavabit.com>
Date: Sat, 8 Jan 2011 04:23:26 +0000
Subject: some xembed

---
 src/xembed.cc | 17 ++++++++---------
 src/xembed.hh |  6 +++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/xembed.cc b/src/xembed.cc
index 49828ffe..45507e64 100644
--- a/src/xembed.cc
+++ b/src/xembed.cc
@@ -12,10 +12,9 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <fltk/Window.h>
-#include <fltk/run.h>
-#include <fltk/events.h>
-#include <fltk/x.h>
+#include <FL/Fl_Window.H>
+#include <FL/Fl.H>
+#include <FL/x.H>
 
 #include "xembed.hh"
 
@@ -74,10 +73,10 @@ Xembed::handle(int e) {
    if (e == FL_PUSH)
       sendXembedEvent(XEMBED_REQUEST_FOCUS);
 
-   return Window::handle(e);
+   return Fl_Window::handle(e);
 }
 
-static int event_handler(int e, fltk::Window *w) {
+static int event_handler(int e, Fl_Window *w) {
    Atom xembed_atom = XInternAtom (fltk::xdisplay, "_XEMBED", false);
 
    if (fltk::xevent.type == ClientMessage) {
@@ -110,7 +109,7 @@ void Xembed::create() {
 }
 
 void Xembed::createInternal(uint32_t parent) {
-   fltk::Window *window = this;
+   Fl_Window *window = this;
    Colormap colormap = fltk::xcolormap;
 
    XSetWindowAttributes attr;
@@ -154,12 +153,12 @@ Xembed::sendXembedEvent(uint32_t message) {};
 
 int
 Xembed::handle(int e) {
-   return Window::handle(e);
+   return Fl_Window::handle(e);
 }
 
 void
 Xembed::create() {
-   Window::create();
+   Fl_Window::create();
 }
 
 #endif
diff --git a/src/xembed.hh b/src/xembed.hh
index 70d79c5f..fe40014d 100644
--- a/src/xembed.hh
+++ b/src/xembed.hh
@@ -1,11 +1,11 @@
 #ifndef __XEMBED_HH__
 #define __XEMBED_HH__
 
-#include <fltk/Window.h>
+#include <FL/Fl_Window.H>
 
 #include "d_size.h"
 
-class Xembed : public fltk::Window {
+class Xembed : public Fl_Window {
    private:
       uint32_t xid;
       void createInternal(uint32_t parent);
@@ -13,7 +13,7 @@ class Xembed : public fltk::Window {
       void sendXembedEvent(uint32_t message);
 
    public:
-      Xembed(uint32_t xid, int _w, int _h) : fltk::Window(_w, _h) {
+      Xembed(uint32_t xid, int _w, int _h) : Fl_Window(_w, _h) {
          this->xid = xid;
       };
       void create();
-- 
cgit v1.2.3