summaryrefslogtreecommitdiff
path: root/lwlib
diff options
context:
space:
mode:
Diffstat (limited to 'lwlib')
-rw-r--r--lwlib/ChangeLog5
-rw-r--r--lwlib/lwlib-Xaw.c4
-rw-r--r--lwlib/xlwmenu.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 35cb646fbcb..52728552eac 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-21 Jan Djärv <jan.h.d@swipnet.se>
+
+ * xlwmenu.c (expose_cb):
+ * lwlib-Xaw.c (fill_xft_data): Declarations before code.
+
2010-04-17 Jan Djärv <jan.h.d@swipnet.se>
* xlwmenu.c: Include Shell.h, remove duplicate declaration of
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index c6bbae7e3c9..d31b4602147 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -150,12 +150,12 @@ xaw_update_scrollbar (instance, widget, val)
static void
fill_xft_data (struct widget_xft_data *data, Widget widget, XftFont *font)
{
- data->widget = widget;
- data->xft_font = font;
Pixel bg, fg;
XColor colors[2];
int screen = XScreenNumberOfScreen (XtScreen (widget));
+ data->widget = widget;
+ data->xft_font = font;
XtVaGetValues (widget,
XtNbackground, &bg,
XtNforeground, &fg,
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index d396aa651e9..52a89de2204 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1304,10 +1304,10 @@ expose_cb (Widget widget,
XEvent* event,
Boolean* continue_to_dispatch)
{
- *continue_to_dispatch = False;
XlwMenuWidget mw = (XlwMenuWidget) closure;
int i;
+ *continue_to_dispatch = False;
for (i = 0; i < mw->menu.windows_length; ++i)
if (mw->menu.windows [i].w == widget) break;
if (i < mw->menu.windows_length && i < mw->menu.old_depth)