From 1503d3c2499f69793faa4c219b015d50d36e7386 Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Thu, 2 Mar 2000 20:20:37 +0100
Subject: [PATCH] No need to check for GTK.* here, it breaks things if the
compilation of GTK failed, since the dumped .o files will be empty, but not
reinstalled or recompiled when GTK is reinstalled
Rev: lib/modules/GTKSupport.pmod/Alert.pike:1.3
Rev: lib/modules/GTKSupport.pmod/pCtree.pike:1.3
Rev: lib/modules/GTKSupport.pmod/pDrawingArea.pike:1.3
---
lib/modules/GTKSupport.pmod/Alert.pike | 6 +----
lib/modules/GTKSupport.pmod/pCtree.pike | 26 ++++++++-----------
lib/modules/GTKSupport.pmod/pDrawingArea.pike | 12 +++------
3 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/lib/modules/GTKSupport.pmod/Alert.pike b/lib/modules/GTKSupport.pmod/Alert.pike
index 914916cad9..92c9a65360 100644
--- a/lib/modules/GTKSupport.pmod/Alert.pike
+++ b/lib/modules/GTKSupport.pmod/Alert.pike
@@ -1,11 +1,9 @@
-#if constant(GTK.Dialog)
-
inherit GTK.Dialog;
void begone(object w2)
{
destruct( this_object() );
-}
+}
object ok_button;
@@ -28,5 +26,3 @@ void create(string text, string|void title)
action_area()->add( ok_button->show() );
show();
}
-
-#endif
diff --git a/lib/modules/GTKSupport.pmod/pCtree.pike b/lib/modules/GTKSupport.pmod/pCtree.pike
index e13e083976..f345053ce7 100644
--- a/lib/modules/GTKSupport.pmod/pCtree.pike
+++ b/lib/modules/GTKSupport.pmod/pCtree.pike
@@ -1,5 +1,3 @@
-#if constant(GTK.Ctree)
-
inherit GTK.Ctree:ctree;
class Node
@@ -50,13 +48,13 @@ class Node
return this;
}
- Node insert_sibling(array(string)|void columns,
+ Node insert_sibling(array(string)|void columns,
void|int is_leaf,void|int expanded)
{
return Prog (ctree::insert_node(0,node,columns,is_leaf,expanded));
}
- Node insert_child(array(string)|void columns,
+ Node insert_child(array(string)|void columns,
void|int is_leaf,void|int expanded)
{
return Prog(ctree::insert_node(node,0,columns,is_leaf,expanded));
@@ -76,7 +74,7 @@ class Node
{
return !!ctree::node_is_visible(node);
}
-
+
Node last()
{
return Prog(ctree::last(node));
@@ -188,7 +186,7 @@ class Node
return this;
}
- Node set_pixtext( int column, string text, int spacing,
+ Node set_pixtext( int column, string text, int spacing,
GDK.Pixmap pixmap, object(GDK.Bitmap)|void mask)
{
ctree::node_set_pixtext(node,column,text,spacing,pixmap,mask);
@@ -205,12 +203,12 @@ class Node
{
return ctree::node_get_row_data(node);
}
-
- Node set_info(string text, int spacing,
- object(GDK.Pixmap)|void pixmap_closed,
- object(GDK.Bitmap)|void mask_closed,
- object(GDK.Pixmap)|void pixmap_opened,
- object(GDK.Bitmap)|void mask_opened,
+
+ Node set_info(string text, int spacing,
+ object(GDK.Pixmap)|void pixmap_closed,
+ object(GDK.Bitmap)|void mask_closed,
+ object(GDK.Pixmap)|void pixmap_opened,
+ object(GDK.Bitmap)|void mask_opened,
int is_leaf, int expanded )
{
ctree::set_node_info(node,text,spacing,pixmap_closed,
@@ -230,7 +228,7 @@ class Node
ctree::remove_node(node);
node=0;
}
-
+
Node select()
{
ctree::select(node);
@@ -364,5 +362,3 @@ static void unselect_expansion() {} /* (node); */
static void unselect_expansion_recursive() {} /* (node); */
static void find() {} /* (what->get_node(),node); */
static void find_by_row_data() {} /* (what->get_node(),node)); */
-
-#endif
diff --git a/lib/modules/GTKSupport.pmod/pDrawingArea.pike b/lib/modules/GTKSupport.pmod/pDrawingArea.pike
index 0277df1de5..7e77ce9cdf 100644
--- a/lib/modules/GTKSupport.pmod/pDrawingArea.pike
+++ b/lib/modules/GTKSupport.pmod/pDrawingArea.pike
@@ -1,5 +1,3 @@
-#if constant(GTK.DrawingArea)
-
inherit GTK.DrawingArea;
static object backing_store, bgc;
static int _xsize, _ysize, is_realized;
@@ -62,7 +60,7 @@ object size(int x, int y)
static void rrefresh()
{
if(!is_realized) return;
- if(xsize() != _xsize || ysize() != _ysize)
+ if(xsize() != _xsize || ysize() != _ysize)
size(xsize(),ysize());
if(backing_store)
{
@@ -102,12 +100,12 @@ void set_background( GDK.Pixmap to )
}
object clear(int|void x, int|void y, int|void w, int|void h)
-{
+{
// werror("%d,%d->%d,%d <%d,%d>\n", x, y, x+w, y+h, w, h);
if(xsize() != _xsize ||
ysize() != _ysize)
size(xsize(),ysize());
-
+
if(!w && !h)
{
w = xsize();
@@ -121,7 +119,7 @@ object clear(int|void x, int|void y, int|void w, int|void h)
for(; y<sy; x=stx,y+=background_pix->ysize()-y%background_pix->ysize())
for(; x<sx; x+=background_pix->xsize()-x%background_pix->xsize())
backing_store->draw_pixmap(bgc,
- background_pix,
+ background_pix,
(x%background_pix->xsize()),
(y%background_pix->ysize()),
x,y,
@@ -152,5 +150,3 @@ WRAP(draw_pixmap);
WRAP(draw_point);
WRAP(draw_rectangle);
WRAP(draw_text);
-
-#endif
--
GitLab