Changeset 269

Timestamp:

03/02/08 04:32:23 (9 months ago)

Author:

Ant

Message:

updated to gtkD. load scintilla on request only.

Files:

• trunk/compdLeds.sh (modified) (1 diff)
• trunk/src/leds/FSView.d (modified) (1 diff)
• trunk/src/leds/ProjectView.d (modified) (1 diff)
• trunk/src/leds/Scintilla.d (modified) (4 diffs)
• trunk/src/leds/SourceViewEdit.d (modified) (1 diff)

trunk/compdLeds.sh

@@ -12 +12 @@
-    -I../../Dool/trunk/src \
-    -I../../Dante/trunk/src \
-
+
+
-    -I~/dmd/src/phobos \
-    -L../../Dool/ -ldool \
-    -L../../Dante/ -ldantfw \
-Duit/ -lduit
+gtkd/trunk -lgtkd
-    -L/dmd/lib/ -lphobos \
-    -c \

trunk/src/leds/FSView.d

@@ -612 +612 @@
-            }
-        }
-GtkTreeIter *
+TreeIter
-        {
-            TreeIter iter = new TreeIter();

trunk/src/leds/ProjectView.d

@@ -1440 +1440 @@
-            return false;   // false : the event is passed to other listeners
-        }
-GtkTreeIter *
+TreeIter
-        {
-            debug(treeView)writefln("ProjectView.onExpandCallback 1");

trunk/src/leds/Scintilla.d

@@ -1412 +1412 @@
-private Linker scintilla_Linker;
-
-static this()
-{
-    /* Assume scintilla.dll is in same directory as current executable */
-    version(Windows) scintilla_Linker = new Linker("scintilla.dll");
-    version(linux)   scintilla_Linker = new Linker("libscintilla.so.1.7.4");
-    scintilla_Linker.link(scintillaLinks);
-}
-
-static ~this()
-{
-    delete scintilla_Linker;
-}   
-
-extern(C)
-{
@@ -1688 +1675 @@
-class Scintilla : Container , CodeEdit
-{
+
+/+
+static this()
+{
+    writefln("loading scintilla lib now");
+    /* Assume scintilla.dll is in same directory as current executable */
+    version(Windows) scintilla_Linker = new Linker("scintilla.dll");
+    version(linux)   scintilla_Linker = new Linker("libscintilla.so.1.7.4");
+    scintilla_Linker.link(scintillaLinks);
+}
+
+static ~this()
+{
+    delete scintilla_Linker;
+}   
++/
+
+static int countInstances;
+
+private static void loadLib()
+{
+    if ( countInstances == 0 )
+    {
+        writefln("loading scintilla lib now");
+        /* Assume scintilla.dll is in same directory as current executable */
+        version(Windows) scintilla_Linker = new Linker("scintilla.dll");
+        version(linux)   scintilla_Linker = new Linker("libscintilla.so.1.7.4");
+        scintilla_Linker.link(scintillaLinks);
+    }
+    ++countInstances;
+}
+
+
+private static void unloadLib()
+{
+    --countInstances;
+    if ( countInstances == 0 )
+    {
+        delete scintilla_Linker;
+    }
+}
+
-    public:
-    void addCodeEditListener()
@@ -1911 +1940 @@
-    this()
-    {
+        loadLib();
-        super(cast(GtkContainer*)scintilla_new());
-        ID = S_ID++;
@@ -2027 +2057 @@
-     * resources before the notebook is done with them (I think that's why???)
-     */
-//
-//
+
+
-    //  release();
-
+
+
-    
-    private:

trunk/src/leds/SourceViewEdit.d

@@ -740 +740 @@
-    void gotoLine(int lineNumber, bool useAlign=false)
-    {
+        writefln("SourceViewEdit.gotoLine 1");
+        insertIter();   // make sure we have a valid iter
-        iter.setLine(lineNumber);
+        writefln("SourceViewEdit.gotoLine 2");
-        buffer.placeCursor(iter);
+        writefln("SourceViewEdit.gotoLine 3");
-        view.scrollToIter(iter, 0.0, useAlign, 0.0, 0.25);
+        writefln("SourceViewEdit.gotoLine 4");
-    }
-