Author: matt
Date: 2011-09-18 09:44:11 -0700 (Sun, 18 Sep 2011)
New Revision: 9047
Log:
FLTK3: more F1 compatibility.
Modified:
branches/branch-3.0/include/FL/Fl_Color_Chooser.H
branches/branch-3.0/include/FL/Fl_Counter.H
branches/branch-3.0/include/FL/Fl_Dial.H
branches/branch-3.0/include/FL/Fl_Double_Window.H
branches/branch-3.0/include/FL/Fl_File_Browser.H
branches/branch-3.0/include/FL/Fl_File_Input.H
branches/branch-3.0/include/FL/Fl_Fill_Dial.H
branches/branch-3.0/include/FL/Fl_Fill_Slider.H
branches/branch-3.0/include/FL/Fl_Float_Input.H
branches/branch-3.0/include/FL/Fl_Gl_Window.H
branches/branch-3.0/include/FL/Fl_Group.H
branches/branch-3.0/include/fltk3/Counter.h
branches/branch-3.0/include/fltk3/Dial.h
branches/branch-3.0/include/fltk3/DoubleWindow.h
branches/branch-3.0/include/fltk3/FileBrowser.h
branches/branch-3.0/include/fltk3/FileInput.h
branches/branch-3.0/include/fltk3/Group.h
branches/branch-3.0/include/fltk3gl/GLWindow.h
branches/branch-3.0/src/fltk3/Counter.cxx
branches/branch-3.0/src/fltk3/Dial.cxx
branches/branch-3.0/src/fltk3/FileInput.cxx
branches/branch-3.0/src/fltk3/Group.cxx
branches/branch-3.0/src/fltk3gl/GLWindow.cxx
Modified: branches/branch-3.0/include/FL/Fl_Color_Chooser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Color_Chooser.H 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/FL/Fl_Color_Chooser.H 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -38,10 +38,17 @@
#include <FL/Fl_Value_Input.H>
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Color_Chooser, ColorChooser)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Color_Chooser, ColorChooser)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Color_Chooser : public Fl_Group {
public:
+ FLTK3_WIDGET_VCALLS(ColorChooser)
+
int mode() {
return ((fltk3::ColorChooser*)_p)->mode();
}
@@ -93,7 +100,7 @@
Fl_Color_Chooser() { /* empty */ }
Fl_Color_Chooser(int X, int Y, int W, int H, const char *L = 0) {
- _p = new fltk3::ColorChooser(X, Y, W, H, L);
+ _p = new fltk3::ColorChooser_I(X, Y, W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Counter.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Counter.H 2011-09-17 23:05:18 UTC (rev
9046)
+++ branches/branch-3.0/include/FL/Fl_Counter.H 2011-09-18 16:44:11 UTC (rev
9047)
@@ -36,15 +36,16 @@
#define FL_SIMPLE_COUNTER 1
-class FL_EXPORT Fl_Counter : public Fl_Valuator {
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Counter, Counter)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Counter, Counter)
+FLTK3_WRAPPER_INTERFACE_END()
-protected:
- FLTK3_WRAPPER_VCALLS_OBJECT(Counter, draw(), draw(), Draw)
+class FL_EXPORT Fl_Counter : public Fl_Valuator {
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Counter, handle(int event),
handle(event), Handle)
+ FLTK3_WIDGET_VCALLS(Counter)
Fl_Counter() { /* empty */ }
Modified: branches/branch-3.0/include/FL/Fl_Dial.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Dial.H 2011-09-17 23:05:18 UTC (rev
9046)
+++ branches/branch-3.0/include/FL/Fl_Dial.H 2011-09-18 16:44:11 UTC (rev
9047)
@@ -36,28 +36,34 @@
#define FL_LINE_DIAL 1
#define FL_FILL_DIAL 2
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Dial, Dial)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Dial, Dial)
+void draw(int X, int Y, int W, int H) { Dial::draw(X, Y, W, H); }
+int handle(int event, int X, int Y, int W, int H) { return Dial::handle(event,
X, Y, W, H); }
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Dial : public Fl_Valuator {
protected:
void draw(int X, int Y, int W, int H) {
- ((fltk3::Dial*)_p)->draw(X, Y, W, H);
+ ((fltk3::Dial_I*)_p)->draw(X, Y, W, H);
}
int handle(int event, int X, int Y, int W, int H) {
- return ((fltk3::Dial*)_p)->handle(event, X, Y, W, H);
+ return ((fltk3::Dial_I*)_p)->handle(event, X, Y, W, H);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(Dial, draw(), draw(), Draw)
-
public:
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Dial, handle(int event), handle(event),
Handle)
+ FLTK3_WIDGET_VCALLS(Dial)
Fl_Dial() { /* empty */ }
Fl_Dial(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::Dial(x, y, w, h, l);
+ _p = new fltk3::Dial_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Double_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Double_Window.H 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/FL/Fl_Double_Window.H 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -33,17 +33,23 @@
#include "Fl_Window.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Double_Window, DoubleWindow)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Double_Window, DoubleWindow)
+FLTK3_WRAPPER_INTERFACE_WINDOW(Fl_Double_Window, DoubleWindow)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Double_Window : public Fl_Window {
protected:
void flush(int eraseoverlay) {
- ((fltk3::DoubleWindow*)_p)->flush(eraseoverlay);
+ ((fltk3::DoubleWindow_I*)_p)->flush(eraseoverlay);
}
public:
- FLTK3_WRAPPER_VCALLS_OBJECT(DoubleWindow, show(), show(), Show)
+ FLTK3_WINDOW_VCALLS(DoubleWindow)
void show(int a, char **b) {
((fltk3::DoubleWindow*)_p)->show(a, b);
@@ -53,19 +59,15 @@
((fltk3::DoubleWindow*)_p)->flush();
}
- FLTK3_WRAPPER_VCALLS_OBJECT(DoubleWindow, resize(int x, int y, int w, int
h), resize(x, y, w, h), Resize)
-
- FLTK3_WRAPPER_VCALLS_OBJECT(DoubleWindow, hide(), hide(), Hide)
-
Fl_Double_Window() { /* empty */ }
Fl_Double_Window(int W, int H, const char *l = 0) {
- _p = new fltk3::DoubleWindow(W, H, l);
+ _p = new fltk3::DoubleWindow_I(W, H, l);
_p->wrapper(this);
}
Fl_Double_Window(int X, int Y, int W, int H, const char *l = 0) {
- _p = new fltk3::DoubleWindow(X, Y, W, H, l);
+ _p = new fltk3::DoubleWindow_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_File_Browser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_File_Browser.H 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/FL/Fl_File_Browser.H 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -35,16 +35,23 @@
#include "filename.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_File_Browser, FileBrowser)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_File_Browser, FileBrowser)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_File_Browser : public Fl_Browser {
public:
+ FLTK3_WIDGET_VCALLS(FileBrowser)
+
enum { FILES, DIRECTORIES };
Fl_File_Browser() { /* empty */ }
Fl_File_Browser(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::FileBrowser(x, y, w, h, label);
+ _p = new fltk3::FileBrowser_I(x, y, w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_File_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_File_Input.H 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/FL/Fl_File_Input.H 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -35,23 +35,24 @@
#include <FL/Fl_Input.H>
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_File_Input, FileInput)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_File_Input, FileInput)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_File_Input : public Fl_Input {
-protected:
-
- FLTK3_WRAPPER_VCALLS_OBJECT(FileInput, draw(), draw(), Draw)
-
public:
+ FLTK3_WIDGET_VCALLS(FileInput)
+
Fl_File_Input() { /* empty */ }
Fl_File_Input(int X, int Y, int W, int H, const char *L=0) {
- _p = new fltk3::FileInput(X, Y, W, H, L);
+ _p = new fltk3::FileInput_I(X, Y, W, H, L);
_p->wrapper(this);
}
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, FileInput, handle(int event),
handle(event), Handle)
-
Fl_Boxtype down_box() const {
return fltk3::_3to1_boxtype( ((fltk3::FileInput*)_p)->down_box() );
}
Modified: branches/branch-3.0/include/FL/Fl_Fill_Dial.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Fill_Dial.H 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/FL/Fl_Fill_Dial.H 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -32,14 +32,22 @@
#include <fltk3/FillDial.h>
#include "Fl_Dial.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Fill_Dial, FillDial)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Fill_Dial, FillDial)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Fill_Dial : public Fl_Dial {
public:
+ FLTK3_WIDGET_VCALLS(FillDial)
+
Fl_Fill_Dial() { /* empty */ }
Fl_Fill_Dial(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::FillDial(x, y, w, h, l);
+ _p = new fltk3::FillDial_I(x, y, w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Fill_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Fill_Slider.H 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/FL/Fl_Fill_Slider.H 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -32,10 +32,18 @@
#include <fltk3/FillSlider.h>
#include "Fl_Slider.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Fill_Slider, FillSlider)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Fill_Slider, FillSlider)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Fill_Slider : public Fl_Slider {
public:
+ FLTK3_WIDGET_VCALLS(FillSlider)
+
Fl_Fill_Slider() { /* empty */ }
Fl_Fill_Slider(int x,int y,int w,int h,const char *l=0) {
Modified: branches/branch-3.0/include/FL/Fl_Float_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Float_Input.H 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/FL/Fl_Float_Input.H 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -33,14 +33,21 @@
#include "Fl_Input.H"
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Float_Input, FloatInput)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Float_Input, FloatInput)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class Fl_Float_Input : public Fl_Input {
public:
+ FLTK3_WIDGET_VCALLS(FloatInput)
+
Fl_Float_Input() { /* empty */ }
Fl_Float_Input(int X,int Y,int W,int H,const char *l = 0) {
- _p = new fltk3::FloatInput(X, Y, W, H, l);
+ _p = new fltk3::FloatInput_I(X, Y, W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Gl_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Gl_Window.H 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/FL/Fl_Gl_Window.H 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -28,7 +28,7 @@
#ifndef Fl_Gl_Window_H
#define Fl_Gl_Window_H
-#include <fltk3/GlWindow.h>
+#include <fltk3gl/GLWindow.h>
#include "Fl_Window.H"
#ifndef GLContext
@@ -36,6 +36,12 @@
#endif
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Gl_Window, GLWindow)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Gl_Window, GLWindow)
+FLTK3_WRAPPER_INTERFACE_WINDOW(Fl_Gl_Window, GLWindow)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class Fl_Gl_Choice; // structure to hold result of glXChooseVisual
@@ -43,119 +49,109 @@
public:
+ FLTK3_WINDOW_VCALLS(GLWindow)
+
Fl_Gl_Window() { /* empty */ }
Fl_Gl_Window(int X, int Y, int W, int H, const char *l=0) {
- _p = new fltk3::GlWindow(X, Y, W, H, l);
+ _p = new fltk3::GLWindow(_IX, Y, W, H, l);
_p->wrapper(this);
}
Fl_Gl_Window(int W, int H, const char *l=0) {
- _p = new fltk3::GlWindow(W, H, l);
+ _p = new fltk3::GLWindow_I(W, H, l);
_p->wrapper(this);
}
void show(int a, char **b) {
- ((fltk3::GlWindow*)_p)->show(a, b);
+ ((fltk3::GLWindow*)_p)->show(a, b);
}
void flush() {
- ((fltk3::GlWindow*)_p)->flush();
+ ((fltk3::GLWindow*)_p)->flush();
}
- FLTK3_WRAPPER_VCALLS_OBJECT(GlWindow, resize(int x, int y, int w, int h),
resize(x, y, w, h), Resize)
-
- FLTK3_WRAPPER_VCALLS_OBJECT(GlWindow, hide(), hide(), Hide)
-
- FLTK3_WRAPPER_VCALLS_OBJECT(GlWindow, show(), show(), Show)
-
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, GlWindow, handle(int event),
handle(event), Handle)
-
char valid() const {
- return ((fltk3::GlWindow*)_p)->valid();
+ return ((fltk3::GLWindow*)_p)->valid();
}
void valid(char v) {
- ((fltk3::GlWindow*)_p)->valid(v);
+ ((fltk3::GLWindow*)_p)->valid(v);
}
void invalidate() {
- ((fltk3::GlWindow*)_p)->invalidate();
+ ((fltk3::GLWindow*)_p)->invalidate();
}
char context_valid() const {
- return ((fltk3::GlWindow*)_p)->context_valid();
+ return ((fltk3::GLWindow*)_p)->context_valid();
}
void context_valid(char v) {
- ((fltk3::GlWindow*)_p)->context_valid(v);
+ ((fltk3::GLWindow*)_p)->context_valid(v);
}
static int can_do(int m) {
- return fltk3::GlWindow::can_do(m);
+ return fltk3::GLWindow::can_do(m);
}
static int can_do(const int *m) {
- return fltk3::GlWindow::can_do(m);
+ return fltk3::GLWindow::can_do(m);
}
int can_do() {
- return ((fltk3::GlWindow*)_p)->can_do();
+ return ((fltk3::GLWindow*)_p)->can_do();
}
Fl_Mode mode() const {
- return (Fl_Mode)((fltk3::GlWindow*)_p)->mode();
+ return (Fl_Mode)((fltk3::GLWindow*)_p)->mode();
}
int mode(int a) {
- return ((fltk3::GlWindow*)_p)->mode(a);
+ return ((fltk3::GLWindow*)_p)->mode(a);
}
int mode(const int *a) {
- return ((fltk3::GlWindow*)_p)->mode(a);
+ return ((fltk3::GLWindow*)_p)->mode(a);
}
void* context() const {
- return ((fltk3::GlWindow*)_p)->context();
+ return ((fltk3::GLWindow*)_p)->context();
}
void context(void *a, int destroy_flag = 0) {
- ((fltk3::GlWindow*)_p)->context(a, destroy_flag);
+ ((fltk3::GLWindow*)_p)->context(a, destroy_flag);
}
void make_current() {
- ((fltk3::GlWindow*)_p)->make_current();
+ ((fltk3::GLWindow*)_p)->make_current();
}
void swap_buffers() {
- ((fltk3::GlWindow*)_p)->swap_buffers();
+ ((fltk3::GLWindow*)_p)->swap_buffers();
}
void ortho() {
- ((fltk3::GlWindow*)_p)->ortho();
+ ((fltk3::GLWindow*)_p)->ortho();
}
int can_do_overlay() {
- return ((fltk3::GlWindow*)_p)->can_do_overlay();
+ return ((fltk3::GLWindow*)_p)->can_do_overlay();
}
void redraw_overlay() {
- ((fltk3::GlWindow*)_p)->redraw_overlay();
+ ((fltk3::GLWindow*)_p)->redraw_overlay();
}
void hide_overlay() {
- ((fltk3::GlWindow*)_p)->hide_overlay();
+ ((fltk3::GLWindow*)_p)->hide_overlay();
}
void make_overlay_current() {
- ((fltk3::GlWindow*)_p)->make_overlay_current();
+ ((fltk3::GLWindow*)_p)->make_overlay_current();
}
virtual Fl_Gl_Window* as_gl_window() {return this;}
-
-protected:
-
- FLTK3_WRAPPER_VCALLS_OBJECT(GlWindow, draw(), draw(), Draw)
};
Modified: branches/branch-3.0/include/FL/Fl_Group.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Group.H 2011-09-17 23:05:18 UTC (rev
9046)
+++ branches/branch-3.0/include/FL/Fl_Group.H 2011-09-18 16:44:11 UTC (rev
9047)
@@ -32,49 +32,47 @@
#include <fltk3/Group.h>
#include "Fl_Widget.H"
+
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Group, Group)
+FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Group, Group)
+FLTK3_WRAPPER_INTERFACE_END()
+
+
class FL_EXPORT Fl_Group : public Fl_Widget {
protected:
Fl_Group() { /* empty */ }
- FLTK3_WRAPPER_VCALLS_OBJECT(Group, draw(), draw(), Draw)
-
void draw_child(Fl_Widget& widget) const {
- ((fltk3::Group*)_p)->draw_child(*(fltk3::_1to3_widget(&widget)));
+ ((fltk3::Group_I*)_p)->draw_child(*(fltk3::_1to3_widget(&widget)));
}
void draw_children() {
- ((fltk3::Group*)_p)->draw_children();
+ ((fltk3::Group_I*)_p)->draw_children();
}
void draw_outside_label(const Fl_Widget& widget) const {
-
((fltk3::Group*)_p)->draw_outside_label(*(fltk3::_1to3_widget((Fl_Widget*)&widget)));
+
((fltk3::Group_I*)_p)->draw_outside_label(*(fltk3::_1to3_widget((Fl_Widget*)&widget)));
}
void update_child(Fl_Widget& widget) const {
- ((fltk3::Group*)_p)->update_child(*(fltk3::_1to3_widget(&widget)));
+ ((fltk3::Group_I*)_p)->update_child(*(fltk3::_1to3_widget(&widget)));
}
int *sizes() {
- return ((fltk3::Group*)_p)->sizes();
+ return ((fltk3::Group_I*)_p)->sizes();
}
public:
+ FLTK3_WIDGET_VCALLS(Group)
+
Fl_Group(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::Group(x, y, w, h, label);
+ _p = new fltk3::Group_I(x, y, w, h, label);
_p->wrapper(this);
}
- FLTK3_WRAPPER_VCALLS_OBJECT(Group, resize(int x, int y, int w, int h),
resize(x, y, w, h), Resize)
-
- FLTK3_WRAPPER_VCALLS_OBJECT(Group, hide(), hide(), Hide)
-
- FLTK3_WRAPPER_VCALLS_OBJECT(Group, show(), show(), Show)
-
- FLTK3_WRAPPER_VCALLS_OBJECT_RET(int, Group, handle(int event),
handle(event), Handle)
-
void begin() {
((fltk3::Group*)_p)->begin();
}
Modified: branches/branch-3.0/include/fltk3/Counter.h
===================================================================
--- branches/branch-3.0/include/fltk3/Counter.h 2011-09-17 23:05:18 UTC (rev
9046)
+++ branches/branch-3.0/include/fltk3/Counter.h 2011-09-18 16:44:11 UTC (rev
9047)
@@ -36,7 +36,6 @@
#include "Valuator.h"
#include <fltk3/Wrapper.h>
-class Fl_Counter;
namespace fltk3 {
@@ -59,8 +58,6 @@
*/
class FLTK3_EXPORT Counter : public fltk3::Valuator {
- friend class ::Fl_Counter;
-
double lstep_;
uchar mouseobj;
static void repeat_callback(void *);
Modified: branches/branch-3.0/include/fltk3/Dial.h
===================================================================
--- branches/branch-3.0/include/fltk3/Dial.h 2011-09-17 23:05:18 UTC (rev
9046)
+++ branches/branch-3.0/include/fltk3/Dial.h 2011-09-18 16:44:11 UTC (rev
9047)
@@ -35,9 +35,6 @@
#include <fltk3/Wrapper.h>
-class Fl_Dial;
-
-
namespace fltk3 {
// values for type():
@@ -60,8 +57,6 @@
*/
class FLTK3_EXPORT Dial : public fltk3::Valuator {
- friend class ::Fl_Dial;
-
short a1,a2;
protected:
Modified: branches/branch-3.0/include/fltk3/DoubleWindow.h
===================================================================
--- branches/branch-3.0/include/fltk3/DoubleWindow.h 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/fltk3/DoubleWindow.h 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -33,7 +33,6 @@
#include "Window.h"
-class Fl_Double_Window;
namespace fltk3 {
@@ -52,8 +51,6 @@
*/
class FLTK3_EXPORT DoubleWindow : public fltk3::Window {
- friend class ::Fl_Double_Window;
-
protected:
void flush(int eraseoverlay);
/**
Modified: branches/branch-3.0/include/fltk3/FileBrowser.h
===================================================================
--- branches/branch-3.0/include/fltk3/FileBrowser.h 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/fltk3/FileBrowser.h 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -39,6 +39,7 @@
# include "FileIcon.h"
# include "filename.h"
+
namespace fltk3 {
//
Modified: branches/branch-3.0/include/fltk3/FileInput.h
===================================================================
--- branches/branch-3.0/include/fltk3/FileInput.h 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/fltk3/FileInput.h 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -35,7 +35,6 @@
# include <fltk3/Input.h>
#include <fltk3/Wrapper.h>
-class Fl_File_Input;
namespace fltk3 {
@@ -60,8 +59,6 @@
*/
class FLTK3_EXPORT FileInput : public fltk3::Input {
- friend class ::Fl_File_Input;
-
fltk3::Color errorcolor_;
char ok_entry_;
uchar down_box_;
Modified: branches/branch-3.0/include/fltk3/Group.h
===================================================================
--- branches/branch-3.0/include/fltk3/Group.h 2011-09-17 23:05:18 UTC (rev
9046)
+++ branches/branch-3.0/include/fltk3/Group.h 2011-09-18 16:44:11 UTC (rev
9047)
@@ -34,7 +34,6 @@
#include "Widget.h"
#include <fltk3/Wrapper.h>
-class Fl_Group;
namespace fltk3 {
@@ -46,9 +45,7 @@
or to enforce resize behavior.
*/
class FLTK3_EXPORT Group : public Widget {
-
- friend class ::Fl_Group;
-
+
fltk3::Widget** array_;
fltk3::Widget* savedfocus_;
fltk3::Widget* resizable_;
Modified: branches/branch-3.0/include/fltk3gl/GLWindow.h
===================================================================
--- branches/branch-3.0/include/fltk3gl/GLWindow.h 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/include/fltk3gl/GLWindow.h 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -40,7 +40,6 @@
typedef void* GLContext; // actually a GLXContext or HGLDC
#endif
-class Fl_Gl_Window;
namespace fltk3 {
@@ -68,8 +67,6 @@
*/
class FLTK3_EXPORT GLWindow : public fltk3::Window {
- friend class ::Fl_Gl_Window;
-
int mode_;
const int *alist;
GLChoice *g;
Modified: branches/branch-3.0/src/fltk3/Counter.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Counter.cxx 2011-09-17 23:05:18 UTC (rev
9046)
+++ branches/branch-3.0/src/fltk3/Counter.cxx 2011-09-18 16:44:11 UTC (rev
9047)
@@ -30,7 +30,6 @@
#include <fltk3/draw.h>
void fltk3::Counter::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
int i; fltk3::Boxtype boxtype[5];
fltk3::Color selcolor;
@@ -132,7 +131,6 @@
}
int fltk3::Counter::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
int i;
switch (event) {
case fltk3::RELEASE:
Modified: branches/branch-3.0/src/fltk3/Dial.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Dial.cxx 2011-09-17 23:05:18 UTC (rev
9046)
+++ branches/branch-3.0/src/fltk3/Dial.cxx 2011-09-18 16:44:11 UTC (rev
9047)
@@ -100,7 +100,6 @@
Draws dial at current position and size.
*/
void fltk3::Dial::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
draw(x(), y(), w(), h());
draw_label();
}
@@ -148,7 +147,6 @@
Allow subclasses to handle event based on current position and size.
*/
int fltk3::Dial::handle(int e) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(e), Handle)
return handle(e, x(), y(), w(), h());
}
Modified: branches/branch-3.0/src/fltk3/FileInput.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/FileInput.cxx 2011-09-17 23:05:18 UTC (rev
9046)
+++ branches/branch-3.0/src/fltk3/FileInput.cxx 2011-09-18 16:44:11 UTC (rev
9047)
@@ -171,7 +171,6 @@
Draws the file input widget
*/
void fltk3::FileInput::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
fltk3::Boxtype b = box();
if (damage() & (fltk3::DAMAGE_BAR | fltk3::DAMAGE_ALL)) draw_buttons();
// this flag keeps fltk3::Input_::drawtext from drawing a bogus box!
@@ -194,7 +193,6 @@
int // O - TRUE if we handled event
fltk3::FileInput::handle(int event) // I - Event
{
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
// printf("handle(event = %d)\n", event);
static char inButtonBar = 0;
Modified: branches/branch-3.0/src/fltk3/Group.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Group.cxx 2011-09-17 23:05:18 UTC (rev
9046)
+++ branches/branch-3.0/src/fltk3/Group.cxx 2011-09-18 16:44:11 UTC (rev
9047)
@@ -148,7 +148,6 @@
}
int fltk3::Group::handle(int event) {
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
fltk3::Widget*const* a = array();
int i;
fltk3::Widget* o;
@@ -739,7 +738,6 @@
}
void fltk3::Group::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
if (damage() & ~fltk3::DAMAGE_CHILD) { // redraw the entire thing:
draw_box();
draw_label();
Modified: branches/branch-3.0/src/fltk3gl/GLWindow.cxx
===================================================================
--- branches/branch-3.0/src/fltk3gl/GLWindow.cxx 2011-09-17 23:05:18 UTC
(rev 9046)
+++ branches/branch-3.0/src/fltk3gl/GLWindow.cxx 2011-09-18 16:44:11 UTC
(rev 9047)
@@ -514,7 +514,6 @@
be the same or different between the overlay and main window.
*/
void fltk3::GLWindow::draw_overlay() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw_overlay(), DrawOverlay)
}
#endif
@@ -535,7 +534,6 @@
buffers are swapped after this function is completed.
*/
void fltk3::GLWindow::draw() {
- FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
fltk3::fatal("fltk3::GLWindow::draw() *must* be overriden. Please refer to
the documentation.");
}
@@ -545,7 +543,6 @@
*/
int fltk3::GLWindow::handle(int event)
{
- FLTK3_OBJECT_VCALLS_WRAPPER_RET(int, handle(event), Handle)
return Window::handle(event);
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
