Author: sanel.z
Date: 2007-05-31 05:39:35 -0400 (Thu, 31 May 2007)
New Revision: 5861
Log:
Silented linker when linking with shared library, due inlined virtual method.
Modified:
trunk/fluid/WidgetType.cxx
trunk/fluid/WidgetType.h
Modified: trunk/fluid/WidgetType.cxx
===================================================================
--- trunk/fluid/WidgetType.cxx 2007-05-30 18:32:26 UTC (rev 5860)
+++ trunk/fluid/WidgetType.cxx 2007-05-31 09:39:35 UTC (rev 5861)
@@ -2359,6 +2359,19 @@
if (resizable() && w->parent())
w->parent()->resizable(o);
}
+
+int WidgetType::textstuff(int w, fltk::Font* f, float& s, fltk::Color c) {
+ fltk::Widget *myo = (fltk::Widget *)(w==4 ? ((WidgetType*)factory)->o : o);
+ switch (w) {
+ case 4:
+ case 0: f = myo->textfont(); s = myo->textsize(); c = myo->textcolor();
break;
+ case 1: myo->textfont(f); break;
+ case 2: myo->textsize((float)s); break;
+ case 3: myo->textcolor(c); break;
+ }
+ return 1;
+}
+
//
// End of "$Id$".
//
Modified: trunk/fluid/WidgetType.h
===================================================================
--- trunk/fluid/WidgetType.h 2007-05-30 18:32:26 UTC (rev 5860)
+++ trunk/fluid/WidgetType.h 2007-05-31 09:39:35 UTC (rev 5861)
@@ -66,17 +66,7 @@
void leave_live_mode();
void copy_properties();
- virtual int textstuff(int w, fltk::Font* f, float& s, fltk::Color c) {
- fltk::Widget *myo = (fltk::Widget *)(w==4 ? ((WidgetType*)factory)->o : o);
- switch (w) {
- case 4:
- case 0: f = myo->textfont(); s = myo->textsize(); c = myo->textcolor();
break;
- case 1: myo->textfont(f); break;
- case 2: myo->textsize((float)s); break;
- case 3: myo->textcolor(c); break;
- }
- return 1;
- }
+ virtual int textstuff(int w, fltk::Font* f, float& s, fltk::Color c);
static float default_size;
int pixmapID() { return 5;}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
