diff options
| author | Manolo Gouy <Manolo> | 2014-11-11 16:08:09 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2014-11-11 16:08:09 +0000 |
| commit | e4d4f400a4b42f4713f2d2dc5e29b0c73a7717f1 (patch) | |
| tree | d77fad5fb4e0e829a11dabd1f72f6da652614331 /FL | |
| parent | f9f4ecedf7c16d160aeb9de0e9cd954b48fa0067 (diff) | |
Added support of true subwindows to the Mac OS X code. With this, a window inside another
window is just another window with Mac OS as it was already with MSWindows and X11.
This requires Mac OS X 10.2. Window nesting to any depth is possible.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10449 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/mac.H | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -125,9 +125,8 @@ public: Fl_Offscreen other_xid; // pointer for offscreen bitmaps (overlay window) Fl_Window *w; // FLTK window for Fl_Region region; - Fl_Region subRegion; // region for this specific subwindow + CGRect* subRect; // make sure subwindow remains inside its parent window Fl_X *next; // linked tree to support subwindows - Fl_X *xidChildren, *xidNext; // more subwindow tree int wait_for_expose; NSCursor *cursor; static Fl_X* first; @@ -146,7 +145,6 @@ public: void destroy(void); void map(void); void unmap(void); - int unlink(Fl_X* start = NULL); void collapse(void); WindowRef window_ref(void); void set_key_window(void); @@ -169,9 +167,6 @@ public: static int insertion_point_location(int *px, int *py, int *pheight); // computes window coordinates & height of insertion point static const int CoreText_threshold; // Mac OS version from which the Core Text API is used to display text static Fl_Fontdesc* calc_fl_fonts(void); // computes the fl_fonts global variable -private: - static void relink(Fl_Window*, Fl_Window*); - bool subwindow; }; extern Window fl_window; |