summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2012-07-24 04:37:22 +0000
committerMatthias Melcher <fltk@matthiasm.com>2012-07-24 04:37:22 +0000
commit398acd9c2a73d0d5c69bb51f7f3497e229fb367c (patch)
tree1c7466ccccbe5dd68b23eb459ba4e045491df7fd /FL
parente607c90877e3d2dbf352d0f794c6c81c6d264b4e (diff)
STR 2705: moved all inline constructors (that I could find) from header files into source files. Even though this breaks downward compatibility, it does make dynamic linking possible for all classes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9637 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl_Box.H7
-rw-r--r--FL/Fl_Double_Window.H17
-rw-r--r--FL/Fl_Fill_Dial.H5
-rw-r--r--FL/Fl_Fill_Slider.H5
-rw-r--r--FL/Fl_Float_Input.H5
-rw-r--r--FL/Fl_Hold_Browser.H5
-rw-r--r--FL/Fl_Hor_Fill_Slider.H3
-rw-r--r--FL/Fl_Hor_Nice_Slider.H3
-rw-r--r--FL/Fl_Hor_Slider.H6
-rw-r--r--FL/Fl_Hor_Value_Slider.H3
-rw-r--r--FL/Fl_Input_Choice.H15
-rw-r--r--FL/Fl_Int_Input.H6
-rw-r--r--FL/Fl_Line_Dial.H3
-rw-r--r--FL/Fl_Menu_Bar.H3
-rw-r--r--FL/Fl_Menu_Window.H6
-rw-r--r--FL/Fl_Multi_Browser.H5
-rw-r--r--FL/Fl_Multiline_Input.H5
-rw-r--r--FL/Fl_Multiline_Output.H5
-rw-r--r--FL/Fl_Nice_Slider.H3
-rw-r--r--FL/Fl_Output.H5
-rw-r--r--FL/Fl_Overlay_Window.H6
-rw-r--r--FL/Fl_Radio_Button.H3
-rw-r--r--FL/Fl_Radio_Light_Button.H3
-rw-r--r--FL/Fl_Radio_Round_Button.H3
-rw-r--r--FL/Fl_Repeat_Button.H4
-rw-r--r--FL/Fl_Return_Button.H3
-rw-r--r--FL/Fl_Round_Clock.H5
-rw-r--r--FL/Fl_Secret_Input.H5
-rw-r--r--FL/Fl_Select_Browser.H5
-rw-r--r--FL/Fl_Simple_Counter.H3
-rw-r--r--FL/Fl_Single_Window.H8
-rw-r--r--FL/Fl_Spinner.H26
-rw-r--r--FL/Fl_Sys_Menu_Bar.H6
-rw-r--r--FL/Fl_Tile.H2
-rw-r--r--FL/Fl_Toggle_Button.H3
35 files changed, 44 insertions, 156 deletions
diff --git a/FL/Fl_Box.H b/FL/Fl_Box.H
index f96b99b71..92ff301cc 100644
--- a/FL/Fl_Box.H
+++ b/FL/Fl_Box.H
@@ -44,11 +44,10 @@ public:
type.
<P>The destructor removes the box.
*/
- Fl_Box(int X, int Y, int W, int H, const char *l=0)
- : Fl_Widget(X,Y,W,H,l) {}
+ Fl_Box(int X, int Y, int W, int H, const char *l=0);
+
/** See Fl_Box::Fl_Box(int x, int y, int w, int h, const char * = 0) */
- Fl_Box(Fl_Boxtype b, int X, int Y, int W, int H, const char *l)
- : Fl_Widget(X,Y,W,H,l) {box(b);}
+ Fl_Box(Fl_Boxtype b, int X, int Y, int W, int H, const char *l);
virtual int handle(int);
};
diff --git a/FL/Fl_Double_Window.H b/FL/Fl_Double_Window.H
index 3ed38e876..e4ef883f5 100644
--- a/FL/Fl_Double_Window.H
+++ b/FL/Fl_Double_Window.H
@@ -52,17 +52,18 @@ public:
void resize(int,int,int,int);
void hide();
~Fl_Double_Window();
+
/**
- Creates a new Fl_Double_Window widget using the given
- position, size, and label (title) string.
+ Creates a new Fl_Double_Window widget using the given
+ position, size, and label (title) string.
*/
- Fl_Double_Window(int W, int H, const char *l = 0)
- : Fl_Window(W,H,l), force_doublebuffering_(0) { type(FL_DOUBLE_WINDOW); }
- /**
- See Fl_Double_Window::Fl_Double_Window(int w, int h, const char *label = 0)
+ Fl_Double_Window(int W, int H, const char *l = 0);
+
+ /**
+ See Fl_Double_Window::Fl_Double_Window(int w, int h, const char *label = 0)
*/
- Fl_Double_Window(int X, int Y, int W, int H, const char *l = 0)
- : Fl_Window(X,Y,W,H,l), force_doublebuffering_(0) { type(FL_DOUBLE_WINDOW); }
+ Fl_Double_Window(int X, int Y, int W, int H, const char *l = 0);
+
};
#endif
diff --git a/FL/Fl_Fill_Dial.H b/FL/Fl_Fill_Dial.H
index 95b8a3142..dbf2df05c 100644
--- a/FL/Fl_Fill_Dial.H
+++ b/FL/Fl_Fill_Dial.H
@@ -27,9 +27,8 @@
/** Draws a dial with a filled arc */
class FL_EXPORT Fl_Fill_Dial : public Fl_Dial {
public:
- /** Creates a filled dial, also setting its type to FL_FILL_DIAL. */
- Fl_Fill_Dial(int X,int Y,int W,int H, const char *L = 0)
- : Fl_Dial(X,Y,W,H,L) {type(FL_FILL_DIAL);}
+ /** Creates a filled dial, also setting its type to FL_FILL_DIAL. */
+ Fl_Fill_Dial(int X,int Y,int W,int H, const char *L);
};
#endif
diff --git a/FL/Fl_Fill_Slider.H b/FL/Fl_Fill_Slider.H
index 61841f07b..299c38e61 100644
--- a/FL/Fl_Fill_Slider.H
+++ b/FL/Fl_Fill_Slider.H
@@ -26,9 +26,8 @@
/** Widget that draws a filled horizontal slider, useful as a progress or value meter*/
class FL_EXPORT Fl_Fill_Slider : public Fl_Slider {
public:
- /** Creates the slider from its position,size and optional title. */
- Fl_Fill_Slider(int X,int Y,int W,int H,const char *L=0)
- : Fl_Slider(X,Y,W,H,L) {type(FL_VERT_FILL_SLIDER);}
+ /** Creates the slider from its position,size and optional title. */
+ Fl_Fill_Slider(int X,int Y,int W,int H,const char *L=0);
};
#endif
diff --git a/FL/Fl_Float_Input.H b/FL/Fl_Float_Input.H
index f5341161e..f60d4a284 100644
--- a/FL/Fl_Float_Input.H
+++ b/FL/Fl_Float_Input.H
@@ -37,12 +37,7 @@ public:
Inherited destructor destroys the widget and any value associated with it.
*/
-#if defined(FL_DLL) // implementation in src/Fl_Input.cxx
Fl_Float_Input(int X,int Y,int W,int H,const char *l = 0);
-#else
- Fl_Float_Input(int X,int Y,int W,int H,const char *l = 0)
- : Fl_Input(X,Y,W,H,l) {type(FL_FLOAT_INPUT);}
-#endif
};
#endif
diff --git a/FL/Fl_Hold_Browser.H b/FL/Fl_Hold_Browser.H
index 0bf51a40e..7922b6cad 100644
--- a/FL/Fl_Hold_Browser.H
+++ b/FL/Fl_Hold_Browser.H
@@ -41,12 +41,7 @@ public:
The constructor specializes Fl_Browser() by setting the type to FL_HOLD_BROWSER.
The destructor destroys the widget and frees all memory that has been allocated.
*/
-#if defined(FL_DLL) // implementation in src/Fl_Browser.cxx
Fl_Hold_Browser(int X,int Y,int W,int H,const char *L=0);
-#else
- Fl_Hold_Browser(int X,int Y,int W,int H,const char *L=0)
- : Fl_Browser(X,Y,W,H,L) {type(FL_HOLD_BROWSER);}
-#endif
};
#endif
diff --git a/FL/Fl_Hor_Fill_Slider.H b/FL/Fl_Hor_Fill_Slider.H
index 323b53c59..934bc059c 100644
--- a/FL/Fl_Hor_Fill_Slider.H
+++ b/FL/Fl_Hor_Fill_Slider.H
@@ -26,8 +26,7 @@
class FL_EXPORT Fl_Hor_Fill_Slider : public Fl_Slider {
public:
- Fl_Hor_Fill_Slider(int X,int Y,int W,int H,const char *L=0)
- : Fl_Slider(X,Y,W,H,L) {type(FL_HOR_FILL_SLIDER);}
+ Fl_Hor_Fill_Slider(int X,int Y,int W,int H,const char *L=0);
};
#endif
diff --git a/FL/Fl_Hor_Nice_Slider.H b/FL/Fl_Hor_Nice_Slider.H
index 64f810a54..c862f8bf1 100644
--- a/FL/Fl_Hor_Nice_Slider.H
+++ b/FL/Fl_Hor_Nice_Slider.H
@@ -26,8 +26,7 @@
class FL_EXPORT Fl_Hor_Nice_Slider : public Fl_Slider {
public:
- Fl_Hor_Nice_Slider(int X,int Y,int W,int H,const char *L=0)
- : Fl_Slider(X,Y,W,H,L) {type(FL_HOR_NICE_SLIDER); box(FL_FLAT_BOX);}
+ Fl_Hor_Nice_Slider(int X,int Y,int W,int H,const char *L=0);
};
#endif
diff --git a/FL/Fl_Hor_Slider.H b/FL/Fl_Hor_Slider.H
index 26c30e258..415cdb763 100644
--- a/FL/Fl_Hor_Slider.H
+++ b/FL/Fl_Hor_Slider.H
@@ -35,13 +35,7 @@ public:
Creates a new Fl_Hor_Slider widget using the given position,
size, and label string.
*/
-
-#if defined(FL_DLL) // implementation in src/Fl_Slider.cxx
Fl_Hor_Slider(int X,int Y,int W,int H,const char *l=0);
-#else
- Fl_Hor_Slider(int X,int Y,int W,int H,const char *l=0)
- : Fl_Slider(X,Y,W,H,l) { type(FL_HOR_SLIDER); }
-#endif
};
#endif
diff --git a/FL/Fl_Hor_Value_Slider.H b/FL/Fl_Hor_Value_Slider.H
index 668f7cf48..183a1cfcb 100644
--- a/FL/Fl_Hor_Value_Slider.H
+++ b/FL/Fl_Hor_Value_Slider.H
@@ -26,8 +26,7 @@
class FL_EXPORT Fl_Hor_Value_Slider : public Fl_Value_Slider {
public:
- Fl_Hor_Value_Slider(int X,int Y,int W,int H,const char *l=0)
- : Fl_Value_Slider(X,Y,W,H,l) {type(FL_HOR_SLIDER);}
+ Fl_Hor_Value_Slider(int X,int Y,int W,int H,const char *l=0);
};
#endif
diff --git a/FL/Fl_Input_Choice.H b/FL/Fl_Input_Choice.H
index d7fc01feb..d5e8bc569 100644
--- a/FL/Fl_Input_Choice.H
+++ b/FL/Fl_Input_Choice.H
@@ -131,20 +131,7 @@ public:
and label string.
Inherited destructor destroys the widget and any values associated with it.
*/
- Fl_Input_Choice (int X,int Y,int W,int H,const char*L=0) : Fl_Group(X,Y,W,H,L) {
- Fl_Group::box(FL_DOWN_BOX);
- align(FL_ALIGN_LEFT); // default like Fl_Input
- inp_ = new Fl_Input(inp_x(), inp_y(),
- inp_w(), inp_h());
- inp_->callback(inp_cb, (void*)this);
- inp_->box(FL_FLAT_BOX); // cosmetic
- inp_->when(FL_WHEN_CHANGED|FL_WHEN_NOT_CHANGED);
- menu_ = new InputMenuButton(menu_x(), menu_y(),
- menu_w(), menu_h());
- menu_->callback(menu_cb, (void*)this);
- menu_->box(FL_FLAT_BOX); // cosmetic
- end();
- }
+ Fl_Input_Choice(int X,int Y,int W,int H,const char*L=0);
/// Adds an item to the menu.
/// You can access the more complex Fl_Menu_Button::add() methods
diff --git a/FL/Fl_Int_Input.H b/FL/Fl_Int_Input.H
index f1a421b27..cb6e8141e 100644
--- a/FL/Fl_Int_Input.H
+++ b/FL/Fl_Int_Input.H
@@ -36,13 +36,7 @@ public:
Inherited destructor destroys the widget and any value associated with it.
*/
-
-#if defined(FL_DLL) // implementation in src/Fl_Input.cxx
Fl_Int_Input(int X,int Y,int W,int H,const char *l = 0);
-#else
- Fl_Int_Input(int X,int Y,int W,int H,const char *l = 0)
- : Fl_Input(X,Y,W,H,l) {type(FL_INT_INPUT);}
-#endif
};
#endif
diff --git a/FL/Fl_Line_Dial.H b/FL/Fl_Line_Dial.H
index 10aace4f0..150a05df5 100644
--- a/FL/Fl_Line_Dial.H
+++ b/FL/Fl_Line_Dial.H
@@ -26,8 +26,7 @@
class FL_EXPORT Fl_Line_Dial : public Fl_Dial {
public:
- Fl_Line_Dial(int X,int Y,int W,int H, const char *L = 0)
- : Fl_Dial(X,Y,W,H,L) {type(FL_LINE_DIAL);}
+ Fl_Line_Dial(int X,int Y,int W,int H, const char *L = 0);
};
#endif
diff --git a/FL/Fl_Menu_Bar.H b/FL/Fl_Menu_Bar.H
index 1f5a350c6..bc7f98b8b 100644
--- a/FL/Fl_Menu_Bar.H
+++ b/FL/Fl_Menu_Bar.H
@@ -69,8 +69,7 @@ public:
<P>The destructor removes the Fl_Menu_Bar widget and all of its
menu items.
*/
- Fl_Menu_Bar(int X, int Y, int W, int H,const char *l=0)
- : Fl_Menu_(X,Y,W,H,l) {}
+ Fl_Menu_Bar(int X, int Y, int W, int H,const char *l=0);
};
#endif
diff --git a/FL/Fl_Menu_Window.H b/FL/Fl_Menu_Window.H
index 952e5c297..90e6426b9 100644
--- a/FL/Fl_Menu_Window.H
+++ b/FL/Fl_Menu_Window.H
@@ -45,11 +45,9 @@ public:
void clear_overlay() {set_flag(NO_OVERLAY);}
~Fl_Menu_Window();
/** Creates a new Fl_Menu_Window widget using the given size, and label string. */
- Fl_Menu_Window(int W, int H, const char *l = 0)
- : Fl_Single_Window(W,H,l) { image(0); }
+ Fl_Menu_Window(int W, int H, const char *l = 0);
/** Creates a new Fl_Menu_Window widget using the given position, size, and label string. */
- Fl_Menu_Window(int X, int Y, int W, int H, const char *l = 0)
- : Fl_Single_Window(X,Y,W,H,l) { image(0); }
+ Fl_Menu_Window(int X, int Y, int W, int H, const char *l = 0);
};
#endif
diff --git a/FL/Fl_Multi_Browser.H b/FL/Fl_Multi_Browser.H
index 855e37102..0f33a3d6f 100644
--- a/FL/Fl_Multi_Browser.H
+++ b/FL/Fl_Multi_Browser.H
@@ -42,12 +42,7 @@ public:
The constructor specializes Fl_Browser() by setting the type to FL_MULTI_BROWSER.
The destructor destroys the widget and frees all memory that has been allocated.
*/
-#if defined(FL_DLL) // implementation in src/Fl_Browser.cxx
Fl_Multi_Browser(int X,int Y,int W,int H,const char *L=0);
-#else
- Fl_Multi_Browser(int X,int Y,int W,int H,const char *L=0)
- : Fl_Browser(X,Y,W,H,L) {type(FL_MULTI_BROWSER);}
-#endif
};
#endif
diff --git a/FL/Fl_Multiline_Input.H b/FL/Fl_Multiline_Input.H
index 58cef7759..69cbac3de 100644
--- a/FL/Fl_Multiline_Input.H
+++ b/FL/Fl_Multiline_Input.H
@@ -50,12 +50,7 @@ public:
Inherited destructor destroys the widget and any value associated with it.
*/
-#if defined(FL_DLL) // implementation in src/Fl_Input.cxx
Fl_Multiline_Input(int X,int Y,int W,int H,const char *l = 0);
-#else
- Fl_Multiline_Input(int X,int Y,int W,int H,const char *l = 0)
- : Fl_Input(X,Y,W,H,l) {type(FL_MULTILINE_INPUT);}
-#endif
};
#endif
diff --git a/FL/Fl_Multiline_Output.H b/FL/Fl_Multiline_Output.H
index 8d560e9dc..d5ffdc5d6 100644
--- a/FL/Fl_Multiline_Output.H
+++ b/FL/Fl_Multiline_Output.H
@@ -46,12 +46,7 @@ public:
Inherited destructor destroys the widget and any value associated with it.
*/
-#if defined(FL_DLL) // implementation in src/Fl_Input.cxx
Fl_Multiline_Output(int X,int Y,int W,int H,const char *l = 0);
-#else
- Fl_Multiline_Output(int X,int Y,int W,int H,const char *l = 0)
- : Fl_Output(X,Y,W,H,l) {type(FL_MULTILINE_OUTPUT);}
-#endif
};
#endif
diff --git a/FL/Fl_Nice_Slider.H b/FL/Fl_Nice_Slider.H
index e7514c239..febeb940a 100644
--- a/FL/Fl_Nice_Slider.H
+++ b/FL/Fl_Nice_Slider.H
@@ -26,8 +26,7 @@
class FL_EXPORT Fl_Nice_Slider : public Fl_Slider {
public:
- Fl_Nice_Slider(int X,int Y,int W,int H,const char *L=0)
- : Fl_Slider(X,Y,W,H,L) {type(FL_VERT_NICE_SLIDER); box(FL_FLAT_BOX);}
+ Fl_Nice_Slider(int X,int Y,int W,int H,const char *L=0);
};
#endif
diff --git a/FL/Fl_Output.H b/FL/Fl_Output.H
index 93cd564d6..5d1827164 100644
--- a/FL/Fl_Output.H
+++ b/FL/Fl_Output.H
@@ -53,12 +53,7 @@ public:
Inherited destructor destroys the widget and any value associated with it.
*/
-#if defined(FL_DLL) // implementation in src/Fl_Input.cxx
Fl_Output(int X,int Y,int W,int H, const char *l = 0);
-#else
- Fl_Output(int X,int Y,int W,int H, const char *l = 0)
- : Fl_Input(X, Y, W, H, l) {type(FL_NORMAL_OUTPUT);}
-#endif
};
#endif
diff --git a/FL/Fl_Overlay_Window.H b/FL/Fl_Overlay_Window.H
index eb8689c48..de45b6c17 100644
--- a/FL/Fl_Overlay_Window.H
+++ b/FL/Fl_Overlay_Window.H
@@ -62,16 +62,14 @@ protected:
/**
See Fl_Overlay_Window::Fl_Overlay_Window(int X, int Y, int W, int H, const char *l=0)
*/
- Fl_Overlay_Window(int W, int H, const char *l=0)
- : Fl_Double_Window(W,H,l) {overlay_ = 0; force_doublebuffering_=1; image(0); }
+ Fl_Overlay_Window(int W, int H, const char *l=0);
/**
Creates a new Fl_Overlay_Window widget using the given
position, size, and label (title) string. If the
positions (x,y) are not given, then the window manager
will choose them.
*/
- Fl_Overlay_Window(int X, int Y, int W, int H, const char *l=0)
- : Fl_Double_Window(X,Y,W,H,l) {overlay_ = 0; force_doublebuffering_=1; image(0); }
+ Fl_Overlay_Window(int X, int Y, int W, int H, const char *l=0);
public:
void show(int a, char **b) {Fl_Double_Window::show(a,b);}
};
diff --git a/FL/Fl_Radio_Button.H b/FL/Fl_Radio_Button.H
index 7238877a8..99d0922ca 100644
--- a/FL/Fl_Radio_Button.H
+++ b/FL/Fl_Radio_Button.H
@@ -26,8 +26,7 @@
class FL_EXPORT Fl_Radio_Button : public Fl_Button {
public:
- Fl_Radio_Button(int X,int Y,int W,int H,const char *L=0)
- : Fl_Button(X, Y, W, H, L) {type(FL_RADIO_BUTTON);}
+ Fl_Radio_Button(int X,int Y,int W,int H,const char *L=0);
};
#endif
diff --git a/FL/Fl_Radio_Light_Button.H b/FL/Fl_Radio_Light_Button.H
index 8e48d5c70..352dccfda 100644
--- a/FL/Fl_Radio_Light_Button.H
+++ b/FL/Fl_Radio_Light_Button.H
@@ -26,8 +26,7 @@
class FL_EXPORT Fl_Radio_Light_Button : public Fl_Light_Button {
public:
- Fl_Radio_Light_Button(int X,int Y,int W,int H,const char *l=0)
- : Fl_Light_Button(X,Y,W,H,l) {type(FL_RADIO_BUTTON);}
+ Fl_Radio_Light_Button(int X,int Y,int W,int H,const char *l=0);
};
#endif
diff --git a/FL/Fl_Radio_Round_Button.H b/FL/Fl_Radio_Round_Button.H
index f1c47b187..a53673827 100644
--- a/FL/Fl_Radio_Round_Button.H
+++ b/FL/Fl_Radio_Round_Button.H
@@ -26,8 +26,7 @@
class FL_EXPORT Fl_Radio_Round_Button : public Fl_Round_Button {
public:
- Fl_Radio_Round_Button(int X,int Y,int W,int H,const char *L=0)
- : Fl_Round_Button(X,Y,W,H,L) {type(FL_RADIO_BUTTON);}
+ Fl_Radio_Round_Button(int X,int Y,int W,int H,const char *L=0);
};
#endif
diff --git a/FL/Fl_Repeat_Button.H b/FL/Fl_Repeat_Button.H
index 235b661c1..f22df8899 100644
--- a/FL/Fl_Repeat_Button.H
+++ b/FL/Fl_Repeat_Button.H
@@ -39,8 +39,8 @@ public:
position, size, and label string. The default boxtype is FL_UP_BOX.
Deletes the button.
*/
- Fl_Repeat_Button(int X,int Y,int W,int H,const char *l=0)
- : Fl_Button(X,Y,W,H,l) {}
+ Fl_Repeat_Button(int X,int Y,int W,int H,const char *l=0);
+
void deactivate() {
Fl::remove_timeout(repeat_callback,this);
Fl_Button::deactivate();
diff --git a/FL/Fl_Return_Button.H b/FL/Fl_Return_Button.H
index d90ea9a66..54b4ab5ef 100644
--- a/FL/Fl_Return_Button.H
+++ b/FL/Fl_Return_Button.H
@@ -40,8 +40,7 @@ public:
position, size, and label string. The default boxtype is FL_UP_BOX.
<P> The inherited destructor deletes the button.
*/
- Fl_Return_Button(int X, int Y, int W, int H,const char *l=0)
- : Fl_Button(X,Y,W,H,l) {}
+ Fl_Return_Button(int X, int Y, int W, int H,const char *l=0);
};
#endif
diff --git a/FL/Fl_Round_Clock.H b/FL/Fl_Round_Clock.H
index ceb86d48d..3ae748256 100644
--- a/FL/Fl_Round_Clock.H
+++ b/FL/Fl_Round_Clock.H
@@ -27,9 +27,8 @@
/** A clock widget of type FL_ROUND_CLOCK. Has no box. */
class FL_EXPORT Fl_Round_Clock : public Fl_Clock {
public:
- /** Creates the clock widget, setting his type and box. */
- Fl_Round_Clock(int X,int Y,int W,int H, const char *L = 0)
- : Fl_Clock(X, Y, W, H, L) {type(FL_ROUND_CLOCK); box(FL_NO_BOX);}
+ /** Creates the clock widget, setting his type and box. */
+ Fl_Round_Clock(int X,int Y,int W,int H, const char *L = 0);
};
#endif
diff --git a/FL/Fl_Secret_Input.H b/FL/Fl_Secret_Input.H
index ae9e854fa..3df6d6be7 100644
--- a/FL/Fl_Secret_Input.H
+++ b/FL/Fl_Secret_Input.H
@@ -40,12 +40,7 @@ public:
Inherited destructor destroys the widget and any value associated with it.
*/
-#if defined(FL_DLL) // implementation in src/Fl_Input.cxx
Fl_Secret_Input(int X,int Y,int W,int H,const char *l = 0);
-#else
- Fl_Secret_Input(int X,int Y,int W,int H,const char *l = 0)
- : Fl_Input(X,Y,W,H,l) {type(FL_SECRET_INPUT);}
-#endif
};
#endif
diff --git a/FL/Fl_Select_Browser.H b/FL/Fl_Select_Browser.H
index ea29534a4..123e24cf8 100644
--- a/FL/Fl_Select_Browser.H
+++ b/FL/Fl_Select_Browser.H
@@ -40,12 +40,7 @@ public:
The constructor specializes Fl_Browser() by setting the type to FL_SELECT_BROWSER.
The destructor destroys the widget and frees all memory that has been allocated.
*/
-#if defined(FL_DLL) // implementation in src/Fl_Browser.cxx
Fl_Select_Browser(int X,int Y,int W,int H,const char *L=0);
-#else
- Fl_Select_Browser(int X,int Y,int W,int H,const char *L=0)
- : Fl_Browser(X,Y,W,H,L) {type(FL_SELECT_BROWSER);}
-#endif
};
#endif
diff --git a/FL/Fl_Simple_Counter.H b/FL/Fl_Simple_Counter.H
index 3e80fefbd..8edc907af 100644
--- a/FL/Fl_Simple_Counter.H
+++ b/FL/Fl_Simple_Counter.H
@@ -30,8 +30,7 @@
*/
class FL_EXPORT Fl_Simple_Counter : public Fl_Counter {
public:
- Fl_Simple_Counter(int X,int Y,int W,int H, const char *L = 0)
- : Fl_Counter(X,Y,W,H,L) {type(FL_SIMPLE_COUNTER);}
+ Fl_Simple_Counter(int X,int Y,int W,int H, const char *L = 0);
};
#endif
diff --git a/FL/Fl_Single_Window.H b/FL/Fl_Single_Window.H
index 6002d8cba..dda14975e 100644
--- a/FL/Fl_Single_Window.H
+++ b/FL/Fl_Single_Window.H
@@ -40,14 +40,14 @@ public:
Creates a new Fl_Single_Window widget using the given
size, and label (title) string.
*/
- Fl_Single_Window(int W, int H, const char *l=0)
- : Fl_Window(W,H,l) {}
+ Fl_Single_Window(int W, int H, const char *l=0);
+
/**
Creates a new Fl_Single_Window widget using the given
position, size, and label (title) string.
*/
- Fl_Single_Window(int X, int Y, int W, int H, const char *l=0)
- : Fl_Window(X,Y,W,H,l) {}
+ Fl_Single_Window(int X, int Y, int W, int H, const char *l=0);
+
int make_current();
};
diff --git a/FL/Fl_Spinner.H b/FL/Fl_Spinner.H
index 90706d6b1..2262c924a 100644
--- a/FL/Fl_Spinner.H
+++ b/FL/Fl_Spinner.H
@@ -121,31 +121,7 @@ private:
and label string.
<P>Inherited destructor Destroys the widget and any value associated with it.
*/
- Fl_Spinner(int X, int Y, int W, int H, const char *L = 0)
- : Fl_Group(X, Y, W, H, L),
- input_(X, Y, W - H / 2 - 2, H),
- up_button_(X + W - H / 2 - 2, Y, H / 2 + 2, H / 2, "@-42<"),
- down_button_(X + W - H / 2 - 2, Y + H - H / 2,
- H / 2 + 2, H / 2, "@-42>") {
- end();
-
- value_ = 1.0;
- minimum_ = 1.0;
- maximum_ = 100.0;
- step_ = 1.0;
- format_ = "%g";
-
- align(FL_ALIGN_LEFT);
-
- input_.value("1");
- input_.type(FL_INT_INPUT);
- input_.when(FL_WHEN_ENTER_KEY | FL_WHEN_RELEASE);
- input_.callback((Fl_Callback *)sb_cb, this);
-
- up_button_.callback((Fl_Callback *)sb_cb, this);
-
- down_button_.callback((Fl_Callback *)sb_cb, this);
- }
+ Fl_Spinner(int X, int Y, int W, int H, const char *L = 0);
/** Sets or returns the format string for the value. */
const char *format() { return (format_); }
diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H
index 988f73bef..e1dd7bb52 100644
--- a/FL/Fl_Sys_Menu_Bar.H
+++ b/FL/Fl_Sys_Menu_Bar.H
@@ -41,11 +41,7 @@ public:
*
* On Mac OS X, all arguments are unused. On other platforms they are used as by Fl_Menu_Bar::Fl_Menu_Bar().
*/
- Fl_Sys_Menu_Bar(int x,int y,int w,int h,const char *l=0)
- : Fl_Menu_Bar(x,y,w,h,l) {
- deactivate(); // don't let the old area take events
- fl_sys_menu_bar = this;
- }
+ Fl_Sys_Menu_Bar(int x,int y,int w,int h,const char *l=0);
const Fl_Menu_Item *menu() const {return Fl_Menu_::menu();}
void menu(const Fl_Menu_Item *m);
int add(const char* label, int shortcut, Fl_Callback*, void *user_data=0, int flags=0);
diff --git a/FL/Fl_Tile.H b/FL/Fl_Tile.H
index c83dfad97..2792c4150 100644
--- a/FL/Fl_Tile.H
+++ b/FL/Fl_Tile.H
@@ -81,7 +81,7 @@ public:
variables, but you must declare the Fl_Tile <I>first</I>, so
that it is destroyed last.
*/
- Fl_Tile(int X,int Y,int W,int H,const char*l=0) : Fl_Group(X,Y,W,H,l) {}
+ Fl_Tile(int X,int Y,int W,int H,const char*l=0);
void resize(int, int, int, int);
void position(int, int, int, int);
};
diff --git a/FL/Fl_Toggle_Button.H b/FL/Fl_Toggle_Button.H
index 41d612821..008565563 100644
--- a/FL/Fl_Toggle_Button.H
+++ b/FL/Fl_Toggle_Button.H
@@ -40,8 +40,7 @@ public:
position, size, and label string.
<P>The inherited destructor deletes the toggle button.
*/
- Fl_Toggle_Button(int X,int Y,int W,int H,const char *l=0)
- : Fl_Button(X,Y,W,H,l) {type(FL_TOGGLE_BUTTON);}
+ Fl_Toggle_Button(int X,int Y,int W,int H,const char *l=0);
};
#endif