Author: matt
Date: 2011-06-20 07:21:04 -0700 (Mon, 20 Jun 2011)
New Revision: 8834
Log:
123: added wrappe handle funcitons. rename vararg list version of some
functions out of redundancy by prefixing them with va_
Modified:
branches/branch-3.0/FL/fl_ask.H
branches/branch-3.0/FL/fl_utf8.h
branches/branch-3.0/fltk3/Spinner.h
branches/branch-3.0/fltk3/ask.h
branches/branch-3.0/fltk3/utf8.h
branches/branch-3.0/src/Fl.cxx
branches/branch-3.0/src/Fl_Adjuster.cxx
branches/branch-3.0/src/Fl_Box.cxx
branches/branch-3.0/src/Fl_Browser_.cxx
branches/branch-3.0/src/Fl_Button.cxx
branches/branch-3.0/src/Fl_Check_Browser.cxx
branches/branch-3.0/src/Fl_Choice.cxx
branches/branch-3.0/src/Fl_Clock.cxx
branches/branch-3.0/src/Fl_Counter.cxx
branches/branch-3.0/src/Fl_Dial.cxx
branches/branch-3.0/src/Fl_File_Input.cxx
branches/branch-3.0/src/Fl_Group.cxx
branches/branch-3.0/src/Fl_Help_View.cxx
branches/branch-3.0/src/Fl_Input.cxx
branches/branch-3.0/src/Fl_Light_Button.cxx
branches/branch-3.0/src/Fl_Menu_Bar.cxx
branches/branch-3.0/src/Fl_Menu_Button.cxx
branches/branch-3.0/src/Fl_Positioner.cxx
branches/branch-3.0/src/Fl_Repeat_Button.cxx
branches/branch-3.0/src/Fl_Return_Button.cxx
branches/branch-3.0/src/Fl_Roller.cxx
branches/branch-3.0/src/Fl_Scroll.cxx
branches/branch-3.0/src/Fl_Scrollbar.cxx
branches/branch-3.0/src/Fl_Slider.cxx
branches/branch-3.0/src/Fl_Table.cxx
branches/branch-3.0/src/Fl_Table_Row.cxx
branches/branch-3.0/src/Fl_Tabs.cxx
branches/branch-3.0/src/Fl_Text_Display.cxx
branches/branch-3.0/src/Fl_Text_Editor.cxx
branches/branch-3.0/src/Fl_Tile.cxx
branches/branch-3.0/src/Fl_Tree.cxx
branches/branch-3.0/src/Fl_Value_Input.cxx
branches/branch-3.0/src/Fl_Value_Output.cxx
branches/branch-3.0/src/Fl_Value_Slider.cxx
branches/branch-3.0/src/fl_ask.cxx
branches/branch-3.0/src/fl_show_colormap.cxx
branches/branch-3.0/src/fl_utf8.cxx
branches/branch-3.0/src/forms_timer.cxx
branches/branch-3.0/src/glut_compatability.cxx
Modified: branches/branch-3.0/FL/fl_ask.H
===================================================================
--- branches/branch-3.0/FL/fl_ask.H 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/FL/fl_ask.H 2011-06-20 14:21:04 UTC (rev 8834)
@@ -51,21 +51,21 @@
void fl_message(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- fltk3::message(ap, fmt);
+ fltk3::va_message(ap, fmt);
va_end(ap);
}
inline void fl_alert(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- fltk3::alert(ap, fmt);
+ fltk3::va_alert(ap, fmt);
va_end(ap);
}
inline int fl_ask(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- int ret = fltk3::ask(ap, fmt);
+ int ret = fltk3::va_ask(ap, fmt);
va_end(ap);
return ret;
}
@@ -73,7 +73,7 @@
inline int fl_choice(const char *q,const char *b0,const char *b1,const char
*b2, ...) {
va_list ap;
va_start(ap, b2);
- int ret = fltk3::choice(ap, q, b0, b1, b2);
+ int ret = fltk3::va_choice(ap, q, b0, b1, b2);
va_end(ap);
return ret;
}
@@ -81,7 +81,7 @@
inline const char *fl_input(const char *label, const char *deflt = 0, ...) {
va_list ap;
va_start(ap, deflt);
- const char *ret = fltk3::input(ap, label, deflt);
+ const char *ret = fltk3::va_input(ap, label, deflt);
va_end(ap);
return ret;
}
@@ -89,7 +89,7 @@
inline const char *fl_password(const char *label, const char *deflt = 0, ...) {
va_list ap;
va_start(ap, deflt);
- const char *ret = fltk3::password(ap, label, deflt);
+ const char *ret = fltk3::va_password(ap, label, deflt);
va_end(ap);
return ret;
}
Modified: branches/branch-3.0/FL/fl_utf8.h
===================================================================
--- branches/branch-3.0/FL/fl_utf8.h 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/FL/fl_utf8.h 2011-06-20 14:21:04 UTC (rev 8834)
@@ -96,7 +96,7 @@
inline int fl_open(const char* f, int o, ...) {
va_list ap;
va_start(ap, o);
- int ret = fltk3::open(ap, f, o);
+ int ret = fltk3::va_open(ap, f, o);
va_end(ap);
return ret;
}
Modified: branches/branch-3.0/fltk3/Spinner.h
===================================================================
--- branches/branch-3.0/fltk3/Spinner.h 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/fltk3/Spinner.h 2011-06-20 14:21:04 UTC (rev 8834)
@@ -156,6 +156,7 @@
void format(const char *f) { format_ = f; update(); }
int handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
switch (event) {
case fltk3::KEYDOWN :
case fltk3::SHORTCUT :
Modified: branches/branch-3.0/fltk3/ask.h
===================================================================
--- branches/branch-3.0/fltk3/ask.h 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/fltk3/ask.h 2011-06-20 14:21:04 UTC (rev 8834)
@@ -56,20 +56,20 @@
FLTK3_EXPORT void beep(int type = BEEP_DEFAULT);
FLTK3_EXPORT void message(const char *,...) __fl_attr((__format__
(__printf__, 1, 2)));
- FLTK3_EXPORT void message(va_list, const char *);
+ FLTK3_EXPORT void va_message(va_list, const char *);
FLTK3_EXPORT void alert(const char *,...) __fl_attr((__format__ (__printf__,
1, 2)));
- FLTK3_EXPORT void alert(va_list, const char *);
+ FLTK3_EXPORT void va_alert(va_list, const char *);
// fltk3::ask() is deprecated since it uses "Yes" and "No" for the buttons,
// which does not conform to the current FLTK Human Interface Guidelines.
// Use fltk3::choice() instead with the appropriate verbs instead.
FLTK3_EXPORT int ask(const char *,...) __fl_attr((__format__ (__printf__, 1,
2), __deprecated__));
- FLTK3_EXPORT int ask(va_list, const char *);
+ FLTK3_EXPORT int va_ask(va_list, const char *);
FLTK3_EXPORT int choice(const char *q,const char *b0,const char *b1,const
char *b2,...) __fl_attr((__format__ (__printf__, 1, 5)));
- FLTK3_EXPORT int choice(va_list, const char *, const char *, const char *,
const char *);
+ FLTK3_EXPORT int va_choice(va_list, const char *, const char *, const char
*, const char *);
FLTK3_EXPORT const char *input(const char *label, const char *deflt = 0,
...) __fl_attr((__format__ (__printf__, 1, 3)));
- FLTK3_EXPORT const char *input(va_list, const char *, const char *d=0);
+ FLTK3_EXPORT const char *va_input(va_list, const char *, const char *d=0);
FLTK3_EXPORT const char *password(const char *label, const char *deflt = 0,
...) __fl_attr((__format__ (__printf__, 1, 3)));
- FLTK3_EXPORT const char *password(va_list, const char *, const char *d=0);
+ FLTK3_EXPORT const char *va_password(va_list, const char *, const char *d=0);
FLTK3_EXPORT Widget *message_icon();
extern FLTK3_EXPORT Font message_font_;
Modified: branches/branch-3.0/fltk3/utf8.h
===================================================================
--- branches/branch-3.0/fltk3/utf8.h 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/fltk3/utf8.h 2011-06-20 14:21:04 UTC (rev 8834)
@@ -228,7 +228,7 @@
/* OD: Portable UTF8 aware open wrapper */
FLTK3_EXPORT int open(const char* f, int o, ...);
- FLTK3_EXPORT int open(va_list, const char* f, int o);
+ FLTK3_EXPORT int va_open(va_list, const char* f, int o);
/* OD: Portable UTF8 aware unlink wrapper */
FLTK3_EXPORT int unlink(const char *f);
Modified: branches/branch-3.0/src/Fl.cxx
===================================================================
--- branches/branch-3.0/src/Fl.cxx 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/src/Fl.cxx 2011-06-20 14:21:04 UTC (rev 8834)
@@ -34,6 +34,7 @@
#include <fltk3/run.h>
#include <fltk3/Window.h>
#include <fltk3/Tooltip.h>
+#include <fltk3/Wrapper.h>
// recent versions of MinGW warn: "Please include winsock2.h before windows.h",
// hence we must include winsock2.h before fltk3/x.h (A.S. Dec. 2010)
@@ -1463,6 +1464,7 @@
int fltk3::Window::handle(int ev)
{
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(ev), Handle)
if (parent()) {
switch (ev) {
case fltk3::SHOW:
Modified: branches/branch-3.0/src/Fl_Adjuster.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Adjuster.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Adjuster.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -68,6 +68,7 @@
}
int fltk3::Adjuster::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
double v;
int delta;
int mx = fltk3::event_x();
Modified: branches/branch-3.0/src/Fl_Box.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Box.cxx 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/src/Fl_Box.cxx 2011-06-20 14:21:04 UTC (rev 8834)
@@ -38,6 +38,7 @@
int fltk3::Box::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
if (event == fltk3::ENTER || event == fltk3::LEAVE) return 1;
else return 0;
}
Modified: branches/branch-3.0/src/Fl_Browser_.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Browser_.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Browser_.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -699,6 +699,7 @@
\returns 1 if event was processed, 0 if not.
*/
int fltk3::Browser_::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
// NOTE:
// We use fltk3::WidgetTracker to test if the user has deleted
Modified: branches/branch-3.0/src/Fl_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Button.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Button.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -88,6 +88,7 @@
}
int fltk3::Button::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
int newval;
switch (event) {
case fltk3::ENTER: /* FALLTHROUGH */
Modified: branches/branch-3.0/src/Fl_Check_Browser.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Check_Browser.cxx 2011-06-20 13:23:05 UTC
(rev 8833)
+++ branches/branch-3.0/src/Fl_Check_Browser.cxx 2011-06-20 14:21:04 UTC
(rev 8834)
@@ -319,6 +319,7 @@
}
int fltk3::CheckBrowser::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
if (event==fltk3::PUSH)
deselect();
return fltk3::Browser_::handle(event);
Modified: branches/branch-3.0/src/Fl_Choice.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Choice.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Choice.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -28,6 +28,7 @@
#include <fltk3/run.h>
#include <fltk3/Choice.h>
#include <fltk3/draw.h>
+#include <fltk3/Wrapper.h>
#include "flstring.h"
// Emulates the Forms choice widget. This is almost exactly the same
@@ -163,6 +164,7 @@
}
int fltk3::Choice::handle(int e) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(e), Handle)
if (!menu() || !menu()->text) return 0;
const fltk3::MenuItem* v;
switch (e) {
Modified: branches/branch-3.0/src/Fl_Clock.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Clock.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Clock.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -196,6 +196,7 @@
}
int fltk3::Clock::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
switch (event) {
case fltk3::SHOW:
tick(this);
Modified: branches/branch-3.0/src/Fl_Counter.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Counter.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Counter.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -126,6 +126,7 @@
}
int fltk3::Counter::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
int i;
switch (event) {
case fltk3::RELEASE:
Modified: branches/branch-3.0/src/Fl_Dial.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Dial.cxx 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/src/Fl_Dial.cxx 2011-06-20 14:21:04 UTC (rev 8834)
@@ -30,6 +30,7 @@
#include <fltk3/draw.h>
#include <stdlib.h>
#include <fltk3/math.h>
+#include <fltk3/Wrapper.h>
// All angles are measured with 0 to the right and counter-clockwise
/**
@@ -147,6 +148,7 @@
Allow subclasses to handle event based on current position and size.
*/
int fltk3::Dial::handle(int e) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(e), Handle)
return handle(e, x(), y(), w(), h());
}
Modified: branches/branch-3.0/src/Fl_File_Input.cxx
===================================================================
--- branches/branch-3.0/src/Fl_File_Input.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_File_Input.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -194,6 +194,7 @@
int // O - TRUE if we handled event
fltk3::FileInput::handle(int event) // I - Event
{
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
// printf("handle(event = %d)\n", event);
static char inButtonBar = 0;
Modified: branches/branch-3.0/src/Fl_Group.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Group.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Group.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -148,7 +148,7 @@
}
int fltk3::Group::handle(int event) {
-
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
fltk3::Widget*const* a = array();
int i;
fltk3::Widget* o;
Modified: branches/branch-3.0/src/Fl_Help_View.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Help_View.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Help_View.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -2947,6 +2947,7 @@
int // O - 1 if we handled it, 0 otherwise
fltk3::HelpView::handle(int event) // I - Event to handle
{
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
static fltk3::HelpLink *linkp; // currently clicked link
int xx = fltk3::event_x() - x() + leftline_;
Modified: branches/branch-3.0/src/Fl_Input.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Input.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Input.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -585,6 +585,7 @@
}
int fltk3::Input::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
static int dnd_save_position, dnd_save_mark, drag_start = -1, newpos;
static fltk3::Widget *dnd_save_focus;
switch (event) {
Modified: branches/branch-3.0/src/Fl_Light_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Light_Button.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Light_Button.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -150,6 +150,7 @@
}
int fltk3::LightButton::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
switch (event) {
case fltk3::RELEASE:
if (box()) redraw();
Modified: branches/branch-3.0/src/Fl_Menu_Bar.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Menu_Bar.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Menu_Bar.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -53,6 +53,7 @@
}
int fltk3::MenuBar::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
const fltk3::MenuItem* v;
if (menu() && menu()->text) switch (event) {
case fltk3::ENTER:
Modified: branches/branch-3.0/src/Fl_Menu_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Menu_Button.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Menu_Button.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -28,6 +28,7 @@
#include <fltk3/run.h>
#include <fltk3/MenuButton.h>
#include <fltk3/draw.h>
+#include <fltk3/Wrapper.h>
static fltk3::MenuButton *pressed_menu_button_ = 0;
@@ -72,6 +73,7 @@
}
int fltk3::MenuButton::handle(int e) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(e), Handle)
if (!menu() || !menu()->text) return 0;
switch (e) {
case fltk3::ENTER: /* FALLTHROUGH */
Modified: branches/branch-3.0/src/Fl_Positioner.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Positioner.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Positioner.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -32,6 +32,7 @@
#include <fltk3/run.h>
#include <fltk3/Positioner.h>
#include <fltk3/draw.h>
+#include <fltk3/Wrapper.h>
static double flinear(double val, double smin, double smax, double gmin,
double gmax)
{
@@ -122,6 +123,7 @@
}
int fltk3::Positioner::handle(int e) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(e), Handle)
return handle(e, x(), y(), w(), h());
}
Modified: branches/branch-3.0/src/Fl_Repeat_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Repeat_Button.cxx 2011-06-20 13:23:05 UTC
(rev 8833)
+++ branches/branch-3.0/src/Fl_Repeat_Button.cxx 2011-06-20 14:21:04 UTC
(rev 8834)
@@ -38,6 +38,7 @@
}
int fltk3::RepeatButton::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
int newval;
switch (event) {
case fltk3::HIDE:
Modified: branches/branch-3.0/src/Fl_Return_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Return_Button.cxx 2011-06-20 13:23:05 UTC
(rev 8833)
+++ branches/branch-3.0/src/Fl_Return_Button.cxx 2011-06-20 14:21:04 UTC
(rev 8834)
@@ -60,6 +60,7 @@
}
int fltk3::ReturnButton::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
if (event == fltk3::SHORTCUT &&
(fltk3::event_key() == fltk3::EnterKey || fltk3::event_key() ==
fltk3::KPEnterKey)) {
simulate_key_action();
Modified: branches/branch-3.0/src/Fl_Roller.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Roller.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Roller.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -33,6 +33,7 @@
#include <math.h>
int fltk3::Roller::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
static int ipos;
int newpos = horizontal() ? fltk3::event_x() : fltk3::event_y();
switch (event) {
Modified: branches/branch-3.0/src/Fl_Scroll.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Scroll.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Scroll.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -412,6 +412,7 @@
}
int fltk3::ScrollGroup::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
fix_scrollbar_order();
return fltk3::Group::handle(event);
}
Modified: branches/branch-3.0/src/Fl_Scrollbar.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Scrollbar.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Scrollbar.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -73,6 +73,7 @@
}
int fltk3::Scrollbar::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
// area of scrollbar:
int area;
int X=x(); int Y=y(); int W=w(); int H=h();
Modified: branches/branch-3.0/src/Fl_Slider.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Slider.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Slider.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -353,6 +353,7 @@
}
int fltk3::Slider::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
if (event == fltk3::PUSH && fltk3::visible_focus()) {
fltk3::focus(this);
redraw();
Modified: branches/branch-3.0/src/Fl_Table.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Table.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Table.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -698,6 +698,7 @@
// Handle FLTK events
int fltk3::Table::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
PRINTEVENT;
int ret = fltk3::Group::handle(event); // let FLTK group handle events
first
if (ret) {
Modified: branches/branch-3.0/src/Fl_Table_Row.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Table_Row.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Table_Row.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -166,6 +166,7 @@
// Handle events
int fltk3::TableRow::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
// fprintf(stderr, "** EVENT: %s: EVENT XY=%d,%d\n",
// eventnames[event], fltk3::event_x(), fltk3::event_y()); //
debugging
Modified: branches/branch-3.0/src/Fl_Tabs.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Tabs.cxx 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/src/Fl_Tabs.cxx 2011-06-20 14:21:04 UTC (rev 8834)
@@ -159,6 +159,7 @@
}
int fltk3::TabGroup::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
fltk3::Widget *o;
int i;
Modified: branches/branch-3.0/src/Fl_Text_Display.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Text_Display.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Text_Display.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -3547,6 +3547,7 @@
\brief Event handling.
*/
int fltk3::TextDisplay::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
if (!buffer()) return 0;
// This isn't very elegant!
if (!fltk3::event_inside(text_area.x, text_area.y, text_area.w, text_area.h)
&&
Modified: branches/branch-3.0/src/Fl_Text_Editor.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Text_Editor.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Text_Editor.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -559,6 +559,7 @@
}
int fltk3::TextEditor::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
static int dndCursorPos;
if (!buffer()) return 0;
Modified: branches/branch-3.0/src/Fl_Tile.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Tile.cxx 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/src/Fl_Tile.cxx 2011-06-20 14:21:04 UTC (rev 8834)
@@ -122,6 +122,7 @@
fltk3::CURSOR_MOVE};
int fltk3::TiledGroup::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
static int sdrag;
static int sdx, sdy;
static int sx, sy;
Modified: branches/branch-3.0/src/Fl_Tree.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Tree.cxx 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/src/Fl_Tree.cxx 2011-06-20 14:21:04 UTC (rev 8834)
@@ -8,6 +8,7 @@
#include <fltk3/Tree.h>
#include <fltk3/Preferences.h>
+#include <fltk3/Wrapper.h>
//////////////////////
// fltk3::Tree.cxx
@@ -500,6 +501,7 @@
/// Standard FLTK event handler for this widget.
int fltk3::Tree::handle(int e) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(e), Handle)
int ret = 0;
// Developer note: fltk3::Browser_::handle() used for reference here..
// #include <fltk3/names.h> // for event debugging
Modified: branches/branch-3.0/src/Fl_Value_Input.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Value_Input.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Value_Input.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -70,6 +70,7 @@
}
int fltk3::ValueInput::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
double v;
int delta;
int mx = fltk3::event_x_root();
Modified: branches/branch-3.0/src/Fl_Value_Output.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Value_Output.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Value_Output.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -54,6 +54,7 @@
}
int fltk3::ValueOutput::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
if (!step()) return 0;
double v;
int delta;
Modified: branches/branch-3.0/src/Fl_Value_Slider.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Value_Slider.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/Fl_Value_Slider.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -65,6 +65,7 @@
}
int fltk3::ValueSlider::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
if (event == fltk3::PUSH && fltk3::visible_focus()) {
fltk3::focus(this);
redraw();
Modified: branches/branch-3.0/src/fl_ask.cxx
===================================================================
--- branches/branch-3.0/src/fl_ask.cxx 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/src/fl_ask.cxx 2011-06-20 14:21:04 UTC (rev 8834)
@@ -333,11 +333,11 @@
void fltk3::message(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- alert(ap, fmt);
+ va_message(ap, fmt);
va_end(ap);
}
-void fltk3::message(va_list ap, const char *fmt) {
+void fltk3::va_message(va_list ap, const char *fmt) {
if (avoidRecursion) return;
fltk3::beep(fltk3::BEEP_MESSAGE);
iconlabel = "i";
@@ -356,11 +356,11 @@
void fltk3::alert(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- alert(ap, fmt);
+ va_alert(ap, fmt);
va_end(ap);
}
-void fltk3::alert(va_list ap, const char *fmt) {
+void fltk3::va_alert(va_list ap, const char *fmt) {
if (avoidRecursion) return;
fltk3::beep(fltk3::BEEP_ERROR);
iconlabel = "!";
@@ -382,12 +382,12 @@
int fltk3::ask(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- int ret = ask(ap, fmt);
+ int ret = va_ask(ap, fmt);
va_end(ap);
return ret;
}
-int fltk3::ask(va_list ap, const char *fmt) {
+int fltk3::va_ask(va_list ap, const char *fmt) {
if (avoidRecursion) return 0;
fltk3::beep(fltk3::BEEP_QUESTION);
int r = innards(fmt, ap, fltk3::no, fltk3::yes, 0);
@@ -412,12 +412,12 @@
int fltk3::choice(const char*fmt,const char *b0,const char *b1,const char
*b2,...) {
va_list ap;
va_start(ap, b2);
- int ret = choice(ap, fmt, b0, b1, b2);
+ int ret = va_choice(ap, fmt, b0, b1, b2);
va_end(ap);
return ret;
}
-int fltk3::choice(va_list ap, const char*fmt,const char *b0,const char
*b1,const char *b2) {
+int fltk3::va_choice(va_list ap, const char*fmt,const char *b0,const char
*b1,const char *b2) {
if (avoidRecursion) return 0;
fltk3::beep(fltk3::BEEP_QUESTION);
int r = innards(fmt, ap, b0, b1, b2);
@@ -459,12 +459,12 @@
const char* fltk3::input(const char *fmt, const char *defstr, ...) {
va_list ap;
va_start(ap, defstr);
- const char *ret = input(ap, fmt, defstr);
+ const char *ret = va_input(ap, fmt, defstr);
va_end(ap);
return ret;
}
-const char* fltk3::input(va_list ap, const char *fmt, const char *defstr) {
+const char* fltk3::va_input(va_list ap, const char *fmt, const char *defstr) {
if (avoidRecursion) return 0;
fltk3::beep(fltk3::BEEP_QUESTION);
const char* r = input_innards(fmt, ap, defstr, fltk3::NORMAL_INPUT);
@@ -487,12 +487,12 @@
const char *fltk3::password(const char *fmt, const char *defstr, ...) {
va_list ap;
va_start(ap, defstr);
- const char *ret = password(ap, fmt, defstr);
+ const char *ret = va_password(ap, fmt, defstr);
va_end(ap);
return ret;
}
-const char *fltk3::password(va_list ap, const char *fmt, const char *defstr) {
+const char *fltk3::va_password(va_list ap, const char *fmt, const char
*defstr) {
if (avoidRecursion) return 0;
fltk3::beep(fltk3::BEEP_PASSWORD);
const char* r = input_innards(fmt, ap, defstr, fltk3::SECRET_INPUT);
Modified: branches/branch-3.0/src/fl_show_colormap.cxx
===================================================================
--- branches/branch-3.0/src/fl_show_colormap.cxx 2011-06-20 13:23:05 UTC
(rev 8833)
+++ branches/branch-3.0/src/fl_show_colormap.cxx 2011-06-20 14:21:04 UTC
(rev 8834)
@@ -29,6 +29,7 @@
#include <fltk3/SingleWindow.h>
#include <fltk3/draw.h>
#include <fltk3/show_colormap.h>
+#include <fltk3/Wrapper.h>
#include <config.h>
#define BOXSIZE 14
@@ -85,6 +86,7 @@
}
int ColorMenu::handle(int e) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(e), Handle)
fltk3::Color c = which;
switch (e) {
case fltk3::PUSH:
Modified: branches/branch-3.0/src/fl_utf8.cxx
===================================================================
--- branches/branch-3.0/src/fl_utf8.cxx 2011-06-20 13:23:05 UTC (rev 8833)
+++ branches/branch-3.0/src/fl_utf8.cxx 2011-06-20 14:21:04 UTC (rev 8834)
@@ -560,12 +560,12 @@
{
va_list ap;
va_start(ap, oflags);
- int ret = fltk3::open(ap, f, oflags);
+ int ret = fltk3::va_open(ap, f, oflags);
va_end(ap);
return ret;
}
-int fltk3::open(va_list ap, const char* f, int oflags) {
+int fltk3::va_open(va_list ap, const char* f, int oflags) {
int pmode;
pmode = va_arg(ap, int);
#if defined (WIN32) && !defined(__CYGWIN__)
Modified: branches/branch-3.0/src/forms_timer.cxx
===================================================================
--- branches/branch-3.0/src/forms_timer.cxx 2011-06-20 13:23:05 UTC (rev
8833)
+++ branches/branch-3.0/src/forms_timer.cxx 2011-06-20 14:21:04 UTC (rev
8834)
@@ -123,6 +123,7 @@
}
int fltk3::Timer::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
if (event == fltk3::RELEASE && delay <= 0) value(0.0);
return 0;
}
Modified: branches/branch-3.0/src/glut_compatability.cxx
===================================================================
--- branches/branch-3.0/src/glut_compatability.cxx 2011-06-20 13:23:05 UTC
(rev 8833)
+++ branches/branch-3.0/src/glut_compatability.cxx 2011-06-20 14:21:04 UTC
(rev 8834)
@@ -89,6 +89,7 @@
static void domenu(int, int, int);
int fltk3::GlutWindow::handle(int event) {
+ FLTK3_OBJECT_VCALLS_WRAPPER_INT(handle(event), Handle)
make_current();
int ex = fltk3::event_x();
int ey = fltk3::event_y();
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
