diff options
| author | Manolo Gouy <Manolo> | 2017-12-29 07:45:27 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2017-12-29 07:45:27 +0000 |
| commit | 2d7a670e2864379c57784f1d2e1f48b2a7090220 (patch) | |
| tree | 6f4eed55f0b88c6b611198b38ad17e19e3df8409 | |
| parent | b2ce33fcfd6fe573022cf9a12ff7da90be2edc37 (diff) | |
Remove 'friend class Fl_PicoSDL_Window_Driver' from Fl_Window.H
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12615 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Window.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Window_Driver.H | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 8242d877e..9d9492606 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -53,6 +53,9 @@ class Fl_Double_Window; window. Fl_Window has a default callback that calls Fl_Window::hide(). */ class FL_EXPORT Fl_Window : public Fl_Group { + friend int Fl::arg(int argc, char **argv, int &i); + friend class Fl_X; + friend class Fl_Window_Driver; private: static char *default_xclass_; static char show_iconic_; // 1 means create next window in iconic form @@ -66,11 +69,6 @@ private: int fullscreen_screen_left; int fullscreen_screen_right; - friend int Fl::arg(int argc, char **argv, int &i); - friend class Fl_X; - friend class Fl_Window_Driver; - friend class Fl_PicoAndroid_Window_Driver; - friend class Fl_PicoSDL_Window_Driver; Fl_X *i; // points at the system-specific stuff, but exists only after the window is mapped Fl_Window_Driver *pWindowDriver; // points at the system-specific stuff at window creation time diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H index 044363236..d9f883fb8 100644 --- a/FL/Fl_Window_Driver.H +++ b/FL/Fl_Window_Driver.H @@ -82,7 +82,6 @@ public: int shown() const { return pWindow->shown(); } /** returns the parent of the window. */ Fl_Group *parent() const { return pWindow->parent(); } - char show_iconic() { return pWindow->show_iconic_; } // --- accessors to private window data int minw(); @@ -102,7 +101,8 @@ public: void x(int X); void y(int Y); void current(Fl_Window *c); - void show_iconic(char c) { pWindow->show_iconic_ = c; } + char show_iconic() { return Fl_Window::show_iconic_; } + void show_iconic(char c) { Fl_Window::show_iconic_ = c; } void i(Fl_X *x) { pWindow->i = x; } /** for an Fl_Overlay_Window, returns the value of its overlay_ member variable */ Fl_Window *overlay() { |