changeset 1836:879c110ecb57

some general commenting-out for src/ I also get a conflict with Status in dns.h. (Also seen in ui.cc, which I changed like a week ago.) Seemingly defined in X somewhere already. I remember the same thing happening on my port experiment a couple of years, so...I'll just change it.
author corvid <corvid@lavabit.com>
date Sun, 16 Jan 2011 00:17:55 +0000
parents a29b5eea6e99
children 5e2048737b54
files src/dialog.cc src/dillo.cc src/dns.h src/xembed.cc
diffstat 4 files changed, 27 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/dialog.cc	Sat Jan 15 21:55:04 2011 +0000
+++ b/src/dialog.cc	Sun Jan 16 00:17:55 2011 +0000
@@ -118,6 +118,8 @@
  */
 void a_Dialog_text_window(const char *txt, const char *title)
 {
+#if 0
+PORT1.3
    //int wh = 600, ww = 650, bh = 30;
    int wh = prefs.height, ww = prefs.width, bh = 30;
    Font *textfont = font(prefs.font_monospace, 0);
@@ -145,17 +147,21 @@
    window->resizable(td);
    window->end();
    window->show();
+#endif
 }
 
 /*--------------------------------------------------------------------------*/
 static int choice5_answer;
 
+#if 0
+PORT1.3
 static void choice5_cb(Fl_Widget *button, void *number)
 {
   choice5_answer = VOIDP2INT(number);
   _MSG("choice5_cb: %d\n", choice5_answer);
   button->window()->make_exec_return(true);
 }
+#endif
 
 /*
  * Make a question-dialog with a question and some alternatives.
@@ -165,6 +171,8 @@
                      const char *alt1, const char *alt2, const char *alt3,
                      const char *alt4, const char *alt5)
 {
+#if 0
+PORT1.3
    choice5_answer = 0;
 
    int ww = 440, wh = 150, bw = 50, bh = 45, nb = 0;
@@ -205,6 +213,9 @@
    _MSG("Choice5 answer = %d\n", choice5_answer);
 
    return choice5_answer;
+#else
+return fl_choice(QuestionTxt, alt1, alt2, alt3);
+#endif
 }
 
 
@@ -214,9 +225,12 @@
  */
 static void Dialog_user_password_cb(Fl_Widget *button, void *vIntPtr)
 {
+#if 0
+PORT1.3
    int ret = VOIDP2INT(vIntPtr);
   _MSG("Dialog_user_password_cb: %d\n", ret);
   button->window()->make_exec_return(ret);
+#endif
 }
 
 /*
@@ -272,7 +286,8 @@
    window->end();
    window->size_range(window_w,window_h,window_w,window_h);
    window->resizable(window);
-
+#if 0
+PORT1.3
    if ((ok = window->exec())) {
       /* call the callback */
       const char *user, *password;
@@ -281,7 +296,7 @@
       _MSG("a_Dialog_user_passwd: ok = %d\n", ok);
       (*cb)(user, password, vp);
    }
-
+#endif
    delete window;
 
    return ok;
--- a/src/dillo.cc	Sat Jan 15 21:55:04 2011 +0000
+++ b/src/dillo.cc	Sun Jan 16 00:17:55 2011 +0000
@@ -167,7 +167,8 @@
    }
    return opt_id;
 }
-
+#if 0
+PORT1.3
 /*
  * Tell the user if default/pref fonts can't be found.
  */
@@ -185,7 +186,7 @@
    checkFont(prefs.font_cursive, "cursive");
    checkFont(prefs.font_fantasy, "fantasy");
 }
-
+#endif
 /*
  * Given a command line argument, build a DilloUrl for it.
  */
@@ -317,7 +318,8 @@
 
    // Sets WM_CLASS hint on X11
    Fl_Window::default_xclass("dillo");
-
+#if 0
+PORT1.3
    checkPreferredFonts();
    /* use preferred font for UI */
    fltk::Font *dfont = fltk::font(prefs.font_sans_serif, 0);
@@ -325,7 +327,7 @@
       fltk::Widget::default_style->textfont(dfont);
       fltk::Widget::default_style->labelfont(dfont);
    }
-
+#endif
    // Create a new UI/bw pair
    BrowserWindow *bw = a_UIcmd_browser_window_new(0, 0, xid, NULL);
 
--- a/src/dns.h	Sat Jan 15 21:55:04 2011 +0000
+++ b/src/dns.h	Sun Jan 16 00:17:55 2011 +0000
@@ -8,7 +8,7 @@
 #endif /* __cplusplus */
 
 
-typedef void (*DnsCallback_t)(int Status, Dlist *addr_list, void *data);
+typedef void (*DnsCallback_t)(int status, Dlist *addr_list, void *data);
 
 void a_Dns_init (void);
 void a_Dns_freeall(void);
--- a/src/xembed.cc	Sat Jan 15 21:55:04 2011 +0000
+++ b/src/xembed.cc	Sun Jan 16 00:17:55 2011 +0000
@@ -158,7 +158,10 @@
 
 void
 Xembed::create() {
+#if 0
+PORT1.3
    Fl_Window::create();
+#endif
 }
 
 #endif