From 0c8f264df05e6a35e04f0a54b12be7629a2ec5e4 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Mon, 23 May 2011 18:32:47 +0000 Subject: Add FL_EXPORT to several classes to fix MS VC++ dll builds (STR #2632). Remove FL_EXPORT from fl_clip_region() since this is an inline function on all platforms (and issued a warning when building fltkdll with MS VC++). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8726 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Output.H | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'FL/Fl_Output.H') diff --git a/FL/Fl_Output.H b/FL/Fl_Output.H index 64ee5e34a..f7fab5951 100644 --- a/FL/Fl_Output.H +++ b/FL/Fl_Output.H @@ -53,16 +53,21 @@ and \\nnn notation for unprintable characters with the high bit set. It assumes the font can draw any characters in the ISO-Latin1 character set. */ -class Fl_Output : public Fl_Input { // don't use FL_EXPORT here ! +class FL_EXPORT Fl_Output : public Fl_Input { public: /** Creates a new Fl_Output widget using the given position, size, and label string. The default boxtype is FL_DOWN_BOX. - Inherited destrucor destroys the widget and any value associated with it. + 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 -- cgit v1.2.3