From 1d09d39a104607812263b093f23a1a0eec73133c Mon Sep 17 00:00:00 2001
From: jcid <devnull@localhost>
Date: Sun, 8 Jun 2008 17:47:13 +0200
Subject: - Minor Html cleanups.

---
 src/form.cc | 12 ++++++------
 src/html.cc |  7 ++-----
 src/html.hh |  1 -
 3 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/form.cc b/src/form.cc
index 8f34b023..b9d3ec23 100644
--- a/src/form.cc
+++ b/src/form.cc
@@ -19,9 +19,11 @@
 #include "dw/core.hh"
 #include "dw/textblock.hh"
 
+#define DEBUG_LEVEL 10
+#include "debug.h"
+
 #include "misc.h"
 #include "msg.h"
-#include "debug.h"
 #include "prefs.h"
 #include "nav.h"
 #include "uicmd.hh"
@@ -56,8 +58,7 @@ static void Html_get_input_values(const DilloHtmlInput *input,
                                   bool is_active_submit, Dlist *values);
 
 static dw::core::ui::Embed *Html_input_image(DilloHtml *html,
-                                             const char *tag, int tagsize,
-                                             DilloHtmlForm *form);
+                                             const char *tag, int tagsize);
 
 static void Html_option_finish(DilloHtml *html);
 
@@ -407,7 +408,7 @@ void Html_tag_open_input(DilloHtml *html, const char *tag, int tagsize)
       } else {
          inp_type = DILLO_HTML_INPUT_IMAGE;
          /* use a dw_image widget */
-         embed = Html_input_image(html, tag, tagsize, form);
+         embed = Html_input_image(html, tag, tagsize);
          init_str = value;
       }
    } else if (!dStrcasecmp(type, "file")) {
@@ -1749,8 +1750,7 @@ static void Html_get_input_values(const DilloHtmlInput *input,
  * Create input image for the form
  */
 static dw::core::ui::Embed *Html_input_image(DilloHtml *html,
-                                             const char *tag, int tagsize,
-                                             DilloHtmlForm *form)
+                                             const char *tag, int tagsize)
 {
    const char *attrbuf;
    StyleAttrs style_attrs;
diff --git a/src/html.cc b/src/html.cc
index 620cccc7..145b221a 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -25,9 +25,6 @@
 
 #include <fltk/utf.h>   /* for utf8encode */
 
-#define DEBUG_LEVEL 10
-#include "debug.h"
-
 #include "bw.h"         /* for BrowserWindow */
 #include "msg.h"
 #include "binaryconst.h"
@@ -212,7 +209,7 @@ void *a_Html_text(const char *Type, void *P, CA_Callback_t *Call, void **Data)
    return (void*)html->dw;
 }
 
-void a_Html_free(void *data)
+static void Html_free(void *data)
 {
    delete ((DilloHtml*)data);
 }
@@ -523,7 +520,7 @@ DilloHtml::DilloHtml(BrowserWindow *p_bw, const DilloUrl *url,
    /* Initialize the main widget */
    initDw();
    /* Hook destructor to the dw delete call */
-   dw->setDeleteCallback(a_Html_free, this);
+   dw->setDeleteCallback(Html_free, this);
 }
 
 /*
diff --git a/src/html.hh b/src/html.hh
index 58369ed3..3e08f37a 100644
--- a/src/html.hh
+++ b/src/html.hh
@@ -10,7 +10,6 @@ extern "C" {
 /*
  * Exported functions
  */
-void a_Html_free(void *data);
 void a_Html_load_images(void *v_html, DilloUrl *pattern);
 
 #ifdef __cplusplus
-- 
cgit v1.2.3