diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2012-07-24 04:37:22 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2012-07-24 04:37:22 +0000 |
| commit | 398acd9c2a73d0d5c69bb51f7f3497e229fb367c (patch) | |
| tree | 1c7466ccccbe5dd68b23eb459ba4e045491df7fd /src/Fl_Input.cxx | |
| parent | e607c90877e3d2dbf352d0f794c6c81c6d264b4e (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 'src/Fl_Input.cxx')
| -rw-r--r-- | src/Fl_Input.cxx | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx index afd91e74c..92fb64b05 100644 --- a/src/Fl_Input.cxx +++ b/src/Fl_Input.cxx @@ -31,14 +31,12 @@ #include <FL/fl_ask.H> #include "flstring.h" -#if defined(FL_DLL) // really needed for c'tors for MS VC++ only #include <FL/Fl_Float_Input.H> #include <FL/Fl_Int_Input.H> #include <FL/Fl_Multiline_Input.H> #include <FL/Fl_Output.H> #include <FL/Fl_Multiline_Output.H> #include <FL/Fl_Secret_Input.H> -#endif #ifdef HAVE_LOCALE_H # include <locale.h> @@ -763,50 +761,43 @@ Fl_Input::Fl_Input(int X, int Y, int W, int H, const char *l) : Fl_Input_(X, Y, W, H, l) { } -/* - The following constructors must not be in the header file(s) if we - build a shared object (DLL). Instead they are defined here to force - the constructor (and default destructor as well) to be defined in - the DLL and exported (STR #2632). - - Note: if you change any of them, do the same changes in the specific - header file as well. This redundant definition was chosen to enable - inline constructors in the header files (for static linking) as well - as those here for dynamic linking (Windows DLL). -*/ -#if defined(FL_DLL) Fl_Float_Input::Fl_Float_Input(int X,int Y,int W,int H,const char *l) - : Fl_Input(X,Y,W,H,l) { +: Fl_Input(X,Y,W,H,l) +{ type(FL_FLOAT_INPUT); } + Fl_Int_Input::Fl_Int_Input(int X,int Y,int W,int H,const char *l) - : Fl_Input(X,Y,W,H,l) { +: Fl_Input(X,Y,W,H,l) { type(FL_INT_INPUT); } + Fl_Multiline_Input::Fl_Multiline_Input(int X,int Y,int W,int H,const char *l) - : Fl_Input(X,Y,W,H,l) { +: Fl_Input(X,Y,W,H,l) { type(FL_MULTILINE_INPUT); } + Fl_Output::Fl_Output(int X,int Y,int W,int H, const char *l) - : Fl_Input(X, Y, W, H, l) { +: Fl_Input(X, Y, W, H, l) { type(FL_NORMAL_OUTPUT); } + Fl_Multiline_Output::Fl_Multiline_Output(int X,int Y,int W,int H,const char *l) - : Fl_Output(X,Y,W,H,l) { +: Fl_Output(X,Y,W,H,l) { type(FL_MULTILINE_OUTPUT); } + Fl_Secret_Input::Fl_Secret_Input(int X,int Y,int W,int H,const char *l) - : Fl_Input(X,Y,W,H,l) { +: Fl_Input(X,Y,W,H,l) { type(FL_SECRET_INPUT); } -#endif // FL_DLL // // End of "$Id$". |
