diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-07-14 21:25:39 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-07-14 21:25:39 +0000 |
| commit | d0f18c45b5052098236b042331a578620d7b05be (patch) | |
| tree | 0c8b43075631c98670bffa3cc83e3c4ea9f23ee7 /src | |
| parent | 7c4010a10684b49ad3ae85ef87af658acd3b038e (diff) | |
Boy, aren't WIN32 compilers *so* much fun.
Fix more export problems, make some more static inline methods regular
functions, don't use FL_NORMAL_SIZE in a static initializer since BC++
doesn't seem to support it...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2531 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Shared_Image.cxx | 15 | ||||
| -rw-r--r-- | src/Fl_Window.cxx | 9 |
2 files changed, 20 insertions, 4 deletions
diff --git a/src/Fl_Shared_Image.cxx b/src/Fl_Shared_Image.cxx index f101d2afe..fabcc191f 100644 --- a/src/Fl_Shared_Image.cxx +++ b/src/Fl_Shared_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Shared_Image.cxx,v 1.23.2.14 2002/06/28 21:04:36 easysw Exp $" +// "$Id: Fl_Shared_Image.cxx,v 1.23.2.15 2002/07/14 21:25:39 easysw Exp $" // // Shared image code for the Fast Light Tool Kit (FLTK). // @@ -60,6 +60,17 @@ extern "C" { } +// Static methods that really should be inline, but some WIN32 compilers +// can't handle it... +Fl_Shared_Image **Fl_Shared_Image::images() { + return images_; +} + +int Fl_Shared_Image::num_images() { + return num_images_; +} + + // // 'Fl_Shared_Image::compare()' - Compare two shared images... // @@ -456,5 +467,5 @@ Fl_Shared_Image::remove_handler(Fl_Shared_Handler f) { // -// End of "$Id: Fl_Shared_Image.cxx,v 1.23.2.14 2002/06/28 21:04:36 easysw Exp $". +// End of "$Id: Fl_Shared_Image.cxx,v 1.23.2.15 2002/07/14 21:25:39 easysw Exp $". // diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index 8e71e86c1..3567fc40d 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Window.cxx,v 1.6.2.3.2.6 2002/07/01 20:14:08 easysw Exp $" +// "$Id: Fl_Window.cxx,v 1.6.2.3.2.7 2002/07/14 21:25:39 easysw Exp $" // // Window widget class for the Fast Light Tool Kit (FLTK). // @@ -113,6 +113,11 @@ void Fl_Window::default_callback(Fl_Window* window, void* v) { Fl::atclose(window, v); } +Fl_Window *Fl_Window::current() { + return current_; +} + + // -// End of "$Id: Fl_Window.cxx,v 1.6.2.3.2.6 2002/07/01 20:14:08 easysw Exp $". +// End of "$Id: Fl_Window.cxx,v 1.6.2.3.2.7 2002/07/14 21:25:39 easysw Exp $". // |