FGFontCache::initializeFonts() now portable across platform through the use of plib

[flightgear.git] / src / GUI / dialog.hxx

diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx
index 2a3195cb170183e777c84903a59e73786096f0af..e272e96a9e76a9a1c37f6efa5d6c76a5e00bea80 100644 (file)
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -14,14 +14,19 @@
 #include <simgear/props/props.hxx>
 #include <simgear/misc/sg_path.hxx>
 
-#undef PUCLASS_LIST
-#include "puList.hxx"
-
 #include <vector>
 SG_USING_STD(vector);
 
+
+// ugly temporary workaround for plib's lack of user defined class ids  FIXME
+#define FGCLASS_LIST          0x00000001
+#define FGCLASS_AIRPORTLIST   0x00000002
+#define FGCLASS_PROPERTYLIST  0x00000004
+class GUI_ID { public: GUI_ID(int id) : id(id) {} int id; };
+
+
+
 class FGDialog;
-class FGBinding;
 class NewGUI;
 class FGColor;
 
@@ -199,12 +204,11 @@ private:
 };
 
 
-class fgList : public fgValueList, public puList {
+class fgList : public fgValueList, public puaList, public GUI_ID {
 public:
     fgList(int x1, int y1, int x2, int y2, SGPropertyNode *p, int sw) :
-        fgValueList(p), puList(x1, y1, x2, y2, _list, sw) {}
-    virtual void update();
-    virtual const char *getTypeString() { return "fgList"; }
+            fgValueList(p), puaList(x1, y1, x2, y2, _list, sw), GUI_ID(FGCLASS_LIST) {}
+    void update();
 };
 
 class fgComboBox : public fgValueList, public puaComboBox {